BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / XNSrouted / startup.c

diff --git a/usr/src/sbin/XNSrouted/startup.c b/usr/src/sbin/XNSrouted/startup.c
index ff31a1b..8887c1f 100644 (file)
--- a/usr/src/sbin/XNSrouted/startup.c
+++ b/usr/src/sbin/XNSrouted/startup.c
@@ -1,16 +1,42 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1985 The Regents of the University of California.
+ * All rights reserved.

  *
  *

- * Includes material written at Cornell University by Bill Nesheim,
- * by permission of the author.
+ * This file includes significant work done at Cornell University by
+ * Bill Nesheim.  That work included by permission.
+ *
+ * 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

-static char sccsid[] = "@(#)startup.c  5.5 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)startup.c  5.11 (Berkeley) 2/26/91";
+#endif /* not lint */

 
 /*
  * Routing Table Management Daemon
 
 /*
  * Routing Table Management Daemon


@@ -19,7 +45,7 @@ static char sccsid[] = "@(#)startup.c 5.5 (Berkeley) %G%";
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <nlist.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <nlist.h>

-#include <syslog.h>
+#include <stdlib.h>

 
 struct interface *ifnet;
 int    lookforinterfaces = 1;
 
 struct interface *ifnet;
 int    lookforinterfaces = 1;


@@ -38,9 +64,9 @@ char ether_broadcast_addr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 ifinit()
 {
        struct interface ifs, *ifp;
 ifinit()
 {
        struct interface ifs, *ifp;

-       int s, n;
+       int s;

         struct ifconf ifc;
         struct ifconf ifc;

-       char buf[(sizeof (struct ifreq ) * 20)];
+       char buf[BUFSIZ], *cp, *cplim;

         struct ifreq ifreq, *ifr;
        u_long i;
 
         struct ifreq ifreq, *ifr;
        u_long i;
 


@@ -53,11 +79,20 @@ ifinit()
         if (ioctl(s, SIOCGIFCONF, (char *)&ifc) < 0) {
                 syslog(LOG_ERR, "ioctl (get interface configuration)");
                close(s);
         if (ioctl(s, SIOCGIFCONF, (char *)&ifc) < 0) {
                 syslog(LOG_ERR, "ioctl (get interface configuration)");
                close(s);

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

         }
         ifr = ifc.ifc_req;
        lookforinterfaces = 0;
         }
         ifr = ifc.ifc_req;
        lookforinterfaces = 0;

-        for (n = ifc.ifc_len / sizeof (struct ifreq); n > 0; n--, ifr++) {
+#ifdef RTM_ADD
+#define max(a, b) (a > b ? a : b)
+#define size(p)        max((p).sa_len, sizeof(p))
+#else
+#define size(p) (sizeof (p))
+#endif
+       cplim = buf + ifc.ifc_len; /*skip over if's with big ifr_addr's */
+       for (cp = buf; cp < cplim;
+                       cp += sizeof (ifr->ifr_name) + size(ifr->ifr_addr)) {
+               ifr = (struct ifreq *)cp;

                bzero((char *)&ifs, sizeof(ifs));
                ifs.int_addr = ifr->ifr_addr;
                ifreq = *ifr;
                bzero((char *)&ifs, sizeof(ifs));
                ifs.int_addr = ifr->ifr_addr;
                ifreq = *ifr;


@@ -126,7 +161,7 @@ ifinit()
                ifp->int_name = malloc(strlen(ifr->ifr_name) + 1);
                if (ifp->int_name == 0) {
                        syslog(LOG_ERR,"XNSrouted: out of memory\n");
                ifp->int_name = malloc(strlen(ifr->ifr_name) + 1);
                if (ifp->int_name == 0) {
                        syslog(LOG_ERR,"XNSrouted: out of memory\n");

-                       goto bad;               /* ??? */
+                       exit(1);

                }
                strcpy(ifp->int_name, ifr->ifr_name);
                ifp->int_metric = 0;
                }
                strcpy(ifp->int_name, ifr->ifr_name);
                ifp->int_metric = 0;


@@ -138,13 +173,6 @@ ifinit()
        if (externalinterfaces > 1 && supplier < 0)
                supplier = 1;
        close(s);
        if (externalinterfaces > 1 && supplier < 0)
                supplier = 1;
        close(s);

-       return;
-bad:
-       sleep(60);
-       close(s);
-       sleep(60);
-       execv("/etc/XNSrouted", argv0);
-       _exit(0177);

 }
 
 addrouteforif(ifp)
 }
 
 addrouteforif(ifp)