[1237] Compilation fixes in dhcp4 and dhcp6 components.

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 780f3dc82706e3ac50253a4630a500e8bfbadd46..0a1aabad905194c639a7412cb57b526ec27ef9e9 100644 (file)
--- 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 31c6afb783a5d8984553b421fd29e0712a8becc9..b1264562645a788e496c518bcff8d7670c23d2b5 100644 (file)
--- 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 72a4ed278b65c6431ce4e120cf6e144081ff54b0..c90d00daf439021c766393f6160ca8e909bba031 100644 (file)
--- 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 18d2cd68bd6fc030d75cbb5b4397907fea48052d..651c07bdf46426b2994ca33beb443546e2ac39fc 100644 (file)
--- 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 ea0f43ae2c22e4237caeb665678abca87cc4aac6..2155ae8249ef03f35d1eb0b106c4da126b19918c 100644 (file)
--- 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