BIND 10 trac1237, updated. 0b13e5293e643ab9098ab32579b5435beeaff9a1 [1237] ChangeLog update.

[BIND 10 source code commits]

The branch, trac1237 has been updated
       via  0b13e5293e643ab9098ab32579b5435beeaff9a1 (commit)
       via  6bbffedb003004dbbbc1b05b7c909e5cf03c529c (commit)
      from  4b226d86ea74b839e6066750de85c6247de691a5 (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 0b13e5293e643ab9098ab32579b5435beeaff9a1
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue Dec 13 14:54:10 2011 +0100

    [1237] ChangeLog update.

commit 6bbffedb003004dbbbc1b05b7c909e5cf03c529c
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue Dec 13 14:53:59 2011 +0100

    [1237] Compilation fixes in dhcp4 and dhcp6 components.

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

Summary of changes:
 ChangeLog                  |    6 ++++++
 src/bin/dhcp4/dhcp4_srv.cc |    3 +++
 src/bin/dhcp6/dhcp6_srv.cc |    4 ++++
 src/bin/dhcp6/dhcp6_srv.h  |    5 +++--
 src/lib/dhcp/iface_mgr.cc  |    5 ++---
 src/lib/dhcp/iface_mgr.h   |    5 +++--
 6 files changed, 21 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index a2dc66f..a629235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 3XX.	[func]		tomek
+	libdhcp++: Interface detection in Linux implemented. libdhcp++
+	if now able to detect available network interfaces, its link-layer
+	addresses, flags and configured IPv4 and IPv6 addresses.
+	(Trac #1237, git TBD)
+
+3XX.	[func]		tomek
 	dhcp4: Dummy DHCPv4 component implemented. Currently it does
 	nothing useful, except providing skeleton implementation that can
 	be expanded in the future.
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 780f3dc..0a1aaba 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -33,7 +33,10 @@ Dhcpv4Srv::Dhcpv4Srv(uint16_t port) {
     /// @todo: instantiate LeaseMgr here once it is imlpemented.
     IfaceMgr::instance().printIfaces();
 
+#if 0
+    // uncomment this once #1238, #992 and #1239 are merged
     IfaceMgr::instance().openSockets4(port);
+#endif
 
     setServerID();
 
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 31c6afb..b126456 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -43,7 +43,11 @@ Dhcpv6Srv::Dhcpv6Srv(uint16_t port) {
     }
 
     // Now try to open IPv6 sockets on detected interfaces.
+    cout << "Opening sockets on port " << port << endl;
+#if 0
+    // uncomment this once #1238, #992 and #1239 are merged
     IfaceMgr::instance().openSockets6(port);
+#endif
 
     /// @todo: instantiate LeaseMgr here once it is imlpemented.
 
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 72a4ed2..c90d00d 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -17,8 +17,9 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
-#include "dhcp/pkt6.h"
-#include "dhcp/option.h"
+#include <dhcp/dhcp6.h>
+#include <dhcp/pkt6.h>
+#include <dhcp/option.h>
 #include <iostream>
 
 namespace isc {
diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index 18d2cd6..651c07b 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -159,7 +159,7 @@ void IfaceMgr::detectIfaces() {
 }
 #endif
 
-bool IfaceMgr::openSockets6() {
+bool IfaceMgr::openSockets6(uint16_t port) {
     int sock;
 
     for (IfaceLst::iterator iface=ifaces_.begin();
@@ -175,8 +175,7 @@ bool IfaceMgr::openSockets6() {
                 continue;
             }
 
-            sock = openSocket(iface->name_, *addr,
-                              DHCP6_SERVER_PORT);
+            sock = openSocket(iface->name_, *addr, port);
             if (sock<0) {
                 cout << "Failed to open unicast socket." << endl;
                 return (false);
diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h
index ea0f43a..2155ae8 100644
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -237,8 +237,9 @@ protected:
 
 private:
     /// Opens sockets on detected interfaces.
-    bool
-    openSockets6();
+    ///
+    /// @param port specifies port on which sockets will be open
+    bool openSockets6(uint16_t port);
 
     /// creates a single instance of this class (a singleton implementation)
     static void