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 /server/dhcpleasequery.c | |
parent | 08ad1e3c9089b51888c73837cf41de49112de29c (diff) | |
download | isc-dhcp-785c1a519e88bfebb70bd3384589de36bee02dd2.tar.gz |
Merged rt35711c (DHCPv4-over-DHCPv6 support)
Diffstat (limited to 'server/dhcpleasequery.c')
-rw-r--r-- | server/dhcpleasequery.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c index 0766b849..91ca870c 100644 --- a/server/dhcpleasequery.c +++ b/server/dhcpleasequery.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011-2013,2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2006-2007,2009 by Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any @@ -172,6 +172,11 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) { /* * We can't reply if there is no giaddr field. */ + /* + * Note: this makes DHCPv4-over-DHCPv6 always fail but it should not + * really be a problem because it is not a specified use case + * (or even one that makes sense). + */ if (!packet->raw->giaddr.s_addr) { log_info("%s: missing giaddr, ciaddr is %s, no reply sent", msgbuf, inet_ntoa(packet->raw->ciaddr)); |