diff options
author | Francis Dupont <fdupont@isc.org> | 2016-02-23 10:40:10 +0100 |
---|---|---|
committer | Francis Dupont <fdupont@isc.org> | 2016-02-23 10:40:10 +0100 |
commit | 785c1a519e88bfebb70bd3384589de36bee02dd2 (patch) | |
tree | 04f794b247068983b2df432fb20f229de1e8bf03 /client/dhc6.c | |
parent | 08ad1e3c9089b51888c73837cf41de49112de29c (diff) | |
download | isc-dhcp-785c1a519e88bfebb70bd3384589de36bee02dd2.tar.gz |
Merged rt35711c (DHCPv4-over-DHCPv6 support)
Diffstat (limited to 'client/dhc6.c')
-rw-r--r-- | client/dhc6.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/client/dhc6.c b/client/dhc6.c index aacd4aea..c8d16e8a 100644 --- a/client/dhc6.c +++ b/client/dhc6.c @@ -4835,6 +4835,11 @@ start_bound(struct client_state *client) script_go(client); } +#ifdef DHCP4o6 + if (dhcpv4_over_dhcpv6) + dhcp4o6_start(); +#endif + go_daemon(); if (client->old_lease != NULL) { @@ -5314,8 +5319,12 @@ dhc6_check_irt(struct client_state *client) } } /* Simply return gives a endless loop waiting for nothing. */ - if (!found) + if (!found) { +#ifdef DHCP4o6 + if (!dhcpv4_over_dhcpv6) +#endif exit(0); + } oc = lookup_option(&dhcpv6_universe, client->active_lease->options, D6O_INFORMATION_REFRESH_TIME); @@ -5368,6 +5377,11 @@ start_informed(struct client_state *client) script_write_requested6(client); script_go(client); +#ifdef DHCP4o6 + if (dhcpv4_over_dhcpv6) + dhcp4o6_start(); +#endif + go_daemon(); if (client->old_lease != NULL) { |