diff -rc --new-file DHCPD-BETA-4.6/Makefile.dist dhcpd46/Makefile.dist *** DHCPD-BETA-4.6/Makefile.dist Thu Jun 27 19:22:14 1996 --- dhcpd46/Makefile.dist Sat Jun 29 22:48:54 1996 *************** *** 151,156 **** --- 151,177 ---- #CATMANPAGES= ##--sco-- + ## AmigaOS + ##++AmigaOS++ + #CC = gcc + #CF = cf/amigaos.h + ##PREDEFINES= + #BINDIR = /gnu/bin + #ADMMANDIR = /gnu/share/man/cat8 + #ADMMANEXT = .0 + #FFMANDIR = /gnu/share/man/cat5 + #FFMANEXT = .0 + #INSTALL = install + #MANINSTALL = install + #CHMOD = chmod + #CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 + #ETC = /etc + #VARRUN = /var/run + #VARDB = /var/db + #COPTS = -Dfork=vfork -Wall -Wstrict-prototypes -Wno-unused -Wno-implicit -Wno-comment# -Wno-uninitialized -Werror + ##--AmigaOS-- + + CSRC = options.c errwarn.c convert.c \ tree.c memory.c alloc.c print.c hash.c tables.c inet.c \ dispatch.c bpf.c packet.c raw.c nit.c socket.c diff -rc --new-file DHCPD-BETA-4.6/cf/amigaos.h dhcpd46/cf/amigaos.h *** DHCPD-BETA-4.6/cf/amigaos.h Thu Jan 1 00:00:00 1970 --- dhcpd46/cf/amigaos.h Sat Jun 29 23:57:41 1996 *************** *** 0 **** --- 1,75 ---- + /* amigaos.h + + System dependencies for AmigaOS + ixemul/ixnet V43.1 ... */ + + /* + * 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 + * THE 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. + * + * This software was written for the Internet Software Consortium by Ted Lemon + * under a contract with Vixie Laboratories. + */ + + #include + #include + #include + #include + #include + #include + #include + #include + + #include + #include + + extern int h_errno; + + #include + #include + + /* Varargs stuff... */ + #include + #define VA_DOTDOTDOT ... + #define va_dcl + #define VA_start(list, last) va_start (list, last) + + #define _PATH_DHCPD_PID "/gnu/run/dhcpd.pid" + + #define EOL '\n' + #define VOIDPTR void * + + /* Time stuff... */ + #include + #define TIME time_t + #define GET_TIME(x) time ((x)) + + #define HAVE_SA_LEN + #undef USE_FALLBACK + #if defined (USE_DEFAULT_NETWORK) + # define USE_SOCKETS + #endif diff -rc --new-file DHCPD-BETA-4.6/configure dhcpd46/configure *** DHCPD-BETA-4.6/configure Thu Jun 27 19:22:19 1996 --- dhcpd46/configure Sat Jun 29 22:50:14 1996 *************** *** 28,33 **** --- 28,35 ---- sysname=freebsd;; hpux) sysname=hpux;; + AmigaOS) + sysname=AmigaOS;; esac fi *************** *** 67,73 **** echo "System Type: $sysname" ! sed -e "/^##\+\+${sysname}\+\+/,/^##--${sysname}--/s/^#//" \ Makefile exit 0 --- 69,75 ---- echo "System Type: $sysname" ! sed -e "/^##++${sysname}++/,/^##--${sysname}--/s/^#//" \ Makefile exit 0 diff -rc --new-file DHCPD-BETA-4.6/dispatch.c dhcpd46/dispatch.c *** DHCPD-BETA-4.6/dispatch.c Thu Jun 27 19:22:59 1996 --- dhcpd46/dispatch.c Sun Jun 30 10:12:32 1996 *************** *** 128,149 **** --- 128,158 ---- if (ifp -> ifr_addr.sa_family == AF_LINK) { struct sockaddr_dl *foo = ((struct sockaddr_dl *) (&ifp -> ifr_addr)); + /**/fprintf ( stderr, "Extracting link info.\n"); fflush(stderr); + /**/fprintf ( stderr, "Interface Name: %s.\n", ifp->ifr_name); fflush(stderr); tmp -> hw_address.hlen = foo -> sdl_alen; tmp -> hw_address.htype = ARPHRD_ETHER; /* XXX */ memcpy (tmp -> hw_address.haddr, LLADDR (foo), foo -> sdl_alen); + /**/fprintf ( stderr, "Done extracting link info.\n"); fflush(stderr); } else #endif /* AF_LINK */ if (ifp -> ifr_addr.sa_family == AF_INET) { struct iaddr addr; + /**/fprintf ( stderr, "Getting a pointer to the address.\n"); fflush(stderr); /* Get a pointer to the address... */ foo = (struct sockaddr_in *)(&ifp -> ifr_addr); + /**/fprintf ( stderr, "Got a pointer to the address.\n"); fflush(stderr); + /**/fprintf ( stderr, "foo = %p.\n", foo); fflush(stderr); + /**/fprintf ( stderr, "foo->sin_addr.s_addr = %lx.\n", foo->sin_addr.s_addr); fflush(stderr); /* We don't want the loopback interface. */ if (foo -> sin_addr.s_addr == htonl (INADDR_LOOPBACK)) continue; + /**/fprintf ( stderr, "Done checking for loopback address.\n"); fflush(stderr); + /**/fprintf ( stderr, "loopback address: %lx\n",htonl (INADDR_LOOPBACK)); fflush(stderr); /* If this is the first real IP address we've found, keep a pointer to ifreq structure in diff -rc --new-file DHCPD-BETA-4.6/osdep.h dhcpd46/osdep.h *** DHCPD-BETA-4.6/osdep.h Thu Jun 27 19:23:10 1996 --- dhcpd46/osdep.h Sat Jun 29 22:45:12 1996 *************** *** 101,106 **** --- 101,110 ---- # include "cf/hpux.h" #endif + #ifdef __AMIGA__ + # include "cf/amigaos.h" + #endif + /* Porting:: If you add a new network API, and have it set up so that it can be diff -rc --new-file DHCPD-BETA-4.6/site.h dhcpd46/site.h *** DHCPD-BETA-4.6/site.h Thu Jun 27 19:23:14 1996 --- dhcpd46/site.h Sat Jun 29 23:59:28 1996 *************** *** 14,20 **** syslog(). This also makes dhcpd use the dhcpd.conf in its working directory and write the dhcpd.leases file there. */ ! /* #define DEBUG */ /* Define this to see what the parser is parsing. You probably don't want to see this. */ --- 14,20 ---- syslog(). This also makes dhcpd use the dhcpd.conf in its working directory and write the dhcpd.leases file there. */ ! #define DEBUG /* Define this to see what the parser is parsing. You probably don't want to see this. */ *************** *** 67,73 **** the aforementioned problems do not matter to you, or if no other API is supported for your system, you may want to go with it. */ ! /* #define USE_SOCKETS */ /* Define this to use the Sun Streams NIT API. --- 67,73 ---- the aforementioned problems do not matter to you, or if no other API is supported for your system, you may want to go with it. */ ! #define USE_SOCKETS /* Define this to use the Sun Streams NIT API. *************** *** 82,88 **** DEC Alpha OSF/1 in a compatibility mode supported by the Alpha OSF/1 packetfilter interface. */ ! /* #define USE_BPF */ /* Define this to use the raw socket API. --- 82,88 ---- DEC Alpha OSF/1 in a compatibility mode supported by the Alpha OSF/1 packetfilter interface. */ ! /*#define USE_BPF*/ /* Define this to use the raw socket API.