diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/cf/linux.h | 9 | ||||
| -rw-r--r-- | includes/cf/sunos5-5.h | 11 | ||||
| -rw-r--r-- | includes/dhcp.h | 5 | ||||
| -rw-r--r-- | includes/dhcpd.h | 16 | ||||
| -rw-r--r-- | includes/dhctoken.h | 3 | ||||
| -rw-r--r-- | includes/omapip/trace.h | 4 | ||||
| -rw-r--r-- | includes/osdep.h | 14 |
7 files changed, 50 insertions, 12 deletions
diff --git a/includes/cf/linux.h b/includes/cf/linux.h index 6cefbd0e..1028a9ca 100644 --- a/includes/cf/linux.h +++ b/includes/cf/linux.h @@ -5,7 +5,7 @@ Based on a configuration originally supplied by Jonathan Stone. */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -98,6 +98,11 @@ extern int h_errno; #define VOIDPTR void * +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || \ + defined(__sparc64__) +# define PTRSIZE_64BIT +#endif + #define EOL '\n' /* Time stuff... */ @@ -108,7 +113,7 @@ extern int h_errno; #define GET_TIME(x) time ((x)) #if (LINUX_MAJOR >= 2) -# if (LINUX_MINOR >= 1) +# if ((LINUX_MAJOR > 2) || (LINUX_MINOR >= 1)) # if defined (USE_DEFAULT_NETWORK) # define USE_LPF # endif diff --git a/includes/cf/sunos5-5.h b/includes/cf/sunos5-5.h index 8a1e416b..e9789d60 100644 --- a/includes/cf/sunos5-5.h +++ b/includes/cf/sunos5-5.h @@ -3,7 +3,7 @@ System dependencies for Solaris 2.x (tested on 2.5 with gcc)... */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -34,9 +34,18 @@ /* SunOS defines uint*_t and int*_t, but not u_int*_t. */ +#if defined(_SYS_INT_TYPES_H) typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; typedef uint32_t u_int32_t; +#else /* Older SunOS has no idea what these things mean. */ +typedef int8_t char +typedef int16_t short +typedef int32_t int /* If _LP64, long is 64-bit, int is still 32. */ +typedef u_int8_t unsigned char +typedef u_int16_t unsigned short +typedef u_int32_t unsigned int +#endif /* defined(_SYS_INT_TYPES_H) */ /* The jmp_buf type is an array on Solaris, so we can't dereference it and must declare it differently. */ diff --git a/includes/dhcp.h b/includes/dhcp.h index 76dd07bb..38a594ea 100644 --- a/includes/dhcp.h +++ b/includes/dhcp.h @@ -3,7 +3,7 @@ Protocol structures... */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1995-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -30,8 +30,7 @@ * To learn more about Vixie Enterprises, see ``http://www.vix.com''. */ -#define DHCP_UDP_OVERHEAD (14 + /* Ethernet header */ \ - 20 + /* IP header */ \ +#define DHCP_UDP_OVERHEAD (20 + /* IP header */ \ 8) /* UDP header */ #define DHCP_SNAME_LEN 64 #define DHCP_FILE_LEN 128 diff --git a/includes/dhcpd.h b/includes/dhcpd.h index dc3f52e8..d9c911fc 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -187,6 +187,9 @@ struct option_cache { struct expression *expression; struct option *option; struct data_string data; + + #define OPTION_HAD_NULLS 0x00000001 + u_int32_t flags; }; struct option_state { @@ -313,8 +316,15 @@ struct lease { struct lease_state *state; + /* 'tsfp' is more of an 'effective' tsfp. It may be calculated from + * stos+mclt for example if it's an expired lease and the server is + * in partner-down state. 'atsfp' is zeroed whenever a lease is + * updated - and only set when the peer acknowledges it. This + * ensures every state change is transmitted. + */ TIME tstp; /* Time sent to partner. */ TIME tsfp; /* Time sent from partner. */ + TIME atsfp; /* Actual time sent from partner. */ TIME cltt; /* Client last transaction time. */ struct lease *next_pending; }; @@ -331,7 +341,7 @@ struct lease_state { struct option_state *options; struct data_string parameter_request_list; int max_message_size; - u_int32_t expiry, renewal, rebind; + TIME expiry, renewal, rebind; struct data_string filename, server_name; int got_requested_address; int got_server_identifier; @@ -993,6 +1003,8 @@ int store_options PROTO ((int *, unsigned char *, unsigned, struct packet *, struct option_state *, struct binding_scope **, unsigned *, int, unsigned, unsigned, int, const char *)); +int format_has_text(const char *); +int format_min_length(const char *, struct option_cache *); const char *pretty_print_option PROTO ((struct option *, const unsigned char *, unsigned, int, int)); int get_option (struct data_string *, struct universe *, @@ -1769,7 +1781,7 @@ int if_readsocket PROTO ((omapi_object_t *)); void reinitialize_interfaces PROTO ((void)); /* dispatch.c */ -void set_time (u_int32_t); +void set_time(TIME); struct timeval *process_outstanding_timeouts (struct timeval *); void dispatch PROTO ((void)); isc_result_t got_one PROTO ((omapi_object_t *)); diff --git a/includes/dhctoken.h b/includes/dhctoken.h index 858e3c98..da8da3d4 100644 --- a/includes/dhctoken.h +++ b/includes/dhctoken.h @@ -308,7 +308,8 @@ enum dhcp_token { REFRESH = 612, DOMAIN_NAME = 613, DO_FORWARD_UPDATE = 614, - KNOWN_CLIENTS = 615 + KNOWN_CLIENTS = 615, + ATSFP = 616 }; #define is_identifier(x) ((x) >= FIRST_TOKEN && \ diff --git a/includes/omapip/trace.h b/includes/omapip/trace.h index d48c3700..028798f8 100644 --- a/includes/omapip/trace.h +++ b/includes/omapip/trace.h @@ -3,7 +3,7 @@ Definitions for omapi tracing facility... */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2001-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -90,7 +90,7 @@ typedef struct { void trace_free_all (void); int trace_playback (void); int trace_record (void); -isc_result_t trace_init (void (*set_time) (u_int32_t), const char *, int); +isc_result_t trace_init (void (*set_time) (TIME), const char *, int); isc_result_t trace_begin (const char *, const char *, int); isc_result_t trace_write_packet (trace_type_t *, unsigned, const char *, const char *, int); diff --git a/includes/osdep.h b/includes/osdep.h index 5d1bc912..d5f47a76 100644 --- a/includes/osdep.h +++ b/includes/osdep.h @@ -3,7 +3,7 @@ Operating system dependencies... */ /* - * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2005 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * Permission to use, copy, modify, and distribute this software for any @@ -271,6 +271,18 @@ # define HAVE_ARPHRD_ROSE #endif +#if defined (ARPHRD_IRDA) && !defined (HAVE_ARPHRD_IRDA) +# define HAVE_ARPHRD_IRDA +#endif + +#if defined (ARPHRD_SIT) && !defined (HAVE_ARPHRD_SIT) +# define HAVE_ARPHRD_SIT +#endif + +#if defined (ARPHRD_IEEE1394) & !defined (HAVE_ARPHRD_IEEE1394) +# define HAVE_ARPHRD_IEEE1394 +#endif + #if defined (ARPHRD_IEEE802) && !defined (HAVE_ARPHRD_IEEE802) # define HAVE_ARPHRD_IEEE802 #endif |