Merged rt35711c (DHCPv4-over-DHCPv6 support)

1 files changed, 34 insertions, 0 deletions

diff --git a/configure b/configure
index edf0de5a..5c980452 100755
--- a/configure
+++ b/configure
@@ -753,6 +753,7 @@ enable_execute
 enable_tracing
 enable_delayed_ack
 enable_dhcpv6
+enable_dhcpv4o6
 enable_paranoia
 enable_early_chroot
 enable_ipv4_pktinfo
@@ -1423,6 +1424,8 @@ Optional Features:
                           is yes)
   --enable-delayed-ack    queues multiple DHCPACK replies (default is no)
   --enable-dhcpv6         enable support for DHCPv6 (default is yes)
+  --enable-dhcpv4o6       enable support for DHCPv4-over-DHCPv6 (default is
+                          no)
   --enable-paranoia       enable support for chroot/setuid (default is no)
   --enable-early-chroot   enable chrooting prior to configuration (default is
                           no)
@@ -5430,6 +5433,27 @@ $as_echo "#define DHCPv6 1" >>confdefs.h
 
 fi
 
+# DHCPv4o6 optional compile-time feature.
+# Check whether --enable-dhcpv4o6 was given.
+if test "${enable_dhcpv4o6+set}" = set; then :
+  enableval=$enable_dhcpv4o6;
+fi
+
+# DHCPv4o6 is off by default, so define if it is explicitly enabled.
+if test "$enable_dhcpv4o6" = "yes"; then
+	# DHCPv4o6 requires DHCPv6
+	if test "$enable_dhcpv6" = "no"; then
+		as_fn_error $? "dhcpv4o6 requires dhcpv6" "$LINENO" 5
+	fi
+	# DHCPv4o6 is not yet compatible with delayed-ack
+	if test "$enable_delayed_ack" = "yes"; then
+		as_fn_error $? "dhcpv4o6 is not compatible with delayed-ack" "$LINENO" 5
+	fi
+
+$as_echo "#define DHCP4o6 1" >>confdefs.h
+
+fi
+
 # PARANOIA is off by default (until we can test it with all features)
 # Check whether --enable-paranoia was given.
 if test "${enable_paranoia+set}" = set; then :
@@ -8641,6 +8665,14 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
+if test "$enable_dhcpv4o6" = "yes"; then
+	DHCP_VERSIONS="DHCPv4, DHCPv6 and DHCPv4-over-DHCPv6"
+elif test "$enable_dhcpv6" != "no"; then
+	DHCP_VERSIONS="DHCPv4 and DHCPv6"
+else
+	DHCP_VERSIONS="DHCPv4"
+fi
+
 (cd $srcdir
     sh util/bindvar.sh
     if test $? -ne 0; then
@@ -8663,6 +8695,8 @@ Flags:
   DEFS:          $DEFS
   CFLAGS:        $CFLAGS
 
+DHCP versions:   $DHCP_VERSIONS
+
 Features:
   debug:         $enable_debug
   failover:      $enable_failover