diff options
| author | David Hankins <dhankins@isc.org> | 2006-06-01 20:23:18 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2006-06-01 20:23:18 +0000 |
| commit | f7fdb21693ec2f2ef44d8e8bebc4609e4d7b67c7 (patch) | |
| tree | 32c2431210e7b34feaf85d66f714ce928655a48d /server/ddns.c | |
| parent | ee912528163bb70b3c0de65608f9d05fff03044d (diff) | |
| download | isc-dhcp-f7fdb21693ec2f2ef44d8e8bebc4609e4d7b67c7.tar.gz | |
- Varying option space code and length bit widths (8/16/32) are now
supported. This is a milestone in acheiving RFC 3925 "VIVSO" and
DHCPv6 support. [ISC-Bugs #15979]
Diffstat (limited to 'server/ddns.c')
| -rw-r--r-- | server/ddns.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/server/ddns.c b/server/ddns.c index 1b10f867..b2811324 100644 --- a/server/ddns.c +++ b/server/ddns.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: ddns.c,v 1.18 2005/03/17 20:15:26 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; +"$Id: ddns.c,v 1.19 2006/06/01 20:23:17 dhankins Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -586,14 +586,12 @@ int ddns_updates (struct packet *packet, bp -> data [0] = server_updates_a; if (!save_option_buffer (&fqdn_universe, state -> options, bp, &bp -> data [0], 1, - &fqdn_options [FQDN_SERVER_UPDATE], - 0)) + FQDN_SERVER_UPDATE, 0)) goto badfqdn; bp -> data [1] = server_updates_a; if (!save_option_buffer (&fqdn_universe, state -> options, bp, &bp -> data [1], 1, - &fqdn_options [FQDN_NO_CLIENT_UPDATE], - 0)) + FQDN_NO_CLIENT_UPDATE, 0)) goto badfqdn; /* Do the same encoding the client did. */ oc = lookup_option (&fqdn_universe, packet -> options, @@ -609,20 +607,17 @@ int ddns_updates (struct packet *packet, bp -> data [2] = 0; if (!save_option_buffer (&fqdn_universe, state -> options, bp, &bp -> data [2], 1, - &fqdn_options [FQDN_ENCODED], - 0)) + FQDN_ENCODED, 0)) goto badfqdn; bp -> data [3] = isc_rcode_to_ns (rcode1); if (!save_option_buffer (&fqdn_universe, state -> options, bp, &bp -> data [3], 1, - &fqdn_options [FQDN_RCODE1], - 0)) + FQDN_RCODE1, 0)) goto badfqdn; bp -> data [4] = isc_rcode_to_ns (rcode2); if (!save_option_buffer (&fqdn_universe, state -> options, bp, &bp -> data [4], 1, - &fqdn_options [FQDN_RCODE2], - 0)) + FQDN_RCODE2, 0)) goto badfqdn; if (ddns_fwd_name.len) { memcpy (&bp -> data [5], @@ -630,8 +625,7 @@ int ddns_updates (struct packet *packet, if (!save_option_buffer (&fqdn_universe, state -> options, bp, &bp -> data [5], ddns_fwd_name.len, - &fqdn_options [FQDN_FQDN], - 0)) + FQDN_FQDN, 0)) goto badfqdn; } } |