diff -rNc2 dhcp-2.0b1pl8/Makefile.conf dhcp-2.0b1pl9/Makefile.conf *** dhcp-2.0b1pl8/Makefile.conf Tue Dec 22 14:21:28 1998 --- dhcp-2.0b1pl9/Makefile.conf Wed Feb 3 11:46:04 1999 *************** *** 1,5 **** # Makefile.conf # ! # Copyright (c) 1996, 1997, 1998 The Internet Software Consortium. # All rights reserved. # --- 1,5 ---- # Makefile.conf # ! # Copyright (c) 1996, 1997, 1998, 1999 The Internet Software Consortium. # All rights reserved. # *************** *** 213,216 **** --- 213,229 ---- #SCRIPT=linux ##--linux-2.1-- + + ## Linux 2.2 + ##--linux-2.2-- + #COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=2 + #CF = cf/linux.h + #ADMMANDIR = /usr/man/man8 + #ADMMANEXT = .8 + #FFMANDIR = /usr/man/man5 + #FFMANEXT = .5 + #VARRUN = /var/run + #VARDB = /var/dhcpd + #SCRIPT=linux + ##--linux-2.2-- ## SCO diff -rNc2 dhcp-2.0b1pl8/README dhcp-2.0b1pl9/README *** dhcp-2.0b1pl8/README Wed Dec 23 06:18:43 1998 --- dhcp-2.0b1pl9/README Wed Feb 3 11:53:32 1999 *************** *** 1,6 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 8 ! December 23, 1998 This is the first Beta release of Version 2 of the Internet Software --- 1,6 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 9 ! February 3, 1998 This is the first Beta release of Version 2 of the Internet Software *************** *** 47,53 **** the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl8.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl8 subdirectory that you've just created and configure the source tree by typing: --- 47,53 ---- the tar utility and the gzip command - type something like: ! zcat dhcp-2.0b1pl9.tar.gz |tar xvf - ! Now, cd to the dhcp-2.0b1pl9 subdirectory that you've just created and configure the source tree by typing: diff -rNc2 dhcp-2.0b1pl8/RELNOTES dhcp-2.0b1pl9/RELNOTES *** dhcp-2.0b1pl8/RELNOTES Wed Dec 23 06:18:45 1998 --- dhcp-2.0b1pl9/RELNOTES Wed Feb 3 11:53:11 1999 *************** *** 1,6 **** Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 8 ! December 23, 1998 Release Notes --- 1,6 ---- Internet Software Consortium Dynamic Host Configuration Protocol Distribution ! Version 2, Beta 1, Patchlevel 9 ! February 3, 1998 Release Notes *************** *** 35,39 **** This version is now in Beta testing, and is planned for release in ! mid-1998. It has a number of new features, and is the release that we would expect sites that want some stability but need the new lease testing feature, or need a client or relay agent. Note that it is --- 35,39 ---- This version is now in Beta testing, and is planned for release in ! mid-1999. It has a number of new features, and is the release that we would expect sites that want some stability but need the new lease testing feature, or need a client or relay agent. Note that it is *************** *** 47,51 **** experiment, or for sites that desperately need the new features. ! CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 6 - Add support for Linux Packet Filter (thanks to Brian Murrell, Interlinx). --- 47,98 ---- experiment, or for sites that desperately need the new features. ! CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 8 ! ! - Fix socket API fallback setup code, which was causing Linux servers ! and clients to loop endlessly on select when run as daemons. ! ! - Add support for Linux 2.2 version number (treated the same as Linux ! 2.1, for now). ! ! - Correct apparent error in DHCPREQUEST destination address handling ! when in INIT-REBOOT state. ! ! - Do not set BROADCAST flag if we have a valid IP address. ! ! - Remove hard-coded filenames and use system-specific manifest ! constants. ! ! - Add entry and exit hooks to Linux dhclient-script (should be added ! to all operating systems once tested). ! ! - Test for linux major and minor version so as to correctly invoke ! network configuration programs. ! ! - Add support for Linux's gratuitous name change of bpf_insn structure ! (can't pollute precious Linux sources with the "Berkeley" word, I ! guess. ! ! - Correct USE_BPF_{SEND,RECEIVE} ifdefs for if_reinitialize_* ! functions. ! ! - Ensure that we have ifreq structure before initializing interface - ! if an interface was specified on the command line on Linux, this was ! not the case. ! ! - Get rid of references to enstamp structure in lpf.c. Correctly ! declare and initialize sock_fprog structure (aka bpf_filter ! structure on non-Linux machines). ! ! - Define ssize_t on Ultrix. ! ! CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 7 ! ! - Generalize FDDI support. ! ! - Fix potential core dump in interface discovery code. ! ! - Put explicit release versions on startup messages. ! ! CHANGES FROM VERSION 2.0 BETA 1 PATCHLEVEL 6 - Add support for Linux Packet Filter (thanks to Brian Murrell, Interlinx). diff -rNc2 dhcp-2.0b1pl8/client/dhclient.c dhcp-2.0b1pl9/client/dhclient.c *** dhcp-2.0b1pl8/client/dhclient.c Wed Dec 23 06:18:49 1998 --- dhcp-2.0b1pl9/client/dhclient.c Wed Feb 3 11:41:21 1999 *************** *** 4,9 **** /* ! * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. ! * All rights reserved. * * Redistribution and use in source and binary forms, with or without --- 4,9 ---- /* ! * Copyright (c) 1995, 1996, 1997, 1998, 1999 ! * The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without *************** *** 57,61 **** #ifndef lint static char ocopyright[] = ! "$Id: dhclient.c,v 1.44.2.7 1998/12/23 14:18:49 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 57,61 ---- #ifndef lint static char ocopyright[] = ! "$Id: dhclient.c,v 1.44.2.10 1999/02/03 19:41:21 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 91,97 **** static char copyright[] = ! "Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl8"; static char contrib [] = "\nPlease contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n"; --- 91,97 ---- static char copyright[] = ! "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl9"; static char contrib [] = "\nPlease contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n"; *************** *** 1247,1250 **** --- 1247,1251 ---- broadcast the DHCPREQUEST rather than unicasting. */ if (ip -> client -> state == S_REQUESTING || + ip -> client -> state == S_REBOOTING || cur_time > ip -> client -> active -> rebind) destination.sin_addr.s_addr = INADDR_BROADCAST; *************** *** 1524,1528 **** ip -> client -> packet.xid = ip -> client -> xid; ip -> client -> packet.secs = 0; /* Filled in by send_request. */ - ip -> client -> packet.flags = htons (BOOTP_BROADCAST); /* If we own the address we're requesting, put it in ciaddr; --- 1525,1528 ---- *************** *** 1530,1539 **** if (ip -> client -> state == S_BOUND || ip -> client -> state == S_RENEWING || ! ip -> client -> state == S_REBINDING) memcpy (&ip -> client -> packet.ciaddr, lease -> address.iabuf, lease -> address.len); ! else memset (&ip -> client -> packet.ciaddr, 0, sizeof ip -> client -> packet.ciaddr); memset (&ip -> client -> packet.yiaddr, 0, --- 1530,1542 ---- if (ip -> client -> state == S_BOUND || ip -> client -> state == S_RENEWING || ! ip -> client -> state == S_REBINDING) { memcpy (&ip -> client -> packet.ciaddr, lease -> address.iabuf, lease -> address.len); ! ip -> client -> packet.flags = 0; ! } else { memset (&ip -> client -> packet.ciaddr, 0, sizeof ip -> client -> packet.ciaddr); + ip -> client -> packet.flags = htons (BOOTP_BROADCAST); + } memset (&ip -> client -> packet.yiaddr, 0, *************** *** 1735,1739 **** leaseFile = fopen (path_dhclient_db, "w"); if (!leaseFile) ! error ("can't create /var/db/dhclient.leases: %m"); /* Write out all the leases attached to configured interfaces that --- 1738,1742 ---- leaseFile = fopen (path_dhclient_db, "w"); if (!leaseFile) ! error ("can't create %s: %m", path_dhclient_db); /* Write out all the leases attached to configured interfaces that *************** *** 1783,1787 **** leaseFile = fopen (path_dhclient_db, "w"); if (!leaseFile) ! error ("can't create /var/db/dhclient.leases: %m"); } --- 1786,1790 ---- leaseFile = fopen (path_dhclient_db, "w"); if (!leaseFile) ! error ("can't create %s: %m", path_dhclient_db); } diff -rNc2 dhcp-2.0b1pl8/client/scripts/linux dhcp-2.0b1pl9/client/scripts/linux *** dhcp-2.0b1pl8/client/scripts/linux Mon Jul 13 09:14:09 1998 --- dhcp-2.0b1pl9/client/scripts/linux Wed Feb 3 10:59:47 1999 *************** *** 1,4 **** --- 1,5 ---- #!/bin/sh # dhclient-script for Linux. Dan Halbert, March, 1997. + # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. # No guarantees about this. I'm a novice at the details of Linux # networking. *************** *** 22,25 **** --- 23,52 ---- # of the $1 in its args. + # Must be used on exit. Invokes the local dhcp client exit hooks, if any. + function exit_with_hooks() { + exit_status=$1 + if [ -x /etc/dhclient-exit-hooks ]; then + . /etc/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script + exit $exit_status + } + + # Invoke the local dhcp client enter hooks, if they exist. + if [ -x /etc/dhclient-enter-hooks ]; then + exit_status=0 + . /etc/dhclient-enter-hooks + # allow the local script to abort processing of this state + # local script must set exit_status variable to nonzero. + if [ $exit_status -ne 0 ]; then + exit $exit_status + fi + fi + + release=`uname -r` + release=`expr $release : '\(.*\)\..*'` + relmajor=`echo $release |sed -e 's/^\([^\.]*\)\..*$/\1/'` + relminor=`echo $release |sed -e 's/^.*\.\([^\.]*\)$/\1/'` + if [ x$new_broadcast_address != x ]; then new_broadcast_arg="broadcast $new_broadcast_address" *************** *** 40,44 **** if [ x$reason = xMEDIUM ]; then # Linux doesn't do mediums (ok, ok, media). ! exit 0 fi --- 67,71 ---- if [ x$reason = xMEDIUM ]; then # Linux doesn't do mediums (ok, ok, media). ! exit_with_hooks 0 fi *************** *** 48,60 **** ifconfig $interface:0- inet 0 fi ! ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ broadcast 255.255.255.255 up ! # Add route to make broadcast work. Do not omit netmask. ! route add default dev $interface netmask 0.0.0.0 ! exit 0 fi if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then ! exit 0; fi --- 75,95 ---- ifconfig $interface:0- inet 0 fi ! if [ $relmajor -lt 2 ] || ( [ $relmajor == 2 ] && [ $relminor == 0 ] ); then ! ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ broadcast 255.255.255.255 up ! # Add route to make broadcast work. Do not omit netmask. ! route add default dev $interface netmask 0.0.0.0 ! else ! ifconfig $interface up ! fi ! ! # We need to give the kernel some time to get the interface up. ! sleep 1 ! ! exit_with_hooks 0 fi if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then ! exit_with_hooks 0 fi *************** *** 76,82 **** ifconfig $interface inet $new_ip_address $new_subnet_arg \ ! $new_broadcast_arg # Add a network route to the computed network address. ! route add -net $new_network_number $new_subnet_arg dev $interface for router in $new_routers; do route add default gw $router --- 111,120 ---- ifconfig $interface inet $new_ip_address $new_subnet_arg \ ! $new_broadcast_arg # Add a network route to the computed network address. ! if [ $relmajor -lt 2 ] || \ ! ( [ $relmajor == 2 ] && [ $relminor == 0 ] ); then ! route add -net $new_network_number $new_subnet_arg dev $interface ! fi for router in $new_routers; do route add default gw $router *************** *** 89,97 **** route add -host $alias_ip_address $interface:0 fi ! echo domain $new_domain_name >/etc/resolv.conf for nameserver in $new_domain_name_servers; do echo nameserver $nameserver >>/etc/resolv.conf done ! exit 0 fi --- 127,135 ---- route add -host $alias_ip_address $interface:0 fi ! echo search $new_domain_name >/etc/resolv.conf for nameserver in $new_domain_name_servers; do echo nameserver $nameserver >>/etc/resolv.conf done ! exit_with_hooks 0 fi *************** *** 109,113 **** route add -host $alias_ip_address $interface:0 fi ! exit 0 fi --- 147,151 ---- route add -host $alias_ip_address $interface:0 fi ! exit_with_hooks 0 fi *************** *** 120,124 **** set $new_routers ############## what is -w in ping? ! if ping -q -c 1 -w 1 $1; then if [ x$new_ip_address != x$alias_ip_address ] && \ [ x$alias_ip_address != x ]; then --- 158,162 ---- set $new_routers ############## what is -w in ping? ! if ping -q -c 1 $1; then if [ x$new_ip_address != x$alias_ip_address ] && \ [ x$alias_ip_address != x ]; then *************** *** 126,130 **** route add -host $alias_ip_address dev $interface:0 fi ! route add -net $new_network_number for router in $new_routers; do route add default gw $router --- 164,171 ---- route add -host $alias_ip_address dev $interface:0 fi ! if [ $relmajor -lt 2 ] || \ ! ( [ $relmajor == 2 ] && [ $relminor == 0 ] ); then ! route add -net $new_network_number ! fi for router in $new_routers; do route add default gw $router *************** *** 138,146 **** ln /etc/resolv.conf.std /etc/resolv.conf fi ! exit 0 fi ifconfig $interface inet down ! exit 1 fi ! exit 0 --- 179,187 ---- ln /etc/resolv.conf.std /etc/resolv.conf fi ! exit_with_hooks 0 fi ifconfig $interface inet down ! exit_with_hooks 1 fi ! exit_with_hooks 0 diff -rNc2 dhcp-2.0b1pl8/common/bpf.c dhcp-2.0b1pl9/common/bpf.c *** dhcp-2.0b1pl8/common/bpf.c Tue Dec 22 14:39:19 1998 --- dhcp-2.0b1pl9/common/bpf.c Wed Feb 3 11:46:04 1999 *************** *** 4,9 **** /* ! * Copyright (c) 1995, 1996 The Internet Software Consortium. ! * All rights reserved. * * Redistribution and use in source and binary forms, with or without --- 4,9 ---- /* ! * Copyright (c) 1995, 1996, 1998, 1999 ! * The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without *************** *** 43,62 **** #ifndef lint static char copyright[] = ! "$Id: bpf.c,v 1.19.2.2 1998/12/22 22:39:19 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" ! #if defined (USE_BPF_SEND) || defined (USE_BPF_RECEIVE) ! #include ! #include - #include - #ifdef NEED_OSF_PFILT_HACKS - #include - #endif #include #include "includes/netinet/ip.h" #include "includes/netinet/udp.h" #include "includes/netinet/if_ether.h" /* Reinitializes the specified interface after an address change. This --- 43,72 ---- #ifndef lint static char copyright[] = ! "$Id: bpf.c,v 1.19.2.4 1999/02/03 19:46:04 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" ! #if defined (USE_BPF_SEND) || defined (USE_BPF_RECEIVE) \ ! || defined (USE_LPF_RECEIVE) ! # if defined (USE_LPF_RECEIVE) ! # include ! # include ! # include ! # define bpf_insn sock_filter /* Linux: dare to be gratuitously different. */ ! # else ! # include ! # include ! ! # include ! # if defined (NEED_OSF_PFILT_HACKS) ! # include ! # endif ! # endif #include #include "includes/netinet/ip.h" #include "includes/netinet/udp.h" #include "includes/netinet/if_ether.h" + #endif /* Reinitializes the specified interface after an address change. This *************** *** 81,84 **** --- 91,95 ---- mask. */ + #if defined (USE_BPF_SEND) || defined (USE_BPF_RECEIVE) int if_register_bpf (info) struct interface_info *info; diff -rNc2 dhcp-2.0b1pl8/common/dispatch.c dhcp-2.0b1pl9/common/dispatch.c *** dhcp-2.0b1pl8/common/dispatch.c Wed Dec 23 06:14:48 1998 --- dhcp-2.0b1pl9/common/dispatch.c Wed Feb 3 11:46:05 1999 *************** *** 4,8 **** /* ! * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. * All rights reserved. * --- 4,8 ---- /* ! * Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. * All rights reserved. * *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: dispatch.c,v 1.47.2.6 1998/12/23 14:14:48 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char copyright[] = ! "$Id: dispatch.c,v 1.47.2.8 1999/02/03 19:46:05 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 300,308 **** break; ! /* If we already found the interface with SIOCGIFCONF, ! go on to the next. */ ! if (tmp) continue; /* Otherwise, allocate one. */ tmp = ((struct interface_info *) --- 300,322 ---- break; ! /* If we found one, and it already has an ifreq ! structure, nothing more to do.. */ ! if (tmp && tmp -> ifp) continue; + /* Make up an ifreq structure. */ + tif = (struct ifreq *)malloc (sizeof (struct ifreq)); + if (!tif) + error ("no space to remember ifp."); + memset (tif, 0, sizeof (struct ifreq)); + strcpy (tif -> ifr_name, name); + + /* Now, if we just needed the ifreq structure, hook + it in and move on. */ + if (tmp) { + tmp -> ifp = tif; + continue; + } + /* Otherwise, allocate one. */ tmp = ((struct interface_info *) *************** *** 314,323 **** strcpy (tmp -> name, name); - /* Mock up an ifreq structure. */ - tif = (struct ifreq *)malloc (sizeof (struct ifreq)); - if (!tif) - error ("no space to remember ifp."); - memset (tif, 0, sizeof (struct ifreq)); - strcpy (tif -> ifr_name, name); tmp -> ifp = tif; tmp -> flags = ir; --- 328,331 ---- diff -rNc2 dhcp-2.0b1pl8/common/lpf.c dhcp-2.0b1pl9/common/lpf.c *** dhcp-2.0b1pl8/common/lpf.c Tue Dec 22 14:34:54 1998 --- dhcp-2.0b1pl9/common/lpf.c Wed Feb 3 11:46:04 1999 *************** *** 5,10 **** /* ! * Copyright (c) 1995, 1996, 1998 The Internet Software Consortium. ! * All rights reserved. * * Redistribution and use in source and binary forms, with or without --- 5,10 ---- /* ! * Copyright (c) 1995, 1996, 1998, 1999 ! * The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without *************** *** 44,48 **** #ifndef lint static char copyright[] = ! "$Id: lpf.c,v 1.1 1998/12/22 22:34:54 mellon Exp $ Copyright (c) 1995, 1996, 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 44,48 ---- #ifndef lint static char copyright[] = ! "$Id: lpf.c,v 1.1.2.2 1999/02/03 19:46:04 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 52,56 **** #include ! #include #include #include "includes/netinet/ip.h" --- 52,58 ---- #include ! #include ! #include ! #include #include #include "includes/netinet/ip.h" *************** *** 127,131 **** /* Defined in bpf.c. We can't extern these in dhcpd.h without pulling in bpf includes... */ ! extern struct bpf_insn dhcp_bpf_filter []; extern int dhcp_bpf_filter_len; --- 129,133 ---- /* Defined in bpf.c. We can't extern these in dhcpd.h without pulling in bpf includes... */ ! extern struct sock_filter dhcp_bpf_filter []; extern int dhcp_bpf_filter_len; *************** *** 133,136 **** --- 135,140 ---- struct interface_info *info; { + struct sock_fprog p; + /* Open a LPF device and hang it on this interface... */ info -> rfdesc = if_register_lpf (info); *************** *** 138,143 **** /* Set up the bpf filter program structure. This is defined in bpf.c */ ! p.bf_len = dhcp_bpf_filter_len; ! p.bf_insns = dhcp_bpf_filter; /* Patch the server port into the LPF program... --- 142,147 ---- /* Set up the bpf filter program structure. This is defined in bpf.c */ ! p.len = dhcp_bpf_filter_len; ! p.filter = dhcp_bpf_filter; /* Patch the server port into the LPF program... *************** *** 198,202 **** int length = 0; int offset = 0; ! unsigned char ibuf [1500 + sizeof (struct enstamp)]; int bufix = 0; --- 202,206 ---- int length = 0; int offset = 0; ! unsigned char ibuf [1500]; int bufix = 0; *************** *** 205,209 **** return length; ! bufix = sizeof (struct enstamp); /* Decode the physical header... */ offset = decode_hw_header (interface, ibuf, bufix, hfrom); --- 209,213 ---- return length; ! bufix = 0; /* Decode the physical header... */ offset = decode_hw_header (interface, ibuf, bufix, hfrom); diff -rNc2 dhcp-2.0b1pl8/common/socket.c dhcp-2.0b1pl9/common/socket.c *** dhcp-2.0b1pl8/common/socket.c Tue Dec 22 14:45:05 1998 --- dhcp-2.0b1pl9/common/socket.c Wed Feb 3 11:46:04 1999 *************** *** 4,9 **** /* ! * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. ! * All rights reserved. * * Redistribution and use in source and binary forms, with or without --- 4,9 ---- /* ! * Copyright (c) 1995, 1996, 1997, 1998, 1999 ! * The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without *************** *** 51,55 **** #ifndef lint static char copyright[] = ! "$Id: socket.c,v 1.26.2.4 1998/12/22 22:45:05 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 51,55 ---- #ifndef lint static char copyright[] = ! "$Id: socket.c,v 1.26.2.6 1999/02/03 19:46:04 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 273,277 **** if (fbi) { fbi -> wfdesc = if_register_socket (fbi); ! add_protocol ("fallback", fbi -> rfdesc, got_one, fbi); } #endif --- 273,278 ---- if (fbi) { fbi -> wfdesc = if_register_socket (fbi); ! add_protocol ("fallback", ! fbi -> wfdesc, fallback_discard, fbi); } #endif diff -rNc2 dhcp-2.0b1pl8/configure dhcp-2.0b1pl9/configure *** dhcp-2.0b1pl8/configure Thu Jun 25 11:34:46 1998 --- dhcp-2.0b1pl9/configure Wed Feb 3 10:53:36 1999 *************** *** 22,25 **** --- 22,26 ---- 1*) sysname=linux-1 ;; 2.1*) sysname=linux-2.1 ;; + 2.2*) sysname=linux-2.2 ;; 2*) sysname=linux-2.0 ;; esac;; diff -rNc2 dhcp-2.0b1pl8/includes/cf/ultrix.h dhcp-2.0b1pl9/includes/cf/ultrix.h *** dhcp-2.0b1pl8/includes/cf/ultrix.h Fri Nov 21 23:52:43 1997 --- dhcp-2.0b1pl9/includes/cf/ultrix.h Wed Feb 3 11:46:03 1999 *************** *** 4,8 **** /* ! * Copyright (c) 1996 The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without --- 4,9 ---- /* ! * Copyright (c) 1996, 1999 ! * The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without *************** *** 70,73 **** --- 71,76 ---- #define u_int16_t unsigned short #define u_int32_t unsigned long + + #define ssize_t size_t /* The jmp_buf type is an array on ultrix, so we can't dereference it diff -rNc2 dhcp-2.0b1pl8/relay/dhcrelay.c dhcp-2.0b1pl9/relay/dhcrelay.c *** dhcp-2.0b1pl8/relay/dhcrelay.c Wed Dec 23 06:18:52 1998 --- dhcp-2.0b1pl9/relay/dhcrelay.c Wed Feb 3 11:39:47 1999 *************** *** 4,8 **** /* ! * Copyright (c) 1997, 1998 The Internet Software Consortium. * All rights reserved. * --- 4,8 ---- /* ! * Copyright (c) 1997, 1998, 1999 The Internet Software Consortium. * All rights reserved. * *************** *** 43,47 **** #ifndef lint static char ocopyright [] = ! "$Id: dhcrelay.c,v 1.9.2.8 1998/12/23 14:18:52 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char ocopyright [] = ! "$Id: dhcrelay.c,v 1.9.2.9 1999/02/03 19:39:47 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ *************** *** 75,81 **** static char copyright [] = ! "Copyright 1997, 1998 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl8"; static char contrib [] = "\nPlease contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n"; --- 75,81 ---- static char copyright [] = ! "Copyright 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Relay Agent V2.0b1pl9"; static char contrib [] = "\nPlease contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n"; diff -rNc2 dhcp-2.0b1pl8/server/dhcp.c dhcp-2.0b1pl9/server/dhcp.c *** dhcp-2.0b1pl8/server/dhcp.c Sun Dec 20 09:53:02 1998 --- dhcp-2.0b1pl9/server/dhcp.c Wed Feb 3 11:46:05 1999 *************** *** 4,9 **** /* ! * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. ! * All rights reserved. * * Redistribution and use in source and binary forms, with or without --- 4,9 ---- /* ! * Copyright (c) 1995, 1996, 1997, 1998, 1999 ! * The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without *************** *** 43,47 **** #ifndef lint static char copyright[] = ! "$Id: dhcp.c,v 1.57.2.12 1998/12/20 17:53:02 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ --- 43,47 ---- #ifndef lint static char copyright[] = ! "$Id: dhcp.c,v 1.57.2.13 1999/02/03 19:46:05 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ diff -rNc2 dhcp-2.0b1pl8/server/dhcpd.c dhcp-2.0b1pl9/server/dhcpd.c *** dhcp-2.0b1pl8/server/dhcpd.c Wed Dec 23 06:18:47 1998 --- dhcp-2.0b1pl9/server/dhcpd.c Wed Feb 3 11:46:06 1999 *************** *** 4,9 **** /* ! * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. ! * All rights reserved. * * Redistribution and use in source and binary forms, with or without --- 4,9 ---- /* ! * Copyright (c) 1995, 1996, 1997, 1998, 1999 ! * The Internet Software Consortium. All rights reserved. * * Redistribution and use in source and binary forms, with or without *************** *** 43,53 **** #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.7 1998/12/23 14:18:47 mellon Exp $ Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium."; #endif static char copyright[] = ! "Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl8 "; static char contrib [] = "\nPlease contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n"; --- 43,53 ---- #ifndef lint static char ocopyright[] = ! "$Id: dhcpd.c,v 1.45.2.8 1999/02/03 19:46:06 mellon Exp $ Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium."; #endif static char copyright[] = ! "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; ! static char message [] = "Internet Software Consortium DHCP Server V2.0b1pl9 "; static char contrib [] = "\nPlease contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html\n";