BIND 10 master, updated. 1615a521d61a0f47a627f92cc4f95d982a04f8d1 Fix for cppcheck (after 1238 merge)

[BIND 10 source code commits]

The branch, master has been updated
       via  1615a521d61a0f47a627f92cc4f95d982a04f8d1 (commit)
       via  e26901a19766452353b43e81ddc993b26b2b8518 (commit)
      from  eaa492e0bfa0855b01ec86ed0885d90166d32c7e (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 1615a521d61a0f47a627f92cc4f95d982a04f8d1
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Dec 9 18:30:56 2011 +0100

    Fix for cppcheck (after 1238 merge)

commit e26901a19766452353b43e81ddc993b26b2b8518
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Dec 9 18:30:39 2011 +0100

    Fix for failing test in IfaceMgr on FreeBSD (fix after 1238 merge)

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

Summary of changes:
 src/bin/dhcp6/iface_mgr.cc                |    3 ++-
 src/bin/dhcp6/tests/iface_mgr_unittest.cc |    3 +++
 2 files changed, 5 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/iface_mgr.cc b/src/bin/dhcp6/iface_mgr.cc
index 60dac63..de2b93c 100644
--- a/src/bin/dhcp6/iface_mgr.cc
+++ b/src/bin/dhcp6/iface_mgr.cc
@@ -340,7 +340,8 @@ IfaceMgr::openSocket6(Iface& iface, const IOAddress& addr, int port) {
     memset(&addr6, 0, sizeof(addr6));
     addr6.sin6_family = AF_INET6;
     addr6.sin6_port = htons(port);
-    addr6.sin6_scope_id = if_nametoindex(iface.getName().c_str());
+    if (addr.toText() != "::1")
+      addr6.sin6_scope_id = if_nametoindex(iface.getName().c_str());
 
     memcpy(&addr6.sin6_addr,
            addr.getAddress().to_v6().to_bytes().data(),
diff --git a/src/bin/dhcp6/tests/iface_mgr_unittest.cc b/src/bin/dhcp6/tests/iface_mgr_unittest.cc
index 3cc2ae8..0c54780 100644
--- a/src/bin/dhcp6/tests/iface_mgr_unittest.cc
+++ b/src/bin/dhcp6/tests/iface_mgr_unittest.cc
@@ -320,6 +320,9 @@ TEST_F(IfaceMgrTest, sendReceive6) {
         socket2 = ifacemgr->openSocket(LOOPBACK, loAddr, 10546);
     );
 
+    EXPECT_GT(socket1, 0);
+    EXPECT_GT(socket2, 0);
+
     boost::shared_ptr<Pkt6> sendPkt(new Pkt6(128) );
 
     // prepare dummy payload