diff options
Diffstat (limited to 'contrib/isc-dhcp/includes')
| -rw-r--r-- | contrib/isc-dhcp/includes/cf/aix.h | 89 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/dhcpd.h | 17 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/dhctoken.h | 1 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/osdep.h | 37 |
4 files changed, 137 insertions, 7 deletions
diff --git a/contrib/isc-dhcp/includes/cf/aix.h b/contrib/isc-dhcp/includes/cf/aix.h new file mode 100644 index 000000000000..8a1b4d51ff31 --- /dev/null +++ b/contrib/isc-dhcp/includes/cf/aix.h @@ -0,0 +1,89 @@ +/* aix.h */ +/* + * Copyright (c) 1996 The Internet Software Consortium. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of The Internet Software Consortium nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND + * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#define int8_t char +#define int16_t short +#define int32_t long + +#define u_int8_t unsigned char +#define u_int16_t unsigned short +#define u_int32_t unsigned long + +#include <sys/types.h> + +#include <syslog.h> + +#include <string.h> +#include <errno.h> +#include <unistd.h> +#include <sys/select.h> +#include <sys/wait.h> +#include <signal.h> +#include <setjmp.h> +#include <limits.h> + +extern int h_errno; + +#include <net/if.h> +#include <net/if_arp.h> +#include <net/if_dl.h> + +#ifndef _PATH_DHCPD_PID +#define _PATH_DHCPD_PID "/etc/dhcpd.pid" +#endif +#ifndef _PATH_DHCLIENT_PID +#define _PATH_DHCLIENT_PID "/etc/dhclient.pid" +#endif +#ifndef _PATH_DHCRELAY_PID +#define _PATH_DHCRELAY_PID "/etc/dhcrelay.pid" +#endif + +#include <varargs.h> +#define VA_DOTDOTDOT va_alist +#define VA_start(list, last) va_start (list) + +#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list) +#define NO_SNPRINTF + +#define EOL '\n' +#define VOIDPTR void * + +#include <time.h> + +#define TIME time_t +#define GET_TIME(x) time ((x)) + +#define random rand + +#define USE_SOCKETS 1 +#define HAVE_SA_LEN 1 +#undef FDDI diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h index a1059e94eb59..958178ddbde4 100644 --- a/contrib/isc-dhcp/includes/dhcpd.h +++ b/contrib/isc-dhcp/includes/dhcpd.h @@ -160,6 +160,10 @@ struct lease_state { struct iaddr from; + int max_message_size; + u_int8_t *prl; + int prl_len; + u_int32_t xid; u_int16_t secs; u_int16_t bootp_flags; @@ -209,6 +213,7 @@ struct group { int use_host_decl_names; int use_lease_addr_for_default_route; int authoritative; + int always_reply_rfc1048; struct tree_cache *options [256]; }; @@ -332,6 +337,7 @@ struct client_state { enum dhcp_state state; /* Current state for this interface. */ struct iaddr destination; /* Where to send packet. */ u_int32_t xid; /* Transaction ID. */ + u_int16_t secs; /* secs value from DHCPDISCOVER. */ TIME first_sending; /* When was first copy sent? */ TIME interval; /* What's the current resend interval? */ struct string_list *medium; /* Last media type tried. */ @@ -457,8 +463,9 @@ typedef unsigned char option_mask [16]; void parse_options PROTO ((struct packet *)); void parse_option_buffer PROTO ((struct packet *, unsigned char *, int)); -int cons_options PROTO ((struct packet *, struct dhcp_packet *, - struct tree_cache **, int, int, int)); +int cons_options PROTO ((struct packet *, struct dhcp_packet *, int, + struct tree_cache **, int, int, int, + u_int8_t *, int)); int store_options PROTO ((unsigned char *, int, struct tree_cache **, unsigned char *, int, int, int, int)); char *pretty_print_option PROTO ((unsigned int, @@ -674,6 +681,7 @@ ssize_t receive_packet PROTO ((struct interface_info *, #endif #if defined (USE_SOCKET_SEND) && !defined (USE_SOCKET_FALLBACK) int can_unicast_without_arp PROTO ((void)); +int can_receive_unicast_unconfigured PROTO ((struct interface_info *)); void maybe_setup_fallback PROTO ((void)); #endif @@ -698,6 +706,7 @@ ssize_t receive_packet PROTO ((struct interface_info *, #endif #if defined (USE_BPF_SEND) int can_unicast_without_arp PROTO ((void)); +int can_receive_unicast_unconfigured PROTO ((struct interface_info *)); void maybe_setup_fallback PROTO ((void)); #endif @@ -722,6 +731,7 @@ ssize_t receive_packet PROTO ((struct interface_info *, #endif #if defined (USE_LPF_SEND) int can_unicast_without_arp PROTO ((void)); +int can_receive_unicast_unconfigured PROTO ((struct interface_info *)); void maybe_setup_fallback PROTO ((void)); #endif @@ -747,6 +757,7 @@ ssize_t receive_packet PROTO ((struct interface_info *, #endif #if defined (USE_NIT_SEND) int can_unicast_without_arp PROTO ((void)); +int can_receive_unicast_unconfigured PROTO ((struct interface_info *)); void maybe_setup_fallback PROTO ((void)); #endif @@ -767,6 +778,7 @@ ssize_t receive_packet PROTO ((struct interface_info *, #endif #if defined (USE_DLPI_SEND) int can_unicast_without_arp PROTO ((void)); +int can_receive_unicast_unconfigured PROTO ((struct interface_info *)); void maybe_setup_fallback PROTO ((void)); #endif @@ -779,6 +791,7 @@ ssize_t send_packet PROTO ((struct interface_info *, struct in_addr, struct sockaddr_in *, struct hardware *)); int can_unicast_without_arp PROTO ((void)); +int can_receive_unicast_unconfigured PROTO ((struct interface_info *)); void maybe_setup_fallback PROTO ((void)); #endif diff --git a/contrib/isc-dhcp/includes/dhctoken.h b/contrib/isc-dhcp/includes/dhctoken.h index 73f6879e3ddf..2aeb5303af10 100644 --- a/contrib/isc-dhcp/includes/dhctoken.h +++ b/contrib/isc-dhcp/includes/dhctoken.h @@ -128,6 +128,7 @@ #define USE_LEASE_ADDR_FOR_DEFAULT_ROUTE 332 #define AUTHORITATIVE 333 #define TOKEN_NOT 334 +#define ALWAYS_REPLY_RFC1048 335 #define is_identifier(x) ((x) >= FIRST_TOKEN && \ (x) != STRING && \ diff --git a/contrib/isc-dhcp/includes/osdep.h b/contrib/isc-dhcp/includes/osdep.h index f3c6b2ff5d33..5db5d8a5865e 100644 --- a/contrib/isc-dhcp/includes/osdep.h +++ b/contrib/isc-dhcp/includes/osdep.h @@ -75,6 +75,10 @@ # endif #endif +#ifdef aix +# include "cf/aix.h" +#endif + #ifdef bsdi # include "cf/bsdos.h" #endif @@ -115,14 +119,18 @@ # include "cf/cygwin32.h" #endif -#ifdef NeXT -# ifdef __APPLE__ -# include "cf/rhapsody.h" -# else +#ifdef __APPLE__ +# include "cf/rhapsody.h" +#else +# if defined (NeXT) # include "cf/nextstep.h" # endif #endif +#if defined(IRIX) || defined(__sgi) +# include "cf/irix.h" +#endif + #if !defined (TIME_MAX) # define TIME_MAX 2147483647 #endif @@ -247,6 +255,26 @@ # define HAVE_ARPHRD_LOOPBACK #endif +#if defined (ARPHRD_ROSE) && !defined (HAVE_ARPHRD_ROSE) +# define HAVE_ARPHRD_ROSE +#endif + +#if defined (ARPHRD_IEEE802) && !defined (HAVE_ARPHRD_IEEE802) +# define HAVE_ARPHRD_IEEE802 +#endif + +#if defined (ARPHRD_FDDI) && !defined (HAVE_ARPHRD_FDDI) +# define HAVE_ARPHRD_FDDI +#endif + +#if defined (ARPHRD_AX25) && !defined (HAVE_ARPHRD_AX25) +# define HAVE_ARPHRD_AX25 +#endif + +#if defined (ARPHRD_NETROM) && !defined (HAVE_ARPHRD_NETROM) +# define HAVE_ARPHRD_NETROM +#endif + #if defined (ARPHRD_METRICOM) && !defined (HAVE_ARPHRD_METRICOM) # define HAVE_ARPHRD_METRICOM #endif @@ -262,4 +290,3 @@ #if defined (AF_LINK) && !defined (HAVE_AF_LINK) # define HAVE_AF_LINK #endif - |