BIND 10 trac1540, updated. be560f4516ae9b0bbbad1740a519feed99c04170 [1540] Changes after review:

BIND 10 source code commits bind10-changes at lists.isc.org
Tue May 8 16:18:21 UTC 2012


The branch, trac1540 has been updated
       via  be560f4516ae9b0bbbad1740a519feed99c04170 (commit)
      from  9f613bb9c9be87fbd800a1e87044070a04d75adf (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 be560f4516ae9b0bbbad1740a519feed99c04170
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue May 8 18:17:58 2012 +0200

    [1540] Changes after review:
    
    - test prints out information that failed socket binding is ok.
    - iface_mgr buffers are no longer static.

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

Summary of changes:
 src/bin/dhcp6/tests/dhcp6_test.py |    3 +++
 src/lib/dhcp/iface_mgr.cc         |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/dhcp6_test.py b/src/bin/dhcp6/tests/dhcp6_test.py
index d63e04d..e080c77 100644
--- a/src/bin/dhcp6/tests/dhcp6_test.py
+++ b/src/bin/dhcp6/tests/dhcp6_test.py
@@ -36,6 +36,9 @@ class TestDhcpv6Daemon(unittest.TestCase):
         # to the main program ASAP in each test... this prevents
         # hangs reading from the child process (as the pipe is only
         # open in the child), and also insures nice pretty output
+        print("Please ignore any socket errors. Purpose of this test is to")
+        print("verify that DHCPv6 process could be started, not that socket")
+        print("could be bound. Binding fails when run as non-root user.")
 
     def tearDown(self):
         # clean up our stdout munging
diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index 024c066..210e149 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -707,7 +707,7 @@ IfaceMgr::receive4() {
 
     // Now we have a socket, let's get some data from it!
     struct sockaddr_in from_addr;
-    static uint8_t buf[RCVBUFSIZE];
+    uint8_t buf[RCVBUFSIZE];
 
     memset(&control_buf_[0], 0, control_buf_len_);
     memset(&from_addr, 0, sizeof(from_addr));
@@ -772,7 +772,7 @@ IfaceMgr::receive4() {
 }
 
 Pkt6Ptr IfaceMgr::receive6() {
-    static uint8_t buf[RCVBUFSIZE];
+    uint8_t buf[RCVBUFSIZE];
 
     memset(&control_buf_[0], 0, control_buf_len_);
     struct sockaddr_in6 from;



More information about the bind10-changes mailing list