Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-4]: src/usr.sbin/dhcp Apply patch (requested by mellon):
details: https://anonhg.NetBSD.org/src/rev/a5816dc3ea2d
branches: netbsd-1-4
changeset: 470801:a5816dc3ea2d
user: he <he%NetBSD.org@localhost>
date: Thu Jul 27 17:17:14 2000 +0000
description:
Apply patch (requested by mellon):
Merge/update DHCP client and server software to ISC 2.0pl3.
diffstat:
usr.sbin/dhcp/Makefile | 2 +-
usr.sbin/dhcp/README | 515 ++++++++++++++++++-----------
usr.sbin/dhcp/RELNOTES | 166 ++++++--
usr.sbin/dhcp/client/Makefile | 2 +-
usr.sbin/dhcp/client/clparse.c | 6 +-
usr.sbin/dhcp/client/dhclient-script.8 | 2 +-
usr.sbin/dhcp/client/dhclient.c | 256 +++++---------
usr.sbin/dhcp/client/scripts/freebsd | 2 +-
usr.sbin/dhcp/common/Makefile | 5 +-
usr.sbin/dhcp/common/bpf.c | 16 +-
usr.sbin/dhcp/common/dhcp-options.5 | 109 ++++++
usr.sbin/dhcp/common/dispatch.c | 9 +-
usr.sbin/dhcp/common/dlpi.c | 4 +
usr.sbin/dhcp/common/lpf.c | 71 +++-
usr.sbin/dhcp/common/memory.c | 3 +-
usr.sbin/dhcp/common/packet.c | 46 +-
usr.sbin/dhcp/common/raw.c | 18 +-
usr.sbin/dhcp/common/socket.c | 31 +-
usr.sbin/dhcp/common/tables.c | 30 +-
usr.sbin/dhcp/includes/cf/aix.h | 2 -
usr.sbin/dhcp/includes/cf/alphaosf.h | 22 +-
usr.sbin/dhcp/includes/cf/hpux.h | 12 +
usr.sbin/dhcp/includes/cf/linux.h | 1 +
usr.sbin/dhcp/includes/dhcpd.h | 33 +-
usr.sbin/dhcp/includes/netinet/if_ether.h | 3 +-
usr.sbin/dhcp/includes/osdep.h | 19 +-
usr.sbin/dhcp/relay/dhcrelay.c | 12 +-
usr.sbin/dhcp/server/bootp.c | 34 +-
usr.sbin/dhcp/server/confpars.c | 10 +-
usr.sbin/dhcp/server/db.c | 16 +-
usr.sbin/dhcp/server/dhcp.c | 139 +++++--
usr.sbin/dhcp/server/dhcpd.c | 12 +-
usr.sbin/dhcp/server/dhcpd.conf.5 | 2 +-
33 files changed, 1009 insertions(+), 601 deletions(-)
diffs (truncated from 2778 to 300 lines):
diff -r ee1e6c399a72 -r a5816dc3ea2d usr.sbin/dhcp/Makefile
--- a/usr.sbin/dhcp/Makefile Sun Jul 23 18:05:03 2000 +0000
+++ b/usr.sbin/dhcp/Makefile Thu Jul 27 17:17:14 2000 +0000
@@ -30,7 +30,7 @@
# OF THE POSSIBILITY OF SUCH DAMAGE.
#
-SUBDIR= common server client relay statmsg sysconfd
+SUBDIR= common server client relay
all-server all-client all-relay: all-common
diff -r ee1e6c399a72 -r a5816dc3ea2d usr.sbin/dhcp/README
--- a/usr.sbin/dhcp/README Sun Jul 23 18:05:03 2000 +0000
+++ b/usr.sbin/dhcp/README Thu Jul 27 17:17:14 2000 +0000
@@ -1,108 +1,160 @@
- Internet Software Consortium
- Dynamic Host Configuration Protocol Distribution
- Version 2, Beta 1, Patchlevel 25
- April 9, 1999
+<C><H4>Internet Software Consortium</H4></C>
+<C><H4>Dynamic Host Configuration Protocol Distribution</H4></C>
+<C><H4>Version 2 Patchlevel 3</H4></C>
+<C><H4>June 30, 2000</H4></C>
+
+<C><H4>README FILE</H4></C>
+
+<P>You should read this file carefully before trying to install or use
+the ISC DHCP Distribution.</P>
-Documentation for this software includes this README file, the
+<OL>
+<C><B>TABLE OF CONTENTS</B></C>
+<DL>
+<DT><A HREF="#1"1</A><DD>WHERE TO FIND DOCUMENTATION
+<DT><A HREF="#2"2</A><DD>RELEASE STATUS
+<DT><A HREF="#3"3</A><DD>BUILDING THE DHCP DISTRIBUTION
+<DT><A HREF="#4"4</A><DD>INSTALLING THE DHCP DISTRIBUTION
+<DT><A HREF="#5"5</A><DD>USING THE DHCP DISTRIBUTION
+<DL>
+<DT><A HREF="#5.1"5.1</A><DD>LINUX
+<DL>
+<DT><A HREF="#5.1.1"5.1.1</A><DD>SO_ATTACH_FILTER UNDECLARED
+<DT><A HREF="#5.1.2"5.1.2</A><DD>PROTOCOL NOT CONFIGURED
+<DT><A HREF="#5.1.3"5.1.3</A><DD>BROADCAST
+<DT><A HREF="#5.1.4"5.1.4</A><DD>FIREWALL RULES
+<DT><A HREF="#5.1.5"5.1.5</A><DD>IP BOOTP AGENT
+<DT><A HREF="#5.1.6"5.1.6</A><DD>MULTIPLE INTERFACES
+</DL>
+<DT><A HREF="#5.2"5.2</A><DD>SCO
+<DT><A HREF="#5.3"5.3</A><DD>HP-UX
+<DT><A HREF="#5.4"5.4</A><DD>ULTRIX
+<DT><A HREF="#5.5"5.5</A><DD>FreeBSD
+<DT><A HREF="#5.6"5.6</A><DD>NeXTSTEP
+<DT><A HREF="#5.7"5.7</A><DD>SOLARIS
+</DL>
+<DT><A HREF="#6"6</A><DD>SUPPORT
+<DL>
+<DT><A HREF="#6.1"6.1</A><DD>HOW TO REPORT BUGS
+</DL>
+<DT><A HREF="#7"7</A><DD>KNOWN BUGS
+
+<H4 ID="1">Where to find documentation</H4>
+
+<P>Documentation for this software includes this README file, the
RELNOTES file, and the manual pages, which are in the server, common,
client and relay subdirectories. Internet standards relating to the
DHCP protocol are stored in the doc subdirectory. You will have the
best luck reading the manual pages if you build this software and then
install it, although you can read them directly out of the
-distribution if you need to.
+distribution if you need to.</P>
-DHCP server documentation is in the dhcpd man page. Information about
+<P>DHCP server documentation is in the dhcpd man page. Information about
the DHCP server lease database is in the dhcpd.leases man page.
Server configuration documentation is in the dhcpd.conf man page as
well as the dhcp-options man page. A sample DHCP server
-configuration is in the file server/dhcpd.conf.
+configuration is in the file server/dhcpd.conf. The source for the
+dhcpd, dhcpd.leases and dhcpd.conf man pages is in the server/ sub-
+directory in the distribution. The source for the dhcp-options.5
+man page is in the common/ subdirectory.</P>
-DHCP Client documentation is in the dhclient man page. DHCP client
+<P>DHCP Client documentation is in the dhclient man page. DHCP client
configuration documentation is in the dhclient.conf man page and the
dhcp-options man page. The DHCP client configuration script is
documented in the dhclient-script man page. The format of the DHCP
client lease database is documented in the dhclient.leases man page.
+The source for all these man pages is in the client/ subdirectory in
+the distribution. In addition, the dhcp-options man page should be
+referred to for information about DHCP options.</P>
-DHCP relay agent documentation is in the dhcrelay man page.
+<P>DHCP relay agent documentation is in the dhcrelay man page, the source
+for which is distributed in the relay/ subdirectory.</P>
-To read installed manual pages, use the man command. Type "man page"
-where page is the name of the manual page.
+<P>To read installed manual pages, use the man command. Type "man page"
+where page is the name of the manual page. This will only work if
+you have installed the ISC DHCP distribution using the ``make install''
+command (described later).</P>
-If you want to read manual pages that aren't installed, you can type
+<P>If you want to read manual pages that aren't installed, you can type
``nroff -man page |more'' where page is the filename of the
unformatted manual page. The filename of an unformatted manual page
is the name of the manual page, followed by '.', followed by some
number - 5 for documentation about files, and 8 for documentation
-about programs.
+about programs. For example, to read the dhcp-options man page,
+you would type ``nroff -man common/dhcp-options.5 |more'', assuming
+your current working directory is the top level directory of the ISC
+DHCP Distribution.</P>
-If you do not have the nroff command, you can type ``more catpage''
+<P>If you do not have the nroff command, you can type ``more catpage''
where catpage is the filename of the catted man page. Catted man
pages names are the name of the manual page followed by ".cat"
-followed by 5 or 8, as with unformatted manual pages.
+followed by 5 or 8, as with unformatted manual pages.</P>
-Please note that until you install the manual pages, the pathnames of
+<P>Please note that until you install the manual pages, the pathnames of
files to which they refer will not be correct for your operating
-system.
+system.</P>
-This is the first Beta release of Version 2 of the Internet Software
+<H4 ID="2">Release status</H4>
+
+<P>This is the final release of Version 2 of the Internet Software
Consortium DHCP Distribution. In version 2.0, this distribution
includes a DHCP server, a DHCP client, and a BOOTP/DHCP relay agent.
-This beta is believed to be fairly stable. However, DHCP server users
-running a production environment should probably still use version
-1.0, which is more stable, having been in a feature freeze since
-November of 1996.
+This release is stable.</P>
-In this release, the server and relay agent currently work well on
+<P>In this release, the server and relay agent currently work well on
NetBSD, Linux after kernel version 2.0.30, FreeBSD, BSD/OS, Ultrix,
-Digital Alpha OSF/1, Solaris and SunOS 4.1.4. They run on AIX, HPUX,
-IRIX and Linux 2.0.30 and earlier kernels but support only a single
-broadcast network interface. They also runs on QNX as long as only
-one broadcast network interface is configured and a host route is
-added from that interface to the 255.255.255.255 broadcast address.
+Digital Alpha OSF/1, Solaris and SunOS 4.1.4. On AIX, HPUX, IRIX and
+Linux 2.0.30, only a single broadcast network interface is supported.
+They also runs on QNX as long as only one broadcast network interface
+is configured and a host route is added from that interface to the
+255.255.255.255 broadcast address.</P>
-The DHCP client currently only knows how to configure the network on
+<P>The DHCP client currently only knows how to configure the network on
NetBSD, FreeBSD, BSD/os, Linux, Solaris and NextStep. The client
depends on a system-dependent shell script to do network
configuration - support for other operating systems is simply a matter
-of porting this shell script to the new platform.
+of porting this shell script to the new platform.</P>
-If you wish to run the DHCP Distribution on Linux, please see the
+<P>If you wish to run the DHCP Distribution on Linux, please see the
Linux-specific notes later in this document. If you wish to run on an
SCO release, please see the SCO-specific notes later in this document.
You particularly need to read these notes if you intend to support
Windows 95 clients. If you are running a version of FreeBSD prior to
2.2, please read the note on FreeBSD. If you are running HP-UX or
Ultrix, please read the notes for those operating systems below.
-If you are running NeXTSTEP, please see the notes on NeXTSTEP below.
+If you are running NeXTSTEP, please see the notes on NeXTSTEP below.</P>
-If you start dhcpd and get a message, "no free bpf", that means you
+<P>If you start dhcpd and get a message, "no free bpf", that means you
need to configure the Berkeley Packet Filter into your operating
system kernel. On NetBSD, FreeBSD and BSD/os, type ``man bpf'' for
-information. On Digital Unix, type ``man pfilt''.
+information. On Digital Unix, type ``man pfilt''.</P>
-
- BUILDING THE DHCP DISTRIBUTION
+<H4 ID="3">Building the DHCP Distribution</H4>
-To build the DHCP Distribution, unpack the compressed tar file using
-the tar utility and the gzip command - type something like:
+<P>To build the DHCP Distribution, unpack the compressed tar file using
+the tar utility and the gzip command - type something like:</P>
- zcat dhcp-2.0b1pl25.tar.gz |tar xvf -
+<BLOCKQUOTE>
+ zcat dhcp-2.0pl3.tar.gz |tar xvf -
+</BLOCKQUOTE>
-On BSD/OS, you have to type gzcat, not zcat, and you may run into
-similar problems on other operating systems.
+<P>On BSD/OS, you have to type gzcat, not zcat, and you may run into
+similar problems on other operating systems.</P>
+
+<P>Now, cd to the dhcp-2.0pl3 subdirectory that you've just created and
+configure the source tree by typing:</P>
-Now, cd to the dhcp-2.0b1pl25 subdirectory that you've just created and
-configure the source tree by typing:
+<BLOCKQUOTE>
+ ./configure
+</BLOCKQUOTE>
- ./configure
-
-If the configure utility can figure out what sort of system you're
+<P>If the configure utility can figure out what sort of system you're
running on, it will create a custom Makefile for you for that
system; otherwise, it will complain. If it can't figure out what
system you are using, that system is not supported - you are on
-your own.
+your own.</P>
-Once you've run configure, just type ``make'', and after a while
+<P>Once you've run configure, just type ``make'', and after a while
you should have a dhcp server. If you get compile errors on one
of the supported systems mentioned earlier, please let us know.
If you get warnings, it's not likely to be a problem - the DHCP
@@ -110,185 +162,240 @@
as we can manage, but there are a few for which this is difficult.
If you get errors on a system not mentioned above, you will need
to do some programming or debugging on your own to get the DHCP
-Distribution working.
+Distribution working.</P>
-Once you have successfully gotten the DHCP Distribution to build, you
+<H4 ID="4">Installing the dhcp distribution</H4>
+
+<P>Once you have successfully gotten the DHCP Distribution to build, you
can install it by typing ``make install''. If you already have an old
version of the DHCP Distribution installed, you may want to save it
-before typing ``make install''.
+before typing ``make install''.</P>
+
+<H4 ID="5">Using the dhcp distribution</H4>
- LINUX
+<H4 ID="5.1">Linux</H4>
-There are three big LINUX issues: the all-ones broadcast address,
+<P>There are three big LINUX issues: the all-ones broadcast address,
Linux 2.1 ip_bootp_agent enabling, and operations with more than one
network interface. There are also two potential compilation/runtime
problems for Linux 2.1/2.2: the "SO_ATTACH_FILTER undeclared" problem
-and the "protocol not configured" problem.
+and the "protocol not configured" problem.</P>
- LINUX: SO_ATTACH_FILTER UNDECLARED
+<H4 ID="5.1.1">So_attach_filter undeclared</H4>
-In addition, there is a minor issue that we will mention here because
+<P>In addition, there is a minor issue that we will mention here because
this release is so close on the heels of the Linux 2.2 release: there
is a symlink in /usr/include that points at the linux asm headers. It
appears to be not uncommon that this link won't be updated correctly,
-in which case you'll get the following error when you try to build:
+in which case you'll get the following error when you try to build:</P>
+<BLOCKQUOTE>
lpf.c: In function `if_register_receive':
lpf.c:152: `SO_ATTACH_FILTER' undeclared (first use this function)
lpf.c:152: (Each undeclared identifier is reported only once
lpf.c:152: for each function it appears in.)
+</BLOCKQUOTE>
-The line numbers may be different, of course. If you see this
+<P>The line numbers may be different, of course. If you see this
header, your linux asm header link is probably bad, and you should
-make sure it's pointing to correct linux source directory.
+make sure it's pointing to correct linux source directory.</P>
- LINUX: PROTOCOL NOT CONFIGURED
+<H4 ID="5.1.2">Protocol not configured</H4>
-One additional Linux 2.1/2.2 issue: if you get the following message,
+<P>One additional Linux 2.1/2.2 issue: if you get the following message,
it's because your kernel doesn't have the linux packetfilter or raw
-packet socket configured:
+packet socket configured:</P>
- Set CONFIG_PACKET=y and CONFIG_FILTER=y in your kernel configuration
+<BLOCKQUOTE>
+ Make sure CONFIG_PACKET (Packet socket) and CONFIG_FILTER (Socket
+ Filtering) are enabled in your kernel configuration
+</BLOCKQUOTE>
-If this happens, you need to edit your linux kernel .config file, set
-CONFIG_FILTER=y and CONFIG_PACKET=y, and rebuild your kernel. If the
-preceding sentence made no sense to you, ask your Linux vendor/guru
-for help - please don't ask us.
+<P>If this happens, you need to configure your Linux kernel to support
+Socket Filtering and the Packet socket. You can do this by typing
+``make config'', ``make menuconfig'' or ``make xconfig'', and then
Home |
Main Index |
Thread Index |
Old Index