BSD 4_4_Lite1 release

[unix-history] / usr / src / usr.sbin / arp / arp.c

diff --git a/usr/src/usr.sbin/arp/arp.c b/usr/src/usr.sbin/arp/arp.c
index 3b3be6e..2182dc8 100644 (file)
--- a/usr/src/usr.sbin/arp/arp.c
+++ b/usr/src/usr.sbin/arp/arp.c
@@ -1,47 +1,80 @@
 /*
 /*

- * Copyright (c) 1984 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1984, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Sun Microsystems, Inc.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Sun Microsystems, Inc.
  *

- * %sccs.include.redist.c%
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1984 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1984, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)arp.c      5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)arp.c      8.2 (Berkeley) 1/2/94";

 #endif /* not lint */
 
 /*
  * arp - display, set, and delete arp table entries
  */
 
 #endif /* not lint */
 
 /*
  * arp - display, set, and delete arp table entries
  */
 

-#include <machine/pte.h>

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <sys/vmmac.h>

 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/socket.h>

-#include <sys/ioctl.h>
+#include <sys/sysctl.h>

 
 

-#include <netdb.h>
-#include <netinet/in.h>

 #include <net/if.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 <netinet/if_ether.h>
 

+#include <arpa/inet.h>
+
+#include <netdb.h>

 #include <errno.h>
 #include <nlist.h>
 #include <stdio.h>
 #include <paths.h>
 
 extern int errno;
 #include <errno.h>
 #include <nlist.h>
 #include <stdio.h>
 #include <paths.h>
 
 extern int errno;

+static int pid;

 static int kflag;
 static int kflag;

+static int nflag;
+static int s = -1;

 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;


@@ -49,35 +82,24 @@ main(argc, argv)
 {
        int ch;
 
 {
        int ch;
 

-       while ((ch = getopt(argc, argv, "adsf")) != EOF)
+       pid = getpid();
+       while ((ch = getopt(argc, argv, "ands")) != EOF)

                switch((char)ch) {
                switch((char)ch) {

-               case 'a': {
-                       char *mem;
-
-                       if (argc > 4)
-                               usage();
-                       if (argc == 4) {
-                               kflag = 1;
-                               mem = argv[3];
-                       }
-                       else
-                               mem = _PATH_KMEM;
-                       dump((argc >= 3) ? argv[2] : _PATH_UNIX, mem);
+               case 'a':
+                       dump(0);

                        exit(0);
                        exit(0);

-               }

                case 'd':
                case 'd':

-                       if (argc != 3)
+                       if (argc < 3 || argc > 4)

                                usage();
                                usage();

-                       delete(argv[2]);
+                       delete(argv[2], argv[3]);

                        exit(0);
                        exit(0);

+               case 'n':
+                       nflag = 1;
+                       continue;

                case 's':
                        if (argc < 4 || argc > 7)
                                usage();
                        exit(set(argc-2, &argv[2]) ? 1 : 0);
                case 's':
                        if (argc < 4 || argc > 7)
                                usage();
                        exit(set(argc-2, &argv[2]) ? 1 : 0);

-               case 'f':
-                       if (argc != 3)
-                               usage();
-                       exit (file(argv[2]) ? 1 : 0);

                case '?':
                default:
                        usage();
                case '?':
                default:
                        usage();


@@ -123,6 +145,25 @@ file(name)
        return (retval);
 }
 
        return (retval);
 }
 

+getsocket() {
+       if (s < 0) {
+               s = socket(PF_ROUTE, SOCK_RAW, 0);
+               if (s < 0) {
+                       perror("arp: socket");
+                       exit(1);
+               }
+       }
+}
+
+struct sockaddr_in so_mask = {8, 0, 0, { 0xffffffff}};
+struct sockaddr_inarp blank_sin = {sizeof(blank_sin), AF_INET }, sin_m;
+struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
+int    expire_time, flags, export_only, doing_proxy, found_entry;
+struct {
+       struct  rt_msghdr m_rtm;
+       char    m_space[512];
+}      m_rtmsg;
+

 /*
  * Set an individual arp entry 
  */
 /*
  * Set an individual arp entry 
  */


@@ -130,18 +171,18 @@ set(argc, argv)
        int argc;
        char **argv;
 {
        int argc;
        char **argv;
 {

-       struct arpreq ar;

        struct hostent *hp;
        struct hostent *hp;

-       struct sockaddr_in *sin;
+       register struct sockaddr_inarp *sin = &sin_m;
+       register struct sockaddr_dl *sdl;
+       register struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);

        u_char *ea;
        u_char *ea;

-       int s;

        char *host = argv[0], *eaddr = argv[1];
 
        char *host = argv[0], *eaddr = argv[1];
 

+       getsocket();

        argc -= 2;
        argv += 2;
        argc -= 2;
        argv += 2;

-       bzero((caddr_t)&ar, sizeof ar);
-       sin = (struct sockaddr_in *)&ar.arp_pa;
-       sin->sin_family = AF_INET;
+       sdl_m = blank_sdl;
+       sin_m = blank_sin;

        sin->sin_addr.s_addr = inet_addr(host);
        if (sin->sin_addr.s_addr == -1) {
                if (!(hp = gethostbyname(host))) {
        sin->sin_addr.s_addr = inet_addr(host);
        if (sin->sin_addr.s_addr == -1) {
                if (!(hp = gethostbyname(host))) {


@@ -152,31 +193,60 @@ set(argc, argv)
                bcopy((char *)hp->h_addr, (char *)&sin->sin_addr,
                    sizeof sin->sin_addr);
        }
                bcopy((char *)hp->h_addr, (char *)&sin->sin_addr,
                    sizeof sin->sin_addr);
        }

-       ea = (u_char *)ar.arp_ha.sa_data;
-       if (ether_aton(eaddr, ea))
-               return (1);
-       ar.arp_flags = ATF_PERM;
+       ea = (u_char *)LLADDR(&sdl_m);
+       if (ether_aton(eaddr, ea) == 0)
+               sdl_m.sdl_alen = 6;
+       doing_proxy = flags = export_only = expire_time = 0;

        while (argc-- > 0) {
        while (argc-- > 0) {

-               if (strncmp(argv[0], "temp", 4) == 0)
-                       ar.arp_flags &= ~ATF_PERM;
-               else if (strncmp(argv[0], "pub", 3) == 0)
-                       ar.arp_flags |= ATF_PUBL;
-               else if (strncmp(argv[0], "trail", 5) == 0)
-                       ar.arp_flags |= ATF_USETRAILERS;
+               if (strncmp(argv[0], "temp", 4) == 0) {
+                       struct timeval time;
+                       gettimeofday(&time, 0);
+                       expire_time = time.tv_sec + 20 * 60;
+               }
+               else if (strncmp(argv[0], "pub", 3) == 0) {
+                       flags |= RTF_ANNOUNCE;
+                       doing_proxy = SIN_PROXY;
+               } else if (strncmp(argv[0], "trail", 5) == 0) {
+                       printf("%s: Sending trailers is no longer supported\n",
+                               host);
+               }

                argv++;
        }
                argv++;
        }

-       
-       s = socket(AF_INET, SOCK_DGRAM, 0);
-       if (s < 0) {
-               perror("arp: socket");
-               exit(1);
-       }
-       if (ioctl(s, SIOCSARP, (caddr_t)&ar) < 0) {
+tryagain:
+       if (rtmsg(RTM_GET) < 0) {

                perror(host);
                perror(host);

-               exit(1);
+               return (1);

        }
        }

-       close(s);
-       return (0);
+       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) {
+                       printf("set: can only proxy for %s\n", host);
+                       return (1);
+               }
+               if (sin_m.sin_other & SIN_PROXY) {
+                       printf("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) {
+               printf("cannot intuit interface index and type for %s\n", host);
+               return (1);
+       }
+       sdl_m.sdl_type = sdl->sdl_type;
+       sdl_m.sdl_index = sdl->sdl_index;
+       return (rtmsg(RTM_ADD));

 }
 
 /*
 }
 
 /*


@@ -185,17 +255,11 @@ set(argc, argv)
 get(host)
        char *host;
 {
 get(host)
        char *host;
 {

-       struct arpreq ar;

        struct hostent *hp;
        struct hostent *hp;

-       struct sockaddr_in *sin;
+       struct sockaddr_inarp *sin = &sin_m;

        u_char *ea;
        u_char *ea;

-       int s;
-       char *inet_ntoa();

 
 

-       bzero((caddr_t)&ar, sizeof ar);
-       ar.arp_pa.sa_family = AF_INET;
-       sin = (struct sockaddr_in *)&ar.arp_pa;
-       sin->sin_family = AF_INET;
+       sin_m = blank_sin;

        sin->sin_addr.s_addr = inet_addr(host);
        if (sin->sin_addr.s_addr == -1) {
                if (!(hp = gethostbyname(host))) {
        sin->sin_addr.s_addr = inet_addr(host);
        if (sin->sin_addr.s_addr == -1) {
                if (!(hp = gethostbyname(host))) {


@@ -206,151 +270,114 @@ get(host)
                bcopy((char *)hp->h_addr, (char *)&sin->sin_addr,
                    sizeof sin->sin_addr);
        }
                bcopy((char *)hp->h_addr, (char *)&sin->sin_addr,
                    sizeof sin->sin_addr);
        }

-       s = socket(AF_INET, SOCK_DGRAM, 0);
-       if (s < 0) {
-               perror("arp: socket");
-               exit(1);
-       }
-       if (ioctl(s, SIOCGARP, (caddr_t)&ar) < 0) {
-               if (errno == ENXIO)
-                       printf("%s (%s) -- no entry\n",
-                           host, inet_ntoa(sin->sin_addr));
-               else
-                       perror("SIOCGARP");
+       dump(sin->sin_addr.s_addr);
+       if (found_entry == 0) {
+               printf("%s (%s) -- no entry\n",
+                   host, inet_ntoa(sin->sin_addr));

                exit(1);
        }
                exit(1);
        }

-       close(s);
-       ea = (u_char *)ar.arp_ha.sa_data;
-       printf("%s (%s) at ", host, inet_ntoa(sin->sin_addr));
-       if (ar.arp_flags & ATF_COM)
-               ether_print(ea);
-       else
-               printf("(incomplete)");
-       if (ar.arp_flags & ATF_PERM)
-               printf(" permanent");
-       if (ar.arp_flags & ATF_PUBL)
-               printf(" published");
-       if (ar.arp_flags & ATF_USETRAILERS)
-               printf(" trailers");
-       printf("\n");

 }
 
 /*
  * Delete an arp entry 
  */
 }
 
 /*
  * Delete an arp entry 
  */

-delete(host)
+delete(host, info)

        char *host;
        char *host;

+       char *info;

 {
 {

-       struct arpreq ar;

        struct hostent *hp;
        struct hostent *hp;

-       struct sockaddr_in *sin;
-       int s;
+       register struct sockaddr_inarp *sin = &sin_m;
+       register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
+       struct sockaddr_dl *sdl;
+       u_char *ea;
+       char *eaddr;

 
 

-       bzero((caddr_t)&ar, sizeof ar);
-       ar.arp_pa.sa_family = AF_INET;
-       sin = (struct sockaddr_in *)&ar.arp_pa;
-       sin->sin_family = AF_INET;
+       if (info && strncmp(info, "pro", 3) )
+               export_only = 1;
+       getsocket();
+       sin_m = blank_sin;

        sin->sin_addr.s_addr = inet_addr(host);
        if (sin->sin_addr.s_addr == -1) {
                if (!(hp = gethostbyname(host))) {
                        fprintf(stderr, "arp: %s: ", host);
                        herror((char *)NULL);
        sin->sin_addr.s_addr = inet_addr(host);
        if (sin->sin_addr.s_addr == -1) {
                if (!(hp = gethostbyname(host))) {
                        fprintf(stderr, "arp: %s: ", host);
                        herror((char *)NULL);

-                       exit(1);
+                       return (1);

                }
                bcopy((char *)hp->h_addr, (char *)&sin->sin_addr,
                    sizeof sin->sin_addr);
        }
                }
                bcopy((char *)hp->h_addr, (char *)&sin->sin_addr,
                    sizeof sin->sin_addr);
        }

-       s = socket(AF_INET, SOCK_DGRAM, 0);
-       if (s < 0) {
-               perror("arp: socket");
-               exit(1);
+tryagain:
+       if (rtmsg(RTM_GET) < 0) {
+               perror(host);
+               return (1);

        }
        }

-       if (ioctl(s, SIOCDARP, (caddr_t)&ar) < 0) {
-               if (errno == ENXIO)
-                       printf("%s (%s) -- no entry\n",
-                           host, inet_ntoa(sin->sin_addr));
-               else
-                       perror("SIOCDARP");
-               exit(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 delete;
+               }
+       }
+       if (sin_m.sin_other & SIN_PROXY) {
+               fprintf(stderr, "delete: can't locate %s\n",host);
+               return (1);
+       } else {
+               sin_m.sin_other = SIN_PROXY;
+               goto tryagain;
+       }
+delete:
+       if (sdl->sdl_family != AF_LINK) {
+               printf("cannot locate %s\n", host);
+               return (1);

        }
        }

-       close(s);
-       printf("%s (%s) deleted\n", host, inet_ntoa(sin->sin_addr));
+       if (rtmsg(RTM_DELETE) == 0)
+               printf("%s (%s) deleted\n", host, inet_ntoa(sin->sin_addr));

 }
 
 }
 

-struct nlist nl[] = {
-#define        X_ARPTAB        0
-       { "_arptab" },
-#define        X_ARPTAB_SIZE   1
-       { "_arptab_size" },
-#define        N_SYSMAP        2
-       { "_Sysmap" },
-#define        N_SYSSIZE       3
-       { "_Syssize" },
-       { "" },
-};
-
-static struct pte *Sysmap;
-

 /*
  * Dump the entire arp table
  */
 /*
  * Dump the entire arp table
  */

-dump(kernel, mem)
-       char *kernel, *mem;
+dump(addr)
+u_long addr;

 {
 {

+       int mib[6];
+       size_t needed;
+       char *host, *malloc(), *lim, *buf, *next;
+       struct rt_msghdr *rtm;
+       struct sockaddr_inarp *sin;
+       struct sockaddr_dl *sdl;

        extern int h_errno;
        extern int h_errno;

-       struct arptab *at;

        struct hostent *hp;
        struct hostent *hp;

-       int bynumber, mf, arptab_size, sz;
-       char *host, *malloc();
-       off_t lseek();
-
-       if (nlist(kernel, nl) < 0 || nl[X_ARPTAB_SIZE].n_type == 0) {
-               fprintf(stderr, "arp: %s: bad namelist\n", kernel);
-               exit(1);
-       }
-       mf = open(mem, O_RDONLY);
-       if (mf < 0) {
-               fprintf(stderr, "arp: cannot open %s\n", mem);
-               exit(1);
-       }
-       if (kflag) {
-               off_t off;

 
 

-               Sysmap = (struct pte *)
-                  malloc((u_int)(nl[N_SYSSIZE].n_value * sizeof(struct pte)));
-               if (!Sysmap) {
-                       fputs("arp: can't get memory for Sysmap.\n", stderr);
-                       exit(1);
+       mib[0] = CTL_NET;
+       mib[1] = PF_ROUTE;
+       mib[2] = 0;
+       mib[3] = AF_INET;
+       mib[4] = NET_RT_FLAGS;
+       mib[5] = RTF_LLINFO;
+       if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+               quit("route-sysctl-estimate");
+       if ((buf = malloc(needed)) == NULL)
+               quit("malloc");
+       if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+               quit("actual retrieval of routing table");
+       lim = buf + needed;
+       for (next = buf; next < lim; next += rtm->rtm_msglen) {
+               rtm = (struct rt_msghdr *)next;
+               sin = (struct sockaddr_inarp *)(rtm + 1);
+               sdl = (struct sockaddr_dl *)(sin + 1);
+               if (addr) {
+                       if (addr != sin->sin_addr.s_addr)
+                               continue;
+                       found_entry = 1;

                }
                }

-               off = nl[N_SYSMAP].n_value & ~KERNBASE;
-               (void)lseek(mf, off, L_SET);
-               (void)read(mf, (char *)Sysmap,
-                   (int)(nl[N_SYSSIZE].n_value * sizeof(struct pte)));
-       }
-       klseek(mf, (long)nl[X_ARPTAB_SIZE].n_value, L_SET);
-       read(mf, &arptab_size, sizeof arptab_size);
-       if (arptab_size <= 0 || arptab_size > 1000) {
-               fprintf(stderr, "arp: %s: namelist wrong\n", kernel);
-               exit(1);
-       }
-       sz = arptab_size * sizeof (struct arptab);
-       at = (struct arptab *)malloc((u_int)sz);
-       if (at == NULL) {
-               fputs("arp: can't get memory for arptab.\n", stderr);
-               exit(1);
-       }
-       klseek(mf, (long)nl[X_ARPTAB].n_value, L_SET);
-       if (read(mf, (char *)at, sz) != sz) {
-               perror("arp: error reading arptab");
-               exit(1);
-       }
-       close(mf);
-       for (bynumber = 0; arptab_size-- > 0; at++) {
-               if (at->at_iaddr.s_addr == 0 || at->at_flags == 0)
-                       continue;
-               if (bynumber == 0)
-                       hp = gethostbyaddr((caddr_t)&at->at_iaddr,
-                           sizeof at->at_iaddr, AF_INET);
+               if (nflag == 0)
+                       hp = gethostbyaddr((caddr_t)&(sin->sin_addr),
+                           sizeof sin->sin_addr, AF_INET);

                else
                        hp = 0;
                if (hp)
                else
                        hp = 0;
                if (hp)


@@ -358,39 +385,29 @@ dump(kernel, mem)
                else {
                        host = "?";
                        if (h_errno == TRY_AGAIN)
                else {
                        host = "?";
                        if (h_errno == TRY_AGAIN)

-                               bynumber = 1;
+                               nflag = 1;

                }
                }

-               printf("%s (%s) at ", host, inet_ntoa(at->at_iaddr));
-               if (at->at_flags & ATF_COM)
-                       ether_print(at->at_enaddr);
+               printf("%s (%s) at ", host, inet_ntoa(sin->sin_addr));
+               if (sdl->sdl_alen)
+                       ether_print(LLADDR(sdl));

                else
                        printf("(incomplete)");
                else
                        printf("(incomplete)");

-               if (at->at_flags & ATF_PERM)
+               if (rtm->rtm_rmx.rmx_expire == 0)

                        printf(" permanent");
                        printf(" permanent");

-               if (at->at_flags & ATF_PUBL)
-                       printf(" published");
-               if (at->at_flags & ATF_USETRAILERS)
-                       printf(" trailers");
+               if (sin->sin_other & SIN_PROXY)
+                       printf(" published (proxy only)");
+               if (rtm->rtm_addrs & RTA_NETMASK) {
+                       sin = (struct sockaddr_inarp *)
+                               (sdl->sdl_len + (char *)sdl);
+                       if (sin->sin_addr.s_addr == 0xffffffff)
+                               printf(" published");
+                       if (sin->sin_len != 8)
+                               printf("(wierd)");
+               }

                printf("\n");
        }
 }
 
                printf("\n");
        }
 }
 

-/*
- * Seek into the kernel for a value.
- */
-klseek(fd, base, off)
-       int fd, off;
-       off_t base;
-{
-       off_t lseek();
-
-       if (kflag) {    /* get kernel pte */
-               base &= ~KERNBASE;
-               base = ctob(Sysmap[btop(base)].pg_pfnum) + (base & PGOFSET);
-       }
-       (void)lseek(fd, base, off);
-}
-

 ether_print(cp)
        u_char *cp;
 {
 ether_print(cp)
        u_char *cp;
 {


@@ -419,7 +436,79 @@ usage()
        printf("usage: arp hostname\n");
        printf("       arp -a [kernel] [kernel_memory]\n");
        printf("       arp -d hostname\n");
        printf("usage: arp hostname\n");
        printf("       arp -a [kernel] [kernel_memory]\n");
        printf("       arp -d hostname\n");

-       printf("       arp -s hostname ether_addr [temp] [pub] [trail]\n");
+       printf("       arp -s hostname ether_addr [temp] [pub]\n");

        printf("       arp -f filename\n");
        exit(1);
 }
        printf("       arp -f filename\n");
        exit(1);
 }

+
+rtmsg(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;
+       if (cmd == RTM_DELETE)
+               goto doit;
+       bzero((char *)&m_rtmsg, sizeof(m_rtmsg));
+       rtm->rtm_flags = flags;
+       rtm->rtm_version = RTM_VERSION;
+
+       switch (cmd) {
+       default:
+               fprintf(stderr, "arp: internal wrong cmd\n");
+               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;
+doit:
+       l = rtm->rtm_msglen;
+       rtm->rtm_seq = ++seq;
+       rtm->rtm_type = cmd;
+       if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
+               if (errno != ESRCH || cmd != RTM_DELETE) {
+                       perror("writing to routing socket");
+                       return (-1);
+               }
+       }
+       do {
+               l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
+       } while (l > 0 && (rtm->rtm_seq != seq || rtm->rtm_pid != pid));
+       if (l < 0)
+               (void) fprintf(stderr, "arp: read from routing socket: %s\n",
+                   strerror(errno));
+       return (0);
+}
+
+quit(msg)
+char *msg;
+{
+       fprintf(stderr, "%s\n", msg);
+       exit(1);
+}