Changes for bootpd to work on FreeBSD 2.0:
- Makefile changes (manual installation) - (hwaddr.c rtmsg.c) Do setting of arp cache entries by writing to routing socket, rather than by calling arp(8).
This commit is contained in:
Geoff Rehmet
parent
fe96225463
commit
6382c5b7fe
@ -1,14 +1,15 @@
|
||||
# bootpd/Makefile
|
||||
# $Id: Makefile,v 1.1.1.1 1994/06/27 21:25:49 gwr Exp $
|
||||
# $Id: Makefile,v 1.1.1.1 1994/09/10 14:44:53 csgr Exp $
|
||||
|
||||
PROG= bootpd
|
||||
CFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG -DVEND_CMU
|
||||
#CFLAGS+= -DETC_ETHERS
|
||||
CFLAGS+= -DSYSLOG -DDEBUG -DVEND_CMU
|
||||
|
||||
|
||||
SRCS= bootpd.c dovend.c readfile.c hash.c dumptab.c \
|
||||
lookup.c getif.c hwaddr.c report.c tzone.c
|
||||
lookup.c getif.c hwaddr.c report.c tzone.c rtmsg.c
|
||||
|
||||
MAN5= bootptab.0
|
||||
MAN8= bootpd.0
|
||||
MLINKS= bootpd.8 bootpgw.8
|
||||
MAN5= bootptab.5
|
||||
MAN8= bootpd.8
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
@ -33,6 +33,13 @@
|
||||
#define bcmp(a,b,c) memcmp(a,b,c)
|
||||
#endif
|
||||
|
||||
/* For BSD 4.4, set arp entry by writing to routing socket */
|
||||
#if defined(BSD)
|
||||
#if BSD >= 199306
|
||||
extern int bsd_arp_set __P((struct in_addr *, char *, int));
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "bptypes.h"
|
||||
#include "hwaddr.h"
|
||||
#include "report.h"
|
||||
@ -123,6 +130,9 @@ setarp(s, ia, ha, len)
|
||||
}
|
||||
#endif /* SVR4 */
|
||||
#else /* SIOCSARP */
|
||||
#if defined(BSD) && (BSD >= 199306)
|
||||
bsd_arp_set(ia, ha, len);
|
||||
#else /* Not BSD 4.4, and SIOCSARP not defined */
|
||||
/*
|
||||
* Oh well, SIOCSARP is not defined. Just run arp(8).
|
||||
* XXX - Gag!
|
||||
@ -138,6 +148,7 @@ setarp(s, ia, ha, len)
|
||||
if (status)
|
||||
report(LOG_ERR, "arp failed, exit code=0x%x", status);
|
||||
return;
|
||||
#endif /* ! 4.4 BSD */
|
||||
#endif /* SIOCSARP */
|
||||
}
|
||||
|
||||
|
||||
247
usr.sbin/bootpd/rtmsg.c
Normal file
247
usr.sbin/bootpd/rtmsg.c
Normal file
@ -0,0 +1,247 @@
|
||||
/*
|
||||
* Copyright (c) 1984, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1994
|
||||
* Geoffrey M. Rehmet, All rights reserved.
|
||||
*
|
||||
* This code is derived from software which forms part of the 4.4-Lite
|
||||
* Berkeley software distribution.
|
||||
*
|
||||
* This code is derived from software contributed to Berkeley by
|
||||
* Sun Microsystems, Inc.
|
||||
*
|
||||
* 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. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* from arp.c 8.2 (Berkeley) 1/2/94
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* XXX TODO:
|
||||
* Tidy up
|
||||
* Remove dead code
|
||||
* ansify
|
||||
* do syslogging
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
/*
|
||||
* Verify that we are at least 4.4 BSD
|
||||
*/
|
||||
#if defined(BSD)
|
||||
#if BSD >= 199306
|
||||
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_dl.h>
|
||||
#include <net/if_types.h>
|
||||
#include <net/route.h>
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "report.h"
|
||||
|
||||
|
||||
static int rtmsg __P((int));
|
||||
|
||||
static int s = -1; /* routing socket */
|
||||
|
||||
|
||||
/*
|
||||
* Open the routing socket
|
||||
*/
|
||||
static void getsocket () {
|
||||
if (s < 0) {
|
||||
s = socket(PF_ROUTE, SOCK_RAW, 0);
|
||||
if (s < 0) {
|
||||
report(LOG_ERR, "socket %s", strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static struct sockaddr_in so_mask = {8, 0, 0, { 0xffffffff}};
|
||||
static struct sockaddr_inarp blank_sin = {sizeof(blank_sin), AF_INET }, sin_m;
|
||||
static struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
|
||||
static int expire_time, flags, export_only, doing_proxy;
|
||||
static struct {
|
||||
struct rt_msghdr m_rtm;
|
||||
char m_space[512];
|
||||
} m_rtmsg;
|
||||
|
||||
/*
|
||||
* Set an individual arp entry
|
||||
*/
|
||||
int bsd_arp_set(ia, eaddr, len)
|
||||
struct in_addr *ia;
|
||||
char *eaddr;
|
||||
int len;
|
||||
{
|
||||
register struct sockaddr_inarp *sin = &sin_m;
|
||||
register struct sockaddr_dl *sdl;
|
||||
register struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
|
||||
u_char *ea;
|
||||
struct timeval time;
|
||||
|
||||
getsocket();
|
||||
sdl_m = blank_sdl;
|
||||
sin_m = blank_sin;
|
||||
sin->sin_addr = *ia;
|
||||
|
||||
ea = (u_char *)LLADDR(&sdl_m);
|
||||
bcopy(eaddr, ea, len);
|
||||
sdl_m.sdl_alen = len;
|
||||
doing_proxy = flags = export_only = expire_time = 0;
|
||||
|
||||
/* make arp entry temporary */
|
||||
gettimeofday(&time, 0);
|
||||
expire_time = time.tv_sec + 20 * 60;
|
||||
|
||||
tryagain:
|
||||
if (rtmsg(RTM_GET) < 0) {
|
||||
report(LOG_WARNING, "rtmget: %s", strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
sin = (struct sockaddr_inarp *)(rtm + 1);
|
||||
sdl = (struct sockaddr_dl *)(sin->sin_len + (char *)sin);
|
||||
if (sin->sin_addr.s_addr == sin_m.sin_addr.s_addr) {
|
||||
if (sdl->sdl_family == AF_LINK &&
|
||||
(rtm->rtm_flags & RTF_LLINFO) &&
|
||||
!(rtm->rtm_flags & RTF_GATEWAY)) switch (sdl->sdl_type) {
|
||||
case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023:
|
||||
case IFT_ISO88024: case IFT_ISO88025:
|
||||
goto overwrite;
|
||||
}
|
||||
if (doing_proxy == 0) {
|
||||
report(LOG_WARNING, "set: can only proxy for %s\n",
|
||||
inet_ntoa(sin->sin_addr));
|
||||
return (1);
|
||||
}
|
||||
if (sin_m.sin_other & SIN_PROXY) {
|
||||
report(LOG_WARNING,
|
||||
"set: proxy entry exists for non 802 device\n");
|
||||
return(1);
|
||||
}
|
||||
sin_m.sin_other = SIN_PROXY;
|
||||
export_only = 1;
|
||||
goto tryagain;
|
||||
}
|
||||
overwrite:
|
||||
if (sdl->sdl_family != AF_LINK) {
|
||||
report(LOG_WARNING,
|
||||
"cannot intuit interface index and type for %s\n",
|
||||
inet_ntoa(sin->sin_addr));
|
||||
return (1);
|
||||
}
|
||||
sdl_m.sdl_type = sdl->sdl_type;
|
||||
sdl_m.sdl_index = sdl->sdl_index;
|
||||
return (rtmsg(RTM_ADD));
|
||||
}
|
||||
|
||||
|
||||
static int rtmsg(cmd)
|
||||
int cmd;
|
||||
{
|
||||
static int seq;
|
||||
int rlen;
|
||||
register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
|
||||
register char *cp = m_rtmsg.m_space;
|
||||
register int l;
|
||||
|
||||
errno = 0;
|
||||
bzero((char *)&m_rtmsg, sizeof(m_rtmsg));
|
||||
rtm->rtm_flags = flags;
|
||||
rtm->rtm_version = RTM_VERSION;
|
||||
|
||||
switch (cmd) {
|
||||
default:
|
||||
report(LOG_ERR, "set_arp: internal wrong cmd - exiting");
|
||||
exit(1);
|
||||
case RTM_ADD:
|
||||
rtm->rtm_addrs |= RTA_GATEWAY;
|
||||
rtm->rtm_rmx.rmx_expire = expire_time;
|
||||
rtm->rtm_inits = RTV_EXPIRE;
|
||||
rtm->rtm_flags |= (RTF_HOST | RTF_STATIC);
|
||||
sin_m.sin_other = 0;
|
||||
if (doing_proxy) {
|
||||
if (export_only)
|
||||
sin_m.sin_other = SIN_PROXY;
|
||||
else {
|
||||
rtm->rtm_addrs |= RTA_NETMASK;
|
||||
rtm->rtm_flags &= ~RTF_HOST;
|
||||
}
|
||||
}
|
||||
/* FALLTHROUGH */
|
||||
case RTM_GET:
|
||||
rtm->rtm_addrs |= RTA_DST;
|
||||
}
|
||||
#define NEXTADDR(w, s) \
|
||||
if (rtm->rtm_addrs & (w)) { \
|
||||
bcopy((char *)&s, cp, sizeof(s)); cp += sizeof(s);}
|
||||
|
||||
NEXTADDR(RTA_DST, sin_m);
|
||||
NEXTADDR(RTA_GATEWAY, sdl_m);
|
||||
NEXTADDR(RTA_NETMASK, so_mask);
|
||||
|
||||
rtm->rtm_msglen = cp - (char *)&m_rtmsg;
|
||||
|
||||
l = rtm->rtm_msglen;
|
||||
rtm->rtm_seq = ++seq;
|
||||
rtm->rtm_type = cmd;
|
||||
if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
|
||||
if ((errno != ESRCH) && !(errno == EEXIST && cmd == RTM_ADD)){
|
||||
report(LOG_WARNING, "writing to routing socket: %s",
|
||||
strerror(errno));
|
||||
return (-1);
|
||||
}
|
||||
}
|
||||
do {
|
||||
l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
|
||||
} while (l > 0 && (rtm->rtm_seq != seq || rtm->rtm_pid != getpid()));
|
||||
if (l < 0)
|
||||
report(LOG_WARNING, "arp: read from routing socket: %s\n",
|
||||
strerror(errno));
|
||||
return (0);
|
||||
}
|
||||
|
||||
#endif /* BSD */
|
||||
#endif /* BSD >= 199306 */
|
||||
@ -3,13 +3,15 @@
|
||||
|
||||
PROG= bootpef
|
||||
SRCDIR= ${.CURDIR}/../bootpd
|
||||
CFLAGS+= -DETC_ETHERS -DDEBUG -I${SRCDIR}
|
||||
#CFLAGS+= -DETC_ETHERS
|
||||
CFLAGS+= -DDEBUG -I${SRCDIR}
|
||||
.PATH: ${SRCDIR}
|
||||
MANSRC= ${SRCDIR}
|
||||
|
||||
SRCS= bootpef.c dovend.c readfile.c hash.c dumptab.c \
|
||||
lookup.c hwaddr.c report.c tzone.c
|
||||
|
||||
MAN8= bootpef.0
|
||||
MAN8= bootpef.8
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
||||
@ -5,10 +5,11 @@ PROG= bootptest
|
||||
SRCDIR= ${.CURDIR}/../bootpd
|
||||
CFLAGS+= -I${SRCDIR}
|
||||
.PATH: ${SRCDIR}
|
||||
MANSRC= ${SRCDIR}
|
||||
|
||||
SRCS= bootptest.c print-bootp.c getif.c getether.c report.c
|
||||
|
||||
MAN8= bootptest.0
|
||||
MAN8= bootptest.8
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user