BIND 10 trac1230, updated. 33595d0d554cf7208472d31929cae013cebdc485 Fix for unused variable in iface_mgr.cc

[BIND 10 source code commits]

The branch, trac1230 has been updated
       via  33595d0d554cf7208472d31929cae013cebdc485 (commit)
       via  4881a52f6541d200ad2755ce4b159525466498db (commit)
       via  7e0fdfb412969cc6ba46aa53dd6d7af6200c7e24 (commit)
      from  de6f226ae7bc45d144b6e012884bfd28ca74e350 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 33595d0d554cf7208472d31929cae013cebdc485
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Dec 23 16:22:20 2011 +0100

    Fix for unused variable in iface_mgr.cc

commit 4881a52f6541d200ad2755ce4b159525466498db
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Dec 23 17:33:27 2011 +0100

    Another fix for MacOS compilation.

commit 7e0fdfb412969cc6ba46aa53dd6d7af6200c7e24
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Dec 23 11:12:47 2011 +0100

    [1237] Compilation fix for MacOS

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dhcp/iface_mgr.cc |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index c1aa36b..b41d338 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -426,7 +426,7 @@ int IfaceMgr::openSocket6(Iface& iface, const IOAddress& addr, int port) {
            addr.getAddress().to_v6().to_bytes().data(),
            sizeof(addr6.sin6_addr));
 #ifdef HAVE_SA_LEN
-    addr6->sin6_len = sizeof(addr6);
+    addr6.sin6_len = sizeof(addr6);
 #endif
 
     // TODO: use sockcreator once it becomes available
@@ -755,11 +755,12 @@ IfaceMgr::receive4() {
         return (boost::shared_ptr<Pkt4>()); // NULL
     }
 
+    unsigned int ifindex = iface->getIndex();
+
 // OS_LINUX defines are part of ticket #1237
 #if defined(OS_LINUX)
     struct cmsghdr* cmsg;
     struct in_pktinfo* pktinfo;
-    unsigned int ifindex = 0;
 
     int found_pktinfo = 0;
     cmsg = CMSG_FIRSTHDR(&m);
@@ -805,7 +806,7 @@ IfaceMgr::receive4() {
     pkt = boost::shared_ptr<Pkt4>(new Pkt4(buf, result));
 
     pkt->setIface(iface->getName());
-    pkt->setIndex(iface->getIndex());
+    pkt->setIndex(ifindex);
     pkt->setLocalAddr(to);
     pkt->setRemoteAddr(from);
     pkt->setRemotePort(from_port);