Browse Source

[master] Added ChangeLog entry 679 for trac 3156

Added the ChangeLog entry and fixed a minor clang complain in dhcp6.
Thomas Markwalder 11 years ago
parent
commit
d84999478b
3 changed files with 8 additions and 10 deletions
  1. 5 0
      ChangeLog
  2. 0 7
      src/bin/dhcp6/dhcp6_srv.h
  3. 3 3
      src/lib/dhcpsrv/tests/test_libraries.h

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+679.	[func]	tmark
+	b10-dhcp-ddns Finite state machine logic was refactored into its own class,
+	StateModel.
+	(Trac# 3156,  git 6e9227b1b15448e834d1f60dd655e5633ff9745c)
+
 678.	[func]	tmark
 	MySQL backend used by b10-dhcp6 now uses lease type as a 
 	filtering parameter in all IPv6 lease queries.

+ 0 - 7
src/bin/dhcp6/dhcp6_srv.h

@@ -473,13 +473,6 @@ private:
     /// initiate server shutdown procedure.
     volatile bool shutdown_;
 
-#if 0
-    /// Indexes for registered hook points
-    int hook_index_pkt6_receive_;
-    int hook_index_subnet6_select_;
-    int hook_index_pkt6_send_;
-#endif
-
     /// UDP port number on which server listens.
     uint16_t port_;
 

+ 3 - 3
src/lib/dhcpsrv/tests/test_libraries.h

@@ -37,13 +37,13 @@ namespace {
 
 // Library with load/unload functions creating marker files to check their
 // operation.
-static const char* CALLOUT_LIBRARY_1 = "/home/thomson/devel/bind10/src/lib/dhcpsrv/tests/.libs/libco1"
+static const char* CALLOUT_LIBRARY_1 = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libco1"
                                            DLL_SUFFIX;
-static const char* CALLOUT_LIBRARY_2 = "/home/thomson/devel/bind10/src/lib/dhcpsrv/tests/.libs/libco2"
+static const char* CALLOUT_LIBRARY_2 = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libco2"
                                            DLL_SUFFIX;
 
 // Name of a library which is not present.
-static const char* NOT_PRESENT_LIBRARY = "/home/thomson/devel/bind10/src/lib/dhcpsrv/tests/.libs/libnothere"
+static const char* NOT_PRESENT_LIBRARY = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libnothere"
                                          DLL_SUFFIX;
 } // anonymous namespace