diff options
author | murray <murray@FreeBSD.org> | 2003-01-15 10:31:26 +0000 |
---|---|---|
committer | murray <murray@FreeBSD.org> | 2003-01-15 10:31:26 +0000 |
commit | 017255e081bcbadf47f5affc7eea7c047e38a70f (patch) | |
tree | cf39c38365a0b53bd8bc09fd59f38b2eee8a01cf /contrib/isc-dhcp/common | |
parent | a0b500f866e54d9ce8def00d72daac852505461e (diff) | |
download | FreeBSD-src-017255e081bcbadf47f5affc7eea7c047e38a70f.zip FreeBSD-src-017255e081bcbadf47f5affc7eea7c047e38a70f.tar.gz |
Import ISC DHCP 3.0.1 RC10 client.
Diffstat (limited to 'contrib/isc-dhcp/common')
-rw-r--r-- | contrib/isc-dhcp/common/bpf.c | 6 | ||||
-rw-r--r-- | contrib/isc-dhcp/common/dhcp-options.5 | 15 | ||||
-rw-r--r-- | contrib/isc-dhcp/common/discover.c | 8 | ||||
-rw-r--r-- | contrib/isc-dhcp/common/icmp.c | 3 | ||||
-rw-r--r-- | contrib/isc-dhcp/common/parse.c | 4 | ||||
-rw-r--r-- | contrib/isc-dhcp/common/socket.c | 4 |
6 files changed, 26 insertions, 14 deletions
diff --git a/contrib/isc-dhcp/common/bpf.c b/contrib/isc-dhcp/common/bpf.c index 6ca91bb..c59c571 100644 --- a/contrib/isc-dhcp/common/bpf.c +++ b/contrib/isc-dhcp/common/bpf.c @@ -47,7 +47,7 @@ #ifndef lint static char copyright[] = -"$Id: bpf.c,v 1.48.2.1 2002/04/30 05:12:53 murray Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; +"$Id: bpf.c,v 1.48.2.2 2002/06/08 09:29:16 murray Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -423,7 +423,11 @@ ssize_t receive_packet (interface, buf, len, from, hfrom) interface -> rbuf, (size_t)interface -> rbuf_max); if (length <= 0) { +#ifdef __FreeBSD__ + if (errno == ENXIO) { +#else if (errno == EIO) { +#endif dhcp_interface_remove ((omapi_object_t *)interface, (omapi_object_t *)0); diff --git a/contrib/isc-dhcp/common/dhcp-options.5 b/contrib/isc-dhcp/common/dhcp-options.5 index 33fd1e1..17349e8 100644 --- a/contrib/isc-dhcp/common/dhcp-options.5 +++ b/contrib/isc-dhcp/common/dhcp-options.5 @@ -34,6 +34,9 @@ .\" ``http://www.isc.org/''. To learn more about Vixie Enterprises, .\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see .\" ``http://www.nominum.com''. +.\" +.\" $Id: dhcp-options.5,v 1.19.2.8 2002/08/26 03:08:39 dhankins Exp $ +.\" .TH dhcpd-options 5 .SH NAME dhcp-options - Dynamic Host Configuration Protocol options @@ -244,7 +247,7 @@ server reply (DHCPOFFER), a DHCP server uses this option to specify the lease time it is willing to offer. .PP This option is not directly user configurable in the server; refer to the -\fImax-lease-time\fR and \fidefault-lease-time\fR server options in +\fImax-lease-time\fR and \fIdefault-lease-time\fR server options in .B dhcpd.conf(5). .RE .PP @@ -513,7 +516,7 @@ respond. .RS 0.25i .PP This option specifies the maximum size datagram that the client -should be prepared to reassemble. The minimum value legal value is +should be prepared to reassemble. The minimum legal value is 576. .RE .PP @@ -551,7 +554,7 @@ The nds-servers option specifies a list of IP addresses of NDS servers. .B option \fBnds-tree-name\fR \fIstring\fR\fB;\fR .RS 0.25i .PP -The nds-context option specifies NDS tree name that the NDS client +The nds-tree-name option specifies NDS tree name that the NDS client should use. .RE .PP @@ -651,7 +654,7 @@ client. Servers should be listed in order of preference. This option specifies whether the client should configure its IP layer to allow forwarding of datagrams with non-local source routes (see Section 3.3.5 of [4] for a discussion of this topic). A value -of 0 means disallow forwarding of such datagrams, and a value of true +of false means disallow forwarding of such datagrams, and a value of true means allow forwarding. .RE .PP @@ -945,7 +948,7 @@ preference. .PP This option specifies whether or not the client should negotiate the use of trailers (RFC 893 [14]) when using the ARP protocol. A value -of 0 indicates that the client should not attempt to use trailers. A +of false indicates that the client should not attempt to use trailers. A value of true means that the client should attempt to use trailers. .RE .PP @@ -1114,7 +1117,7 @@ the format in which the \fIfqdn.fqdn\fR suboption is encoded. .PP .B option fqdn.rcode1 \fIflag\fB; .PP -.B option fqdn.rcode1 \fIflag\fB; +.B option fqdn.rcode2 \fIflag\fB; .RS 0.25i .PP These options specify the result of the updates of the A and PTR records, diff --git a/contrib/isc-dhcp/common/discover.c b/contrib/isc-dhcp/common/discover.c index c52ecdb..bb820a3 100644 --- a/contrib/isc-dhcp/common/discover.c +++ b/contrib/isc-dhcp/common/discover.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: discover.c,v 1.42.2.9 2002/03/12 06:46:17 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n"; +"$Id: discover.c,v 1.42.2.12 2002/11/03 04:31:55 dhankins Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -540,8 +540,12 @@ void discover_interfaces (state) if (tmp -> next) interface_reference (&next, tmp -> next, MDL); /* skip interfaces that are running already */ - if (tmp -> flags & INTERFACE_RUNNING) + if (tmp -> flags & INTERFACE_RUNNING) { + interface_dereference(&tmp, MDL); + if(next) + interface_reference(&tmp, next, MDL); continue; + } if ((tmp -> flags & INTERFACE_AUTOMATIC) && state == DISCOVER_REQUESTED) tmp -> flags &= ~(INTERFACE_AUTOMATIC | diff --git a/contrib/isc-dhcp/common/icmp.c b/contrib/isc-dhcp/common/icmp.c index 299e030..e8f5196 100644 --- a/contrib/isc-dhcp/common/icmp.c +++ b/contrib/isc-dhcp/common/icmp.c @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = -"$Id: icmp.c,v 1.30.2.3 2001/10/18 20:11:24 mellon Exp $ Copyright (c) 1996-2001 The Internet Software Consortium. All rights reserved.\n"; +"$Id: icmp.c,v 1.30.2.4 2002/06/09 22:23:03 murray Exp $ Copyright (c) 1996-2001 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -164,6 +164,7 @@ int icmp_echorequest (addr) if (!icmp_state) log_fatal ("ICMP protocol used before initialization."); + memset (&to, 0, sizeof(to)); #ifdef HAVE_SA_LEN to.sin_len = sizeof to; #endif diff --git a/contrib/isc-dhcp/common/parse.c b/contrib/isc-dhcp/common/parse.c index 5f20dc7..15a661b 100644 --- a/contrib/isc-dhcp/common/parse.c +++ b/contrib/isc-dhcp/common/parse.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: parse.c,v 1.104.2.9 2002/04/27 05:30:02 murray Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n"; +"$Id: parse.c,v 1.104.2.10 2002/11/03 04:31:55 dhankins Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -329,7 +329,7 @@ int parse_ip_addr (cfile, addr) /* * hardware-parameter :== HARDWARE hardware-type colon-seperated-hex-list SEMI - * hardware-type :== ETHERNET | TOKEN_RING + * hardware-type :== ETHERNET | TOKEN_RING | FDDI */ void parse_hardware_param (cfile, hardware) diff --git a/contrib/isc-dhcp/common/socket.c b/contrib/isc-dhcp/common/socket.c index b4ecd14..6b105c6 100644 --- a/contrib/isc-dhcp/common/socket.c +++ b/contrib/isc-dhcp/common/socket.c @@ -51,7 +51,7 @@ #ifndef lint static char copyright[] = -"$Id: socket.c,v 1.55.2.1 2002/01/17 19:42:55 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: socket.c,v 1.55.2.2 2002/06/09 22:21:20 murray Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -114,11 +114,11 @@ int if_register_socket (info) once = 1; #endif + memset (&name, 0, sizeof (name)); /* Set up the address we're going to bind to. */ name.sin_family = AF_INET; name.sin_port = local_port; name.sin_addr = local_address; - memset (name.sin_zero, 0, sizeof (name.sin_zero)); /* Make a socket... */ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) |