subnet routing

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

diff --git a/usr/src/sbin/routed/startup.c b/usr/src/sbin/routed/startup.c
index 406edeb..1747b66 100644 (file)
--- a/usr/src/sbin/routed/startup.c
+++ b/usr/src/sbin/routed/startup.c
@@ -1,11 +1,11 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)startup.c  4.1 %G%";
+static char sccsid[] = "@(#)startup.c  4.4 (Berkeley) %G%";

 #endif
 
 /*
  * Routing Table Management Daemon
  */
 #endif
 
 /*
  * Routing Table Management Daemon
  */

-#include "router.h"
+#include "defs.h"

 #include <net/if.h>
 #include <nlist.h>
 
 #include <net/if.h>
 #include <nlist.h>
 


@@ -18,7 +18,7 @@ int   externalinterfaces = 0;         /* # of remote and local interfaces */
 struct nlist nl[] = {
 #define        N_IFNET         0
        { "_ifnet" },
 struct nlist nl[] = {
 #define        N_IFNET         0
        { "_ifnet" },

-       0,
+       { "" },

 };
 
 /*
 };
 
 /*


@@ -117,7 +117,7 @@ ifinit()
        return;
 bad:
        sleep(60);
        return;
 bad:
        sleep(60);

-       close(kmem), close(s), close(snoroute);
+       close(kmem), close(s);

        execv("/etc/routed", argv0);
        _exit(0177);
 }
        execv("/etc/routed", argv0);
        _exit(0177);
 }


@@ -175,33 +175,17 @@ gwkludge()
        type = buf + (((BUFSIZ - 64) * 2) / 3);
        bzero((char *)&dst, sizeof (dst));
        bzero((char *)&gate, sizeof (gate));
        type = buf + (((BUFSIZ - 64) * 2) / 3);
        bzero((char *)&dst, sizeof (dst));
        bzero((char *)&gate, sizeof (gate));

-       dst.sin_family = gate.sin_family = AF_INET;

        /* format: {net | host} XX gateway XX metric DD [passive]\n */
 #define        readentry(fp) \
        fscanf((fp), "%s %s gateway %s metric %d %s\n", \
                type, dname, gname, &metric, qual)
        for (;;) {
        /* format: {net | host} XX gateway XX metric DD [passive]\n */
 #define        readentry(fp) \
        fscanf((fp), "%s %s gateway %s metric %d %s\n", \
                type, dname, gname, &metric, qual)
        for (;;) {

-               struct hostent *host;
-               struct netent *net;
-

                if (readentry(fp) == EOF)
                        break;
                if (readentry(fp) == EOF)
                        break;

-               if (strcmp(type, "net") == 0) {
-                       net = getnetbyname(dname);
-                       if (net == 0 || net->n_addrtype != AF_INET)
-                               continue;
-                       dst.sin_addr = inet_makeaddr(net->n_net, INADDR_ANY);
-               } else if (strcmp(type, "host") == 0) {
-                       host = gethostbyname(dname);
-                       if (host == 0)
-                               continue;
-                       bcopy(host->h_addr, &dst.sin_addr, host->h_length);
-               } else
+               if (!getnetorhostname(type, dname, &dst))

                        continue;
                        continue;

-               host = gethostbyname(gname);
-               if (host == 0)
+               if (!gethostnameornumber(gname, &gate))

                        continue;
                        continue;

-               bcopy(host->h_addr, &gate.sin_addr, host->h_length);

                ifp = (struct interface *)malloc(sizeof (*ifp));
                bzero((char *)ifp, sizeof (*ifp));
                ifp->int_flags = IFF_REMOTE;
                ifp = (struct interface *)malloc(sizeof (*ifp));
                bzero((char *)ifp, sizeof (*ifp));
                ifp->int_flags = IFF_REMOTE;


@@ -224,3 +208,56 @@ gwkludge()
        }
        fclose(fp);
 }
        }
        fclose(fp);
 }

+
+getnetorhostname(type, name, sin)
+       char *type, *name;
+       struct sockaddr_in *sin;
+{
+
+       if (strcmp(type, "net") == 0) {
+               struct netent *np = getnetbyname(name);
+               int n;
+
+               if (np == 0)
+                       n = inet_network(name);
+               else {
+                       if (np->n_addrtype != AF_INET)
+                               return (0);
+                       n = np->n_net;
+               }
+               sin->sin_family = AF_INET;
+               sin->sin_addr = inet_makeaddr(n, INADDR_ANY);
+               return (1);
+       }
+       if (strcmp(type, "host") == 0) {
+               struct hostent *hp = gethostbyname(name);
+
+               if (hp == 0)
+                       sin->sin_addr.s_addr = inet_addr(name);
+               else {
+                       if (hp->h_addrtype != AF_INET)
+                               return (0);
+                       bcopy(hp->h_addr, &sin->sin_addr, hp->h_length);
+               }
+               sin->sin_family = AF_INET;
+               return (1);
+       }
+       return (0);
+}
+
+gethostnameornumber(name, sin)
+       char *name;
+       struct sockaddr_in *sin;
+{
+       struct hostent *hp;
+
+       hp = gethostbyname(name);
+       if (hp) {
+               bcopy(hp->h_addr, &sin->sin_addr, hp->h_length);
+               sin->sin_family = hp->h_addrtype;
+               return (1);
+       }
+       sin->sin_addr.s_addr = inet_addr(name);
+       sin->sin_family = AF_INET;
+       return (sin->sin_addr.s_addr != -1);
+}