[master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

ChangeLog

@@ -1,3 +1,11 @@
+360.	[func] 		fdupont
+	Alpha version of DHCP benchmarking tool added.  "perfdhcp" is able to
+	test both IPv4 and IPv6 servers: it can time the four-packet exchange
+	(DORA and SARR) as well as time the initial two-packet exchange (DO and
+	SA).  More information can be obtained by invoking the utility (in
+	tests/tools/perfdhcp) with the "-h" flag.
+	(Trac #1450, git 85083a76107ba2236732b45524ce7018eefbaf90)
+
 359.	[func]*		vorner
 	The target parameter of ZoneFinder::find is no longer present, as the
 	interface was awkward. To get all the RRsets of a single domain, use

configure.ac

@@ -997,6 +997,7 @@ AC_CONFIG_FILES([Makefile
                  tests/tools/Makefile
                  tests/tools/badpacket/Makefile
                  tests/tools/badpacket/tests/Makefile
+                 tests/tools/perfdhcp/Makefile
                ])
 AC_OUTPUT([doc/version.ent
            compatcheck/sqlite3-difftbl-check.py

tests/tools/Makefile.am

@@ -1 +1 @@
-SUBDIRS = badpacket
+SUBDIRS = badpacket perfdhcp

tests/tools/perfdhcp/Makefile.am

@@ -0,0 +1,11 @@
+SUBDIRS = .
+
+AM_CXXFLAGS = $(B10_CXXFLAGS)
+
+AM_LDFLAGS = -lrt -lm
+if USE_STATIC_LINK
+AM_LDFLAGS += -static
+endif
+
+pkglibexec_PROGRAMS  = perfdhcp
+perfdhcp_SOURCES  = perfdhcp.c