diff options
| author | obrien <obrien@FreeBSD.org> | 2000-06-26 08:06:22 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-06-26 08:06:22 +0000 |
| commit | 188abf10cc1d39f9517f19d94881bd997bf5aa8f (patch) | |
| tree | 816c55034ab47ac28bc0db5a0d9e263a5b516ee3 /contrib/isc-dhcp/includes | |
| parent | ceecbe9d5e9f6710e3bb7396529fce457402dfd8 (diff) | |
| parent | 8bf3d0eae63400031a65954b5b5f2f7c49757d1a (diff) | |
| download | FreeBSD-src-188abf10cc1d39f9517f19d94881bd997bf5aa8f.zip FreeBSD-src-188abf10cc1d39f9517f19d94881bd997bf5aa8f.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r62104,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/isc-dhcp/includes')
| -rw-r--r-- | contrib/isc-dhcp/includes/dhcpd.h | 4 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/netinet/if_ether.h | 1 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/osdep.h | 6 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/version.h | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h index 56c001c..ddf34f0 100644 --- a/contrib/isc-dhcp/includes/dhcpd.h +++ b/contrib/isc-dhcp/includes/dhcpd.h @@ -660,7 +660,7 @@ void hash_dump PROTO ((struct hash_table *)); int if_register_socket PROTO ((struct interface_info *)); #endif -#ifdef USE_SOCKET_FALLBACK +#if defined (USE_SOCKET_FALLBACK) && !defined (USE_SOCKET_SEND) void if_reinitialize_fallback PROTO ((struct interface_info *)); void if_register_fallback PROTO ((struct interface_info *)); ssize_t send_fallback PROTO ((struct interface_info *, @@ -687,7 +687,7 @@ ssize_t receive_packet PROTO ((struct interface_info *, unsigned char *, size_t, struct sockaddr_in *, struct hardware *)); #endif -#if defined (USE_SOCKET_SEND) && !defined (USE_SOCKET_FALLBACK) +#if defined (USE_SOCKET_SEND) int can_unicast_without_arp PROTO ((void)); int can_receive_unicast_unconfigured PROTO ((struct interface_info *)); void maybe_setup_fallback PROTO ((void)); diff --git a/contrib/isc-dhcp/includes/netinet/if_ether.h b/contrib/isc-dhcp/includes/netinet/if_ether.h index cae5386..f61b18b 100644 --- a/contrib/isc-dhcp/includes/netinet/if_ether.h +++ b/contrib/isc-dhcp/includes/netinet/if_ether.h @@ -72,3 +72,4 @@ struct ether_header { #define ETHERMTU 1500 #define ETHERMIN (60-14) +#define ETHER_HEADER_SIZE (ETHER_ADDR_LEN * 2 + sizeof (u_int16_t)) diff --git a/contrib/isc-dhcp/includes/osdep.h b/contrib/isc-dhcp/includes/osdep.h index 5db5d8a..71a9859 100644 --- a/contrib/isc-dhcp/includes/osdep.h +++ b/contrib/isc-dhcp/includes/osdep.h @@ -107,7 +107,7 @@ # include "cf/sco.h" #endif -#ifdef hpux +#if defined (hpux) || defined (__hpux) # include "cf/hpux.h" #endif @@ -210,7 +210,9 @@ #if defined (USE_RAW_RECEIVE) || defined (USE_BPF_SEND) || \ defined (USE_NIT_RECEIVE) || defined (USE_UPF_RECEIVE) || \ - defined (USE_DLPI_RECEIVE) || defined (USE_LPF_RECEIVE) + defined (USE_DLPI_RECEIVE) || \ + defined (USE_LPF_SEND) || \ + (defined (USE_SOCKET_SEND) && defined (SO_BINDTODEVICE)) # define PACKET_DECODING #endif diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h index ff8348c..6d520fc 100644 --- a/contrib/isc-dhcp/includes/version.h +++ b/contrib/isc-dhcp/includes/version.h @@ -1,3 +1,3 @@ /* Current version of ISC DHCP Distribution. */ -#define DHCP_VERSION "2.0" +#define DHCP_VERSION "2.0pl1" |
