aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Paul <wpaul@FreeBSD.org>1996-11-18 21:53:21 +0000
committerBill Paul <wpaul@FreeBSD.org>1996-11-18 21:53:21 +0000
commit4bef56e86cab1150c0420ea535673f41244fa622 (patch)
tree888cc9d853204518a99ad0588edabbc645fc94cf
parent9636a39a617ee86a7a7fb3555c411d61d7e52ed0 (diff)
downloadsrc-4bef56e86cab1150c0420ea535673f41244fa622.tar.gz
src-4bef56e86cab1150c0420ea535673f41244fa622.zip
Import new version of rarpd from the BPF 1.1 distribution from LBL.vendor/rarpd
Obtained from: LBL, BPF 1.1 distribution
Notes
Notes: svn path=/cvs2svn/branches/LBL/; revision=19855
-rw-r--r--usr.sbin/rarpd/Makefile19
-rw-r--r--usr.sbin/rarpd/etherent.c224
-rw-r--r--usr.sbin/rarpd/rarpd.820
-rw-r--r--usr.sbin/rarpd/rarpd.c802
4 files changed, 783 insertions, 282 deletions
diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile
index 9415fc9d8d29..1ec8b87ddb3d 100644
--- a/usr.sbin/rarpd/Makefile
+++ b/usr.sbin/rarpd/Makefile
@@ -1,9 +1,18 @@
-# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $Id: Makefile,v 1.1 1994/08/08 01:03:57 wollman Exp $
+# @(#) $Header: Makefile,v 1.12 93/07/19 20:07:30 leres Exp $ (LBL)
PROG= rarpd
-MAN8= rarpd.8
-SRCS= rarpd.c ether_addr.c
-CFLAGS+= -DTFTP_DIR=\"/tftpboot\"
+CFLAGS+=-g
+.if !defined(sunos3) && !defined(sunos4)
+SRCS= rarpd.c etherent.c
+BINDIR=/usr/local/sbin
+CFLAGS+=-Wall
+.endif
+.ifdef sunos3
+CFLAGS+=-W -DSUNOS3
+.endif
+.ifdef sunos4
+CFLAGS+=-W -DSUNOS4
+.endif
+MAN8= rarpd.0
.include <bsd.prog.mk>
diff --git a/usr.sbin/rarpd/etherent.c b/usr.sbin/rarpd/etherent.c
new file mode 100644
index 000000000000..d682b631050a
--- /dev/null
+++ b/usr.sbin/rarpd/etherent.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 1990, 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+#ifndef lint
+static char rcsid[] =
+ "@(#) $Header: etherent.c,v 1.4 96/06/14 20:34:25 leres Exp $ (LBL)";
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
+#ifndef ETHERS_FILE
+#define ETHERS_FILE "/etc/ethers"
+#endif
+
+struct etherent {
+ u_char addr[6];
+ char name[122];
+};
+
+static FILE *ether_fp = NULL;
+
+
+/* Hex digit to integer. */
+static inline int
+xdtoi(c)
+ int c;
+{
+
+ if (isdigit(c))
+ return c - '0';
+ else if (islower(c))
+ return c - 'a' + 10;
+ else
+ return c - 'A' + 10;
+}
+
+static inline int
+skip_space(f)
+ FILE *f;
+{
+ int c;
+
+ do {
+ c = getc(f);
+ } while (isspace(c) && c != '\n');
+
+ return c;
+}
+
+static inline int
+skip_line(f)
+ FILE *f;
+{
+ int c;
+
+ do
+ c = getc(f);
+ while (c != '\n' && c != EOF);
+
+ return c;
+}
+
+static struct etherent *
+next_etherent(fp)
+ FILE *fp;
+{
+ register int c, d, i;
+ char *bp;
+ static struct etherent e;
+ static int nline = 1;
+ top:
+ while (nline) {
+ /* Find addr */
+ c = skip_space(fp);
+ if (c == '\n')
+ continue;
+ /* If this is a comment, or first thing on line
+ cannot be etehrnet address, skip the line. */
+ else if (!isxdigit(c))
+ c = skip_line(fp);
+ else {
+ /* must be the start of an address */
+ for (i = 0; i < 6; i += 1) {
+ d = xdtoi(c);
+ c = getc(fp);
+ if (c != ':') {
+ d <<= 4;
+ d |= xdtoi(c);
+ c = getc(fp);
+ }
+ e.addr[i] = d;
+ if (c != ':')
+ break;
+ c = getc(fp);
+ }
+ nline = 0;
+ }
+ if (c == EOF)
+ return NULL;
+ }
+
+ /* If we started a new line, 'c' holds the char past the ether addr,
+ which we assume is white space. If we are continuing a line,
+ 'c' is garbage. In either case, we can throw it away. */
+
+ c = skip_space(fp);
+ if (c == '\n') {
+ nline = 1;
+ goto top;
+ }
+ else if (c == '#') {
+ (void)skip_line(fp);
+ nline = 1;
+ goto top;
+ }
+ else if (c == EOF)
+ return NULL;
+
+ /* Must be a name. */
+ bp = e.name;
+ /* Use 'd' to prevent buffer overflow. */
+ d = sizeof(e.name) - 1;
+ do {
+ *bp++ = c;
+ c = getc(fp);
+ } while (!isspace(c) && c != EOF && --d > 0);
+ *bp = '\0';
+ if (c == '\n')
+ nline = 1;
+
+ return &e;
+}
+
+/* Open/rewind the ethers files; returns 1 if file was reopened */
+int
+ether_rewind()
+{
+ struct stat st;
+ static long mtime = 0, ctime = 0;
+
+ if (ether_fp != NULL) {
+ if (fstat(fileno(ether_fp), &st) < 0 ||
+ mtime != st.st_mtime || ctime != st.st_ctime ||
+ fseek(ether_fp, 0L, SEEK_SET) < 0) {
+ fclose(ether_fp);
+ ether_fp = NULL;
+ }
+ }
+ if (ether_fp == NULL) {
+ ether_fp = fopen(ETHERS_FILE, "r");
+ if (ether_fp == NULL)
+ return (-1);
+ if (fstat(fileno(ether_fp), &st) < 0) {
+ fclose(ether_fp);
+ ether_fp = NULL;
+ return (-1);
+ }
+ mtime = st.st_mtime;
+ ctime = st.st_ctime;
+ return (1);
+ }
+ return (0);
+}
+
+/* Map an ethernet address to a name; returns 0 on success, else 1. */
+int
+ether_ntohost(name, ea)
+ register char *name;
+ register u_char *ea;
+{
+ register struct etherent *ep;
+
+ if (ether_rewind() < 0)
+ return (1);
+
+ while ((ep = next_etherent(ether_fp)) != NULL)
+ if (bcmp(ep->addr, ea, 6) == 0) {
+ strcpy(name, ep->name);
+ return (0);
+ }
+ return (1);
+}
+
+/* Map an ethernet name to an address; returns 0 on success, else 1. */
+int
+ether_hostton(name, ea)
+ register char *name;
+ register u_char *ea;
+{
+ register struct etherent *ep;
+
+ if (ether_rewind() < 0)
+ return (1);
+
+ while ((ep = next_etherent(ether_fp)) != NULL)
+ if (strcmp(ep->name, name) == 0) {
+ bcopy(ep->addr, ea, 6);
+ return (0);
+ }
+ return (1);
+}
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index c19bc304742e..1ad523b0f003 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -1,7 +1,7 @@
-.\" @(#) $Header: tcpdump.1,v 1.30 90/10/11 19:35:03 mccanne Exp $ (LBL)
+.\" @(#) $Header: rarpd.8,v 1.3 93/07/19 19:34:24 leres Exp $ (LBL)
.\"
-.\" Copyright (c) 1988-1990 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1990, 1991, 1993 The Regents of the University of
+.\" California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that: (1) source code distributions
@@ -19,14 +19,14 @@
.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
-.TH RARPD 8 "26 Oct 1990"
+.TH RARPD 8 "19 Jul 1993"
.SH NAME
rarpd \- Reverse ARP Daemon
.SH SYNOPSIS
.na
.B rarpd
[
-.B \-af
+.B \-afv
]
[
.I interface
@@ -70,6 +70,9 @@ If `-a' is omitted, an interface must be specified.
.TP
.B \-f
Run in the foreground.
+.TP
+.B \-v
+Enable verbose sysloging.
.SH FILES
/etc/ethers
@@ -83,10 +86,7 @@ bpf(4)
RFC 903: Finlayson, R.; Mann, T.; Mogul, J.C.; Theimer, M. Reverse Address
Resolution Protocol. 1984 June; 4 p.
.SH AUTHORS
-Craig Leres (leres@helios.ee.lbl.gov) and
-Steven McCanne (mccanne@helios.ee.lbl.gov).
+Craig Leres (leres@ee.lbl.gov) and
+Steven McCanne (mccanne@ee.lbl.gov).
Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
.SH BUGS
-You must have the Berkeley Packet Filter configured into your kernel
-in order to use this program. This isn't really a bug, but it isn't
-exactly a feature either.
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index aa18dd8b84d1..9b9c8f43df42 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1991, 1992, 1993, 1996
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code distributions
@@ -20,45 +20,61 @@
*/
#ifndef lint
char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
+"@(#) Copyright (c) 1990, 1991, 1992, 1993, 1996\n\
+The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
static char rcsid[] =
- "@(#) $Header: rarpd.c,v 1.6 91/01/09 14:47:00 mccanne Exp $ (LBL)";
+ "@(#) $Header: rarpd.c,v 1.22 96/06/14 20:40:14 leres Exp $ (LBL)";
#endif
-
-/*
+/*
* rarpd - Reverse ARP Daemon
*
- * Usage: rarpd -a [ -f ] [ hostname ]
- * rarpd [ -f ] interface [ hostname ]
- *
+ * Usage: rarpd -a [ -fv ] [ hostname ]
+ * rarpd [ -fv ] interface [ hostname ]
+ *
* 'hostname' is optional solely for backwards compatibility with Sun's rarpd.
* Currently, the argument is ignored.
*/
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-/* SunOS 4.x defines this while 3.x does not. */
-#ifdef __sys_types_h
-#define SUNOS4
-#endif
+#include <sys/param.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
#include <sys/time.h>
+
#include <net/bpf.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
#include <net/if.h>
+
+#if BSD >= 199100
+#include <net/if_types.h>
+#include <net/if_dl.h>
+#if BSD >= 199200
+#include <net/route.h>
+#endif
+#endif
+
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <sys/errno.h>
-#include <sys/file.h>
+
+#include <arpa/inet.h>
+
+#include <errno.h>
#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#if BSD >= 199200
+#include <stdlib.h>
+#include <unistd.h>
+#else
+
+extern char *optarg;
+extern int optind, opterr;
+
+extern int errno;
+#endif
#ifdef SUNOS4
#include <dirent.h>
@@ -66,10 +82,29 @@ static char rcsid[] =
#include <sys/dir.h>
#endif
+/* Cast a struct sockaddr to a structaddr_in */
+#define SATOSIN(sa) ((struct sockaddr_in *)(sa))
+
+#ifndef TFTP_DIR
+#define TFTP_DIR "/tftpboot"
+#endif
+
+#if BSD >= 199200
+#define ARPSECS (20 * 60) /* as per code in netinet/if_ether.c */
+#define REVARP_REQUEST ARPOP_REVREQUEST
+#define REVARP_REPLY ARPOP_REVREPLY
+#endif
+
+#ifndef ETHERTYPE_REVARP
+#define ETHERTYPE_REVARP 0x8035
+#define REVARP_REQUEST 3
+#define REVARP_REPLY 4
+#endif
+
/*
* Map field names in ether_arp struct. What a pain in the neck.
*/
-#if !defined(SUNOS4) && !defined(__FreeBSD__)
+#ifdef SUNOS3
#undef arp_sha
#undef arp_spa
#undef arp_tha
@@ -84,17 +119,16 @@ static char rcsid[] =
#define inline
#endif
-extern int errno;
-
/*
- * The structure for each interface.
+ * The structure for each interface.
*/
struct if_info {
- int ii_fd; /* BPF file descriptor */
- u_char ii_eaddr[6]; /* Ethernet address of this interface */
+ struct if_info *ii_next;
+ int ii_fd; /* BPF file descriptor */
u_long ii_ipaddr; /* IP address of this interface */
u_long ii_netmask; /* subnet or net mask */
- struct if_info *ii_next;
+ u_char ii_eaddr[6]; /* Ethernet address of this interface */
+ char ii_ifname[sizeof(((struct ifreq *)0)->ifr_name) + 1];
};
/*
@@ -103,44 +137,60 @@ struct if_info {
*/
struct if_info *iflist;
-extern char *malloc();
-extern void exit();
+int verbose; /* verbose messages */
+int s; /* inet datagram socket */
+char *tftp_dir = TFTP_DIR; /* tftp directory */
-u_long ipaddrtonetmask();
-void init_one();
-void init_all();
-void rarp_loop();
-void lookup_eaddr();
-void lookup_ipaddr();
+#ifndef __P
+#define __P(protos) ()
+#endif
+
+#if BSD < 199200
+extern char *malloc();
+extern void exit();
+#endif
+extern int ether_ntohost();
+
+void init __P((char *));
+void init_one __P((struct ifreq *, char *));
+char *intoa __P((u_long));
+u_long ipaddrtonetmask __P((u_long));
+char *eatoa __P((u_char *));
+int rarp_bootable __P((u_long));
+void rarp_loop __P((void));
+int rarp_open __P((char *));
+void rarp_process __P((struct if_info *, u_char *));
+void rarp_reply __P((struct if_info *, struct ether_header *, u_long));
+void update_arptab __P((u_char *, u_long));
+void usage __P((void));
+
+static u_char zero[6];
void
main(argc, argv)
int argc;
char **argv;
{
- int op, pid;
+ int op, pid, devnull, f;
char *ifname, *hostname, *name;
int aflag = 0; /* listen on "all" interfaces */
int fflag = 0; /* don't fork */
- extern char *optarg;
- extern int optind, opterr;
-
- if (name = strrchr(argv[0], '/'))
+ if ((name = strrchr(argv[0], '/')) != NULL)
++name;
else
name = argv[0];
if (*name == '-')
++name;
- /*
+ /*
* All error reporting is done through syslogs.
*/
- openlog(name, LOG_PID, LOG_DAEMON);
+ openlog(name, LOG_PID | LOG_CONS, LOG_DAEMON);
opterr = 0;
- while ((op = getopt(argc, argv, "af")) != EOF) {
+ while ((op = getopt(argc, argv, "afv")) != EOF) {
switch (op) {
case 'a':
++aflag;
@@ -150,21 +200,25 @@ main(argc, argv)
++fflag;
break;
+ case 'v':
+ ++verbose;
+ break;
+
default:
usage();
/* NOTREACHED */
}
}
ifname = argv[optind++];
- hostname = ifname ? argv[optind] : 0;
- if ((aflag && ifname) || (!aflag && ifname == 0))
+ hostname = ifname ? argv[optind] : NULL;
+ if ((aflag && ifname) || (!aflag && ifname == NULL))
usage();
if (aflag)
- init_all();
+ init(NULL);
else
- init_one(ifname);
-
+ init(ifname);
+
if (!fflag) {
pid = fork();
if (pid > 0)
@@ -174,78 +228,203 @@ main(argc, argv)
syslog(LOG_ERR, "cannot fork");
exit(1);
}
+
+ /* Fade into the background */
+ f = open("/dev/tty", O_RDWR);
+ if (f >= 0) {
+ if (ioctl(f, TIOCNOTTY, NULL) < 0)
+ syslog(LOG_ERR, "TIOCNOTTY: %m");
+ (void) close(f);
+ }
+ (void) chdir("/");
+ (void) setpgrp(0, getpid());
+ devnull = open("/dev/null", O_RDWR);
+ if (devnull >= 0) {
+ (void) dup2(devnull, 0);
+ (void) dup2(devnull, 1);
+ (void) dup2(devnull, 2);
+ if (devnull > 2)
+ (void) close(devnull);
+ }
}
rarp_loop();
}
/*
- * Add 'ifname' to the interface list. Lookup its IP address and network
- * mask and Ethernet address, and open a BPF file for it.
+ * Add to the interface list.
*/
void
-init_one(ifname)
- char *ifname;
+init_one(ifrp, target)
+ register struct ifreq *ifrp;
+ register char *target;
{
- struct if_info *p;
+ register struct if_info *ii;
+ register struct sockaddr_dl *ll;
+ int family;
+ struct ifreq ifr;
+ family = ifrp->ifr_addr.sa_family;
+ switch (family) {
- p = (struct if_info *)malloc(sizeof(*p));
- p->ii_next = iflist;
- iflist = p;
+ case AF_INET:
+#if BSD >= 199100
+ case AF_LINK:
+#endif
+ (void)strncpy(ifr.ifr_name, ifrp->ifr_name,
+ sizeof(ifrp->ifr_name));
+ if (ioctl(s, SIOCGIFFLAGS, (char *)&ifr) < 0) {
+ syslog(LOG_ERR,
+ "SIOCGIFFLAGS: %.*s: %m",
+ sizeof(ifrp->ifr_name), ifrp->ifr_name);
+ exit(1);
+ }
+ if ((ifr.ifr_flags & IFF_UP) == 0 ||
+ (ifr.ifr_flags & (IFF_LOOPBACK | IFF_POINTOPOINT)) != 0)
+ return;
+ break;
- p->ii_fd = rarp_open(ifname);
- lookup_eaddr(p->ii_fd, p->ii_eaddr);
- lookup_ipaddr(ifname, &p->ii_ipaddr, &p->ii_netmask);
-}
+ default:
+ return;
+ }
+
+ /* Don't bother going any further if not the target interface */
+ if (target != NULL &&
+ strncmp(ifrp->ifr_name, target, sizeof(ifrp->ifr_name)) != 0)
+ return;
+
+ /* Look for interface in list */
+ for (ii = iflist; ii != NULL; ii = ii->ii_next)
+ if (strncmp(ifrp->ifr_name, ii->ii_ifname,
+ sizeof(ifrp->ifr_name)) == 0)
+ break;
+
+ /* Allocate a new one if not found */
+ if (ii == NULL) {
+ ii = (struct if_info *)malloc(sizeof(*ii));
+ if (ii == NULL) {
+ syslog(LOG_ERR, "malloc: %m");
+ exit(1);
+ }
+ bzero(ii, sizeof(*ii));
+ ii->ii_fd = -1;
+ (void)strncpy(ii->ii_ifname, ifrp->ifr_name,
+ sizeof(ifrp->ifr_name));
+ ii->ii_ifname[sizeof(ii->ii_ifname) - 1] = '\0';
+ ii->ii_next = iflist;
+ iflist = ii;
+ }
+
+ switch (family) {
+
+ case AF_INET:
+ if (ioctl(s, SIOCGIFADDR, (char *)&ifr) < 0) {
+ syslog(LOG_ERR, "ipaddr SIOCGIFADDR: %s: %m",
+ ii->ii_ifname);
+ exit(1);
+ }
+ ii->ii_ipaddr = SATOSIN(&ifr.ifr_addr)->sin_addr.s_addr;
+ if (ioctl(s, SIOCGIFNETMASK, (char *)&ifr) < 0) {
+ syslog(LOG_ERR, "SIOCGIFNETMASK: %m");
+ exit(1);
+ }
+ ii->ii_netmask = SATOSIN(&ifr.ifr_addr)->sin_addr.s_addr;
+ if (ii->ii_netmask == 0)
+ ii->ii_netmask = ipaddrtonetmask(ii->ii_ipaddr);
+ if (ii->ii_fd < 0) {
+ ii->ii_fd = rarp_open(ii->ii_ifname);
+#if BSD < 199100
+ /* Use BPF descriptor to get ethernet address. */
+ if (ioctl(ii->ii_fd, SIOCGIFADDR, (char *)&ifr) < 0) {
+ syslog(LOG_ERR, "eaddr SIOCGIFADDR: %s: %m",
+ ii->ii_ifname);
+ exit(1);
+ }
+ bcopy(&ifr.ifr_addr.sa_data[0], ii->ii_eaddr, 6);
+#endif
+ }
+ break;
+
+#if BSD >= 199100
+ case AF_LINK:
+ ll = (struct sockaddr_dl *)&ifrp->ifr_addr;
+ if (ll->sdl_type == IFT_ETHER)
+ bcopy(LLADDR(ll), ii->ii_eaddr, 6);
+ break;
+#endif
+ }
+}
/*
* Initialize all "candidate" interfaces that are in the system
* configuration list. A "candidate" is up, not loopback and not
* point to point.
*/
void
-init_all()
+init(target)
+ char *target;
{
- int fd;
- int ifflags;
- struct ifreq ibuf[8], tmp_ibuf, *ifptr, *n;
+ register int n;
+ register struct ifreq *ifrp, *ifend;
+ register struct if_info *ii, *nii, *lii;
struct ifconf ifc;
+ struct ifreq ibuf[16];
- if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
syslog(LOG_ERR, "socket: %m");
exit(1);
}
ifc.ifc_len = sizeof ibuf;
ifc.ifc_buf = (caddr_t)ibuf;
- if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 ||
- ifc.ifc_len < sizeof(struct ifreq)) {
+ if (ioctl(s, SIOCGIFCONF, (char *)&ifc) < 0 ||
+ (u_int)ifc.ifc_len < sizeof(struct ifreq)) {
syslog(LOG_ERR, "SIOCGIFCONF: %m");
exit(1);
}
- ifptr = ifc.ifc_req;
- ifflags = ifptr->ifr_flags;
- n = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
- while (ifptr < n) {
- bcopy((char *)ifptr, (char *)&tmp_ibuf, sizeof(struct ifreq));
- if (ioctl(fd, SIOCGIFFLAGS, (char *)&tmp_ibuf) < 0) {
- syslog(LOG_ERR, "SIOCGIFFLAGS: %m");
- exit(1);
+ ifrp = ibuf;
+ ifend = (struct ifreq *)((char *)ibuf + ifc.ifc_len);
+ while (ifrp < ifend) {
+ init_one(ifrp, target);
+
+#if BSD >= 199100
+ n = ifrp->ifr_addr.sa_len + sizeof(ifrp->ifr_name);
+ if (n < sizeof(*ifrp))
+ n = sizeof(*ifrp);
+ ifrp = (struct ifreq *)((char *)ifrp + n);
+#else
+ ++ifrp;
+#endif
+ }
+
+ /* Throw away incomplete interfaces */
+ lii = NULL;
+ for (ii = iflist; ii != NULL; ii = nii) {
+ nii = ii->ii_next;
+ if (ii->ii_ipaddr == 0 ||
+ bcmp(ii->ii_eaddr, zero, 6) == 0) {
+ if (lii == NULL)
+ iflist = nii;
+ else
+ lii->ii_next = nii;
+ if (ii->ii_fd >= 0)
+ close(ii->ii_fd);
+ free(ii);
+ continue;
}
- if (ifptr->ifr_flags == ifflags && (tmp_ibuf.ifr_flags &
- (IFF_UP | IFF_LOOPBACK | IFF_POINTOPOINT)) == IFF_UP)
- init_one(ifptr->ifr_name);
- if(ifptr->ifr_addr.sa_len) /* Dohw! */
- ifptr = (struct ifreq *) ((caddr_t) ifptr +
- ifptr->ifr_addr.sa_len -
- sizeof(struct sockaddr));
- ifptr++;
- }
- (void)close(fd);
+ lii = ii;
+ }
+
+ /* Verbose stuff */
+ if (verbose)
+ for (ii = iflist; ii != NULL; ii = ii->ii_next)
+ syslog(LOG_DEBUG, "%s %s 0x%x %s",
+ ii->ii_ifname, intoa(ii->ii_ipaddr),
+ ii->ii_netmask, eatoa(ii->ii_eaddr));
}
+void
usage()
{
- (void)fprintf(stderr, "usage: rarpd [ -af ] [ interface ]\n");
+ (void)fprintf(stderr, "usage: rarpd [ -afv ] [ interface ]\n");
exit(1);
}
@@ -257,7 +436,7 @@ bpf_open()
char device[sizeof "/dev/bpf000"];
/*
- * Go through all the minors and find one that isn't in use.
+ * Go through all the minors and find one that isn't in use.
*/
do {
(void)sprintf(device, "/dev/bpf%d", n++);
@@ -266,7 +445,7 @@ bpf_open()
if (fd < 0) {
syslog(LOG_ERR, "%s: %m", device);
- exit(-1);
+ exit(1);
}
return fd;
}
@@ -281,25 +460,25 @@ rarp_open(device)
{
int fd;
struct ifreq ifr;
- int immediate, link_type;
+ u_int dlt;
+ int immediate;
static struct bpf_insn insns[] = {
- BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 12),
- BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ETHERTYPE_REVARP, 0, 3),
- BPF_STMT(BPF_LD+BPF_H+BPF_ABS, 20),
- BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARPOP_REVREQUEST, 0, 1),
- BPF_STMT(BPF_RET+BPF_K, sizeof(struct ether_arp) +
- sizeof(struct ether_header)),
- BPF_STMT(BPF_RET+BPF_K, 0),
- };
-
- static struct bpf_program filter = {
- sizeof insns / sizeof(insns[0]),
- (struct bpf_insn *)&insns
- };
+ BPF_STMT(BPF_LD|BPF_H|BPF_ABS, 12),
+ BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, ETHERTYPE_REVARP, 0, 3),
+ BPF_STMT(BPF_LD|BPF_H|BPF_ABS, 20),
+ BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, REVARP_REQUEST, 0, 1),
+ BPF_STMT(BPF_RET|BPF_K, sizeof(struct ether_arp) +
+ sizeof(struct ether_header)),
+ BPF_STMT(BPF_RET|BPF_K, 0),
+ };
+ static struct bpf_program filter = {
+ sizeof insns / sizeof(insns[0]),
+ insns
+ };
fd = bpf_open();
- /*
+ /*
* Set immediate mode so packets are processed as they arrive.
*/
immediate = 1;
@@ -316,12 +495,12 @@ rarp_open(device)
* Check that the data link layer is an Ethernet; this code won't
* work with anything else.
*/
- if (ioctl(fd, BIOCGDLT, &link_type) < 0) {
- syslog(LOG_ERR, "BIOCGDLP: %m");
+ if (ioctl(fd, BIOCGDLT, (caddr_t)&dlt) < 0) {
+ syslog(LOG_ERR, "BIOCGDLT: %m");
exit(1);
}
- if (link_type != DLT_EN10MB) {
- syslog(LOG_ERR, "%s not on ethernet", device);
+ if (dlt != DLT_EN10MB) {
+ syslog(LOG_ERR, "%s is not an ethernet", device);
exit(1);
}
/*
@@ -341,7 +520,7 @@ rarp_open(device)
static int
rarp_check(p, len)
u_char *p;
- int len;
+ u_int len;
{
struct ether_header *ep = (struct ether_header *)p;
struct ether_arp *ap = (struct ether_arp *)(p + sizeof(*ep));
@@ -353,10 +532,10 @@ rarp_check(p, len)
/*
* XXX This test might be better off broken out...
*/
- if (ep->ether_type != htons(ETHERTYPE_REVARP) ||
- ap->arp_hrd != htons(ARPHRD_ETHER) ||
- ap->arp_op != htons(ARPOP_REVREQUEST) ||
- ap->arp_pro != htons(ETHERTYPE_IP) ||
+ if (ntohs(ep->ether_type) != ETHERTYPE_REVARP ||
+ ntohs(ap->arp_hrd) != ARPHRD_ETHER ||
+ ntohs(ap->arp_op) != REVARP_REQUEST ||
+ ntohs(ap->arp_pro) != ETHERTYPE_IP ||
ap->arp_hln != 6 || ap->arp_pln != 4) {
syslog(LOG_DEBUG, "request fails sanity check");
return 0;
@@ -379,20 +558,19 @@ rarp_check(p, len)
#endif
/*
- * Loop indefinitely listening for RARP requests on the
+ * Loop indefinitely listening for RARP requests on the
* interfaces in 'iflist'.
*/
void
rarp_loop()
{
- struct bpf_hdr *bhp;
- u_char *pkt;
+ u_char *buf, *bp, *ep;
int cc, fd;
fd_set fds, listeners;
int bufsize, maxfd = 0;
struct if_info *ii;
- if (iflist == 0) {
+ if (iflist == NULL) {
syslog(LOG_ERR, "no interfaces");
exit(1);
}
@@ -400,66 +578,84 @@ rarp_loop()
syslog(LOG_ERR, "BIOCGBLEN: %m");
exit(1);
}
- bhp = (struct bpf_hdr *)malloc((unsigned)bufsize);
+ buf = (u_char *)malloc((unsigned)bufsize);
+ if (buf == NULL) {
+ syslog(LOG_ERR, "malloc: %m");
+ exit(1);
+ }
/*
* Find the highest numbered file descriptor for select().
* Initialize the set of descriptors to listen to.
*/
FD_ZERO(&fds);
- for (ii = iflist; ii; ii = ii->ii_next) {
+ for (ii = iflist; ii != NULL; ii = ii->ii_next) {
FD_SET(ii->ii_fd, &fds);
if (ii->ii_fd > maxfd)
maxfd = ii->ii_fd;
}
while (1) {
listeners = fds;
- if (select(maxfd + 1, &listeners, (struct fd_set *)0,
- (struct fd_set *)0, (struct timeval *)0) < 0) {
+ if (select(maxfd + 1, &listeners, NULL, NULL, NULL) < 0) {
+ /* Don't choke when we get ptraced */
+ if (errno == EINTR)
+ continue;
syslog(LOG_ERR, "select: %m");
exit(1);
}
- for (ii = iflist; ii; ii = ii->ii_next) {
+ for (ii = iflist; ii != NULL; ii = ii->ii_next) {
fd = ii->ii_fd;
- if (FD_ISSET(fd, &listeners)) {
- again:
- cc = read(fd, (char *)bhp, bufsize);
- /*
- * Due to a SunOS bug, after 2^31 bytes, the
- * file offset overflows and read fails with
- * EINVAL. The lseek() to 0 will fix things.
- */
- if (cc < 0) {
- if (errno == EINVAL &&
- (long)(lseek(fd, 0L, SEEK_CUR) + bufsize) < 0) {
- (void)lseek(fd, 0, 0);
- goto again;
- }
- syslog(LOG_ERR, "read: %m");
- exit(1);
+ if (!FD_ISSET(fd, &listeners))
+ continue;
+ again:
+ cc = read(fd, (char *)buf, bufsize);
+ /* Don't choke when we get ptraced */
+ if (cc < 0 && errno == EINTR)
+ goto again;
+#if defined(SUNOS3) || defined(SUNOS4)
+ /*
+ * Due to a SunOS bug, after 2^31 bytes, the
+ * file offset overflows and read fails with
+ * EINVAL. The lseek() to 0 will fix things.
+ */
+ if (cc < 0) {
+ if (errno == EINVAL &&
+ (long)(tell(fd) + bufsize) < 0) {
+ (void)lseek(fd, 0, 0);
+ goto again;
}
- pkt = (u_char *)bhp + bhp->bh_hdrlen;
+ syslog(LOG_ERR, "read: %m");
+ exit(1);
+ }
+#endif
- if (rarp_check(pkt, (int)bhp->bh_datalen))
- rarp_process(ii, pkt);
+ /* Loop through the packet(s) */
+#define bhp ((struct bpf_hdr *)bp)
+ bp = buf;
+ ep = bp + cc;
+ while (bp < ep) {
+ register u_int caplen, hdrlen;
+
+ caplen = bhp->bh_caplen;
+ hdrlen = bhp->bh_hdrlen;
+ if (rarp_check(bp + hdrlen, caplen))
+ rarp_process(ii, bp + hdrlen);
+ bp += BPF_WORDALIGN(hdrlen + caplen);
}
}
}
+#undef bhp
}
-#ifndef TFTP_DIR
-#define TFTP_DIR "/tftpboot"
-#endif
-
/*
* True if this server can boot the host whose IP address is 'addr'.
* This check is made by looking in the tftp directory for the
* configuration file.
*/
+int
rarp_bootable(addr)
u_long addr;
{
-
#ifdef SUNOS4
register struct dirent *dent;
#else
@@ -467,35 +663,30 @@ rarp_bootable(addr)
#endif
register DIR *d;
char ipname[9];
- static DIR *dd = 0;
+ static DIR *dd = NULL;
- /*
- * XXX Need to htonl() the IP address or it'll
- * come out backwards.
- */
- (void)sprintf(ipname, "%08X", htonl(addr));
+ (void)sprintf(ipname, "%08X", addr);
/*
* If directory is already open, rewind it. Otherwise, open it.
*/
- if (d = dd)
+ if ((d = dd) != NULL)
rewinddir(d);
else {
- if (chdir(TFTP_DIR) == -1) {
- syslog(LOG_ERR, "chdir: %m");
+ if (chdir(tftp_dir) == -1) {
+ syslog(LOG_ERR, "chdir: %s: %m", tftp_dir);
exit(1);
}
d = opendir(".");
- if (d == 0) {
+ if (d == NULL) {
syslog(LOG_ERR, "opendir: %m");
exit(1);
}
dd = d;
}
- while (dent = readdir(d))
+ while ((dent = readdir(d)) != NULL)
if (strncmp(dent->d_name, ipname, 8) == 0)
return 1;
return 0;
-
}
/*
@@ -509,23 +700,17 @@ choose_ipaddr(alist, net, netmask)
u_long net;
u_long netmask;
{
- for (; *alist; ++alist) {
+ for (; *alist; ++alist)
if ((**alist & netmask) == net)
return **alist;
- }
return 0;
}
/*
- * A one entry ip/ethernet address cache.
- */
-static u_long cache_ipaddr;
-static u_char cache_eaddr[6];
-
-/*
* Answer the RARP request in 'pkt', on the interface 'ii'. 'pkt' has
* already been checked for validity. The reply is overlaid on the request.
*/
+void
rarp_process(ii, pkt)
struct if_info *ii;
u_char *pkt;
@@ -536,107 +721,153 @@ rarp_process(ii, pkt)
char ename[256];
ep = (struct ether_header *)pkt;
+ if (ether_ntohost(ename, &ep->ether_shost) != 0 ||
+ (hp = gethostbyname(ename)) == NULL)
+ return;
/*
- * If the address in the one element cache, don't bother
- * looking up names.
+ * Choose correct address from list.
*/
- if (bcmp((char *)cache_eaddr, (char *)&ep->ether_shost, 6) == 0)
- target_ipaddr = cache_ipaddr;
- else {
- if (ether_ntohost(ename, &ep->ether_shost) != 0 ||
- (hp = gethostbyname(ename)) == 0)
- return;
- /*
- * Choose correct address from list.
- */
- if (hp->h_addrtype != AF_INET) {
- syslog(LOG_ERR, "cannot handle non IP addresses");
- exit(1);
- }
- target_ipaddr = choose_ipaddr((u_long **)hp->h_addr_list,
- ii->ii_ipaddr & ii->ii_netmask,
- ii->ii_netmask);
- if (target_ipaddr == 0) {
- syslog(LOG_ERR, "cannot find %s on %08x",
- ename, ii->ii_ipaddr & ii->ii_netmask);
- return;
- }
- bcopy((char *)&ep->ether_shost, (char *)cache_eaddr, 6);
- cache_ipaddr = target_ipaddr;
+ if (hp->h_addrtype != AF_INET) {
+ syslog(LOG_ERR, "cannot handle non IP addresses");
+ exit(1);
+ }
+ target_ipaddr = choose_ipaddr((u_long **)hp->h_addr_list,
+ ii->ii_ipaddr & ii->ii_netmask,
+ ii->ii_netmask);
+ if (target_ipaddr == 0) {
+ syslog(LOG_ERR, "cannot find %s on net %s",
+ ename, intoa(ii->ii_ipaddr & ii->ii_netmask));
+ return;
}
if (rarp_bootable(target_ipaddr))
rarp_reply(ii, ep, target_ipaddr);
+ else if (verbose > 1)
+ syslog(LOG_DEBUG, "%s %s at %s DENIED (not bootable)",
+ ii->ii_ifname,
+ eatoa(ii->ii_eaddr),
+ intoa(ii->ii_ipaddr));
}
/*
- * Lookup the ethernet address of the interface attached to the BPF
- * file descriptor 'fd'; return it in 'eaddr'.
+ * Poke the kernel arp tables with the ethernet/ip address combinataion
+ * given. When processing a reply, we must do this so that the booting
+ * host (i.e. the guy running rarpd), won't try to ARP for the hardware
+ * address of the guy being booted (he cannot answer the ARP).
*/
+#if BSD >= 199200
+static struct sockaddr_inarp sin_inarp = {
+ sizeof(struct sockaddr_inarp), AF_INET
+};
+static struct sockaddr_dl sin_dl = {
+ sizeof(struct sockaddr_dl), AF_LINK, 0, IFT_ETHER, 0, 6
+};
+static struct {
+ struct rt_msghdr rthdr;
+ char rtspace[512];
+} rtmsg;
+
void
-lookup_eaddr(fd, eaddr)
- int fd;
- u_char *eaddr;
+update_arptab(ep, ipaddr)
+ u_char *ep;
+ u_long ipaddr;
{
- struct ifreq ifr;
+ register int cc;
+ register struct sockaddr_inarp *ar, *ar2;
+ register struct sockaddr_dl *ll, *ll2;
+ register struct rt_msghdr *rt;
+ register int xtype, xindex;
+ static pid_t pid;
+ static int r, seq;
+ static init = 0;
+
+ if (!init) {
+ r = socket(PF_ROUTE, SOCK_RAW, 0);
+ if (r < 0) {
+ syslog(LOG_ERR, "raw route socket: %m");
+ exit(1);
+ }
+ pid = getpid();
+ ++init;
+ }
- /* Use BPF descriptor to get ethernet address. */
- if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) {
- syslog(LOG_ERR, "SIOCGIFADDR: %m");
+ ar = &sin_inarp;
+ ar->sin_addr.s_addr = ipaddr;
+ ll = &sin_dl;
+ bcopy(ep, LLADDR(ll), 6);
+
+ /* Get the type and interface index */
+ rt = &rtmsg.rthdr;
+ bzero(rt, sizeof(rtmsg));
+ rt->rtm_version = RTM_VERSION;
+ rt->rtm_addrs = RTA_DST;
+ rt->rtm_type = RTM_GET;
+ rt->rtm_seq = ++seq;
+ ar2 = (struct sockaddr_inarp *)rtmsg.rtspace;
+ bcopy(ar, ar2, sizeof(*ar));
+ rt->rtm_msglen = sizeof(*rt) + sizeof(*ar);
+ errno = 0;
+ if (write(r, rt, rt->rtm_msglen) < 0 && errno != ESRCH) {
+ syslog(LOG_ERR, "rtmsg get write: %m");
exit(1);
}
- bcopy((char *)&ifr.ifr_addr.sa_data[0], (char *)eaddr, 6);
-}
-
-/*
- * Lookup the IP address and network mask of the interface named 'ifname'.
- */
-void
-lookup_ipaddr(ifname, addrp, netmaskp)
- char *ifname;
- u_long *addrp;
- u_long *netmaskp;
-{
- int fd;
- struct ifreq ifr;
-
- /* Use data gram socket to get IP address. */
- if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
- syslog(LOG_ERR, "socket: %m");
+ do {
+ cc = read(r, rt, sizeof(rtmsg));
+ } while (cc > 0 && (rt->rtm_seq != seq || rt->rtm_pid != pid));
+ if (cc < 0) {
+ syslog(LOG_ERR, "rtmsg get read: %m");
exit(1);
}
- (void)strncpy(ifr.ifr_name, ifname, sizeof ifr.ifr_name);
- if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) {
- syslog(LOG_ERR, "SIOCGIFADDR: %m");
+ ll2 = (struct sockaddr_dl *)((u_char *)ar2 + ar2->sin_len);
+ if (ll2->sdl_family != AF_LINK) {
+ /*
+ * XXX I think this means the ip address is not on a
+ * directly connected network (the family is AF_INET in
+ * this case).
+ */
+ syslog(LOG_ERR, "bogus link family (%d) wrong net?\n",
+ ll2->sdl_family);
+ return;
+ }
+ xtype = ll2->sdl_type;
+ xindex = ll2->sdl_index;
+
+ /* Set the new arp entry */
+ bzero(rt, sizeof(rtmsg));
+ rt->rtm_version = RTM_VERSION;
+ rt->rtm_addrs = RTA_DST | RTA_GATEWAY;
+ rt->rtm_inits = RTV_EXPIRE;
+ rt->rtm_rmx.rmx_expire = time(0) + ARPSECS;
+ rt->rtm_flags = RTF_HOST | RTF_STATIC;
+ rt->rtm_type = RTM_ADD;
+ rt->rtm_seq = ++seq;
+
+ bcopy(ar, ar2, sizeof(*ar));
+
+ ll2 = (struct sockaddr_dl *)((u_char *)ar2 + sizeof(*ar2));
+ bcopy(ll, ll2, sizeof(*ll));
+ ll2->sdl_type = xtype;
+ ll2->sdl_index = xindex;
+
+ rt->rtm_msglen = sizeof(*rt) + sizeof(*ar2) + sizeof(*ll2);
+ errno = 0;
+ if (write(r, rt, rt->rtm_msglen) < 0 && errno != EEXIST) {
+ syslog(LOG_ERR, "rtmsg add write: %m");
exit(1);
}
- *addrp = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
- if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifr) < 0) {
- perror("SIOCGIFNETMASK");
+ do {
+ cc = read(r, rt, sizeof(rtmsg));
+ } while (cc > 0 && (rt->rtm_seq != seq || rt->rtm_pid != pid));
+ if (cc < 0) {
+ syslog(LOG_ERR, "rtmsg add read: %m");
exit(1);
}
- *netmaskp = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
- /*
- * If SIOCGIFNETMASK didn't work, figure out a mask from
- * the IP address class.
- */
- if (*netmaskp == 0)
- *netmaskp = ipaddrtonetmask(*addrp);
-
- (void)close(fd);
}
-
-/*
- * Poke the kernel arp tables with the ethernet/ip address combinataion
- * given. When processing a reply, we must do this so that the booting
- * host (i.e. the guy running rarpd), won't try to ARP for the hardware
- * address of the guy being booted (he cannot answer the ARP).
- */
+#else
+void
update_arptab(ep, ipaddr)
u_char *ep;
u_long ipaddr;
{
-#ifdef SIOCSARP_IS_DEPRECATED_IN_4_4BSD
- int s;
struct arpreq request;
struct sockaddr_in *sin;
@@ -647,16 +878,14 @@ update_arptab(ep, ipaddr)
request.arp_ha.sa_family = AF_UNSPEC;
bcopy((char *)ep, (char *)request.arp_ha.sa_data, 6);
- s = socket(AF_INET, SOCK_DGRAM, 0);
if (ioctl(s, SIOCSARP, (caddr_t)&request) < 0)
syslog(LOG_ERR, "SIOCSARP: %m");
- (void)close(s);
-#endif
}
+#endif
/*
* Build a reverse ARP packet and sent it out on the interface.
- * 'ep' points to a valid REVARP_REQUEST. The REVARP_REPLY is built
+ * 'ep' points to a valid REVARP_REQUEST. The REVARP_REPLY is built
* on top of the request, then written to the network.
*
* RFC 903 defines the ether_arp fields as follows. The following comments
@@ -680,13 +909,14 @@ update_arptab(ep, ipaddr)
* arp_tha is the hardware address of the target, and should be the same as
* that which was given in the request.
* arp_tpa is the protocol address of the target, that is, the desired address.
- *
+ *
* Note that the requirement that arp_spa be filled in with the responder's
- * protocol is purely for convenience. For instance, if a system were to use
- * both ARP and RARP, then the inclusion of the valid protocol-hardware
- * address pair (arp_spa, arp_sha) may eliminate the need for a subsequent
+ * protocol is purely for convenience. For instance, if a system were to use
+ * both ARP and RARP, then the inclusion of the valid protocol-hardware
+ * address pair (arp_spa, arp_sha) may eliminate the need for a subsequent
* ARP request.
*/
+void
rarp_reply(ii, ep, ipaddr)
struct if_info *ii;
struct ether_header *ep;
@@ -694,38 +924,32 @@ rarp_reply(ii, ep, ipaddr)
{
int n;
struct ether_arp *ap = (struct ether_arp *)(ep + 1);
- int len, raw_sock;
+ int len;
update_arptab((u_char *)&ap->arp_sha, ipaddr);
/*
* Build the rarp reply by modifying the rarp request in place.
*/
- ap->arp_op = htons(ARPOP_REVREPLY);
-
- /*
- * XXX Using htons(ETHERTYPE_REVARP) doesn't work: you wind
- * up transmitting 0x3580 instead of the correct value of
- * 0x8035. What makes no sense is that the NetBSD people
- * do in fact use htons(ETHERTYPE_REVARP) in their rarpd.
- * (Thank god for tcpdump or I would never have figured this
- * out.)
- */
- ep->ether_type = ETHERTYPE_REVARP;
+ ap->arp_op = htons(REVARP_REPLY);
bcopy((char *)&ap->arp_sha, (char *)&ep->ether_dhost, 6);
bcopy((char *)ii->ii_eaddr, (char *)&ep->ether_shost, 6);
bcopy((char *)ii->ii_eaddr, (char *)&ap->arp_sha, 6);
+ ipaddr = htonl(ipaddr);
bcopy((char *)&ipaddr, (char *)ap->arp_tpa, 4);
/* Target hardware is unchanged. */
bcopy((char *)&ii->ii_ipaddr, (char *)ap->arp_spa, 4);
len = sizeof(*ep) + sizeof(*ap);
n = write(ii->ii_fd, (char *)ep, len);
- if (n != len) {
+ if (n != len)
syslog(LOG_ERR, "write: only %d of %d bytes written", n, len);
- }
+ if (verbose)
+ syslog(LOG_DEBUG, "%s %s at %s", ii->ii_ifname,
+ eatoa(ii->ii_eaddr),
+ intoa(ii->ii_ipaddr));
}
/*
@@ -746,3 +970,47 @@ ipaddrtonetmask(addr)
exit(1);
/* NOTREACHED */
}
+
+/*
+ * A faster replacement for inet_ntoa().
+ */
+char *
+intoa(addr)
+ u_long addr;
+{
+ register char *cp;
+ register u_int byte;
+ register int n;
+ static char buf[sizeof(".xxx.xxx.xxx.xxx")];
+
+ cp = &buf[sizeof buf];
+ *--cp = '\0';
+
+ n = 4;
+ do {
+ byte = addr & 0xff;
+ *--cp = byte % 10 + '0';
+ byte /= 10;
+ if (byte > 0) {
+ *--cp = byte % 10 + '0';
+ byte /= 10;
+ if (byte > 0)
+ *--cp = byte + '0';
+ }
+ *--cp = '.';
+ addr >>= 8;
+ } while (--n > 0);
+
+ return cp + 1;
+}
+
+char *
+eatoa(ea)
+ register u_char *ea;
+{
+ static char buf[sizeof("xx:xx:xx:xx:xx:xx")];
+
+ (void)sprintf(buf, "%x:%x:%x:%x:%x:%x",
+ ea[0], ea[1], ea[2], ea[3], ea[4], ea[5]);
+ return (buf);
+}