increase size of refer data structures (from muller@nprdc.arpa (Keith Muller))

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

diff --git a/usr/src/sbin/routed/input.c b/usr/src/sbin/routed/input.c
index 9139141..e60b852 100644 (file)
--- a/usr/src/sbin/routed/input.c
+++ b/usr/src/sbin/routed/input.c
@@ -1,11 +1,18 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)input.c    4.11 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)input.c    5.2 (Berkeley) %G%";
+#endif not lint

 
 /*
  * Routing Table Management Daemon
  */
 #include "defs.h"
 
 /*
  * Routing Table Management Daemon
  */
 #include "defs.h"

+#include <sys/syslog.h>

 
 /*
  * Process a newly received packet.
 
 /*
  * Process a newly received packet.


@@ -14,17 +21,22 @@ rip_input(from, size)
        struct sockaddr *from;
        int size;
 {
        struct sockaddr *from;
        int size;
 {

-       struct rt_entry *rt;
-       struct netinfo *n;
-       struct interface *ifp, *if_ifwithdstaddr();
+       register struct rt_entry *rt;
+       register struct netinfo *n;
+       register struct interface *ifp;
+       struct interface *if_ifwithdstaddr();

        int newsize;
        int newsize;

-       struct afswitch *afp;
+       register struct afswitch *afp;

 
        ifp = 0;
        TRACE_INPUT(ifp, from, size);
 
        ifp = 0;
        TRACE_INPUT(ifp, from, size);

-       if (from->sa_family >= AF_MAX)
+       if (from->sa_family >= af_max ||
+           (afp = &afswitch[from->sa_family])->af_hash == (int (*)())0) {
+               syslog(LOG_INFO,
+        "\"from\" address in unsupported address family (%d), cmd %d\n",
+                   from->sa_family, msg->rip_cmd);

                return;
                return;

-       afp = &afswitch[from->sa_family];
+       }

        switch (msg->rip_cmd) {
 
        case RIPCMD_REQUEST:
        switch (msg->rip_cmd) {
 
        case RIPCMD_REQUEST:


@@ -44,9 +56,13 @@ rip_input(from, size)
                        /* 
                         * A single entry with sa_family == AF_UNSPEC and
                         * metric ``infinity'' means ``all routes''.
                        /* 
                         * A single entry with sa_family == AF_UNSPEC and
                         * metric ``infinity'' means ``all routes''.

+                        * We respond to routers only if we are acting
+                        * as a supplier, or to anyone other than a router
+                        * (eg, query).

                         */
                        if (n->rip_dst.sa_family == AF_UNSPEC &&
                         */
                        if (n->rip_dst.sa_family == AF_UNSPEC &&

-                           n->rip_metric == HOPCNT_INFINITY && size == 0) {
+                           n->rip_metric == HOPCNT_INFINITY && size == 0 &&
+                           (supplier || (*afp->af_portcheck)(from) == 0)) {

                                supply(from, 0, ifp);
                                return;
                        }
                                supply(from, 0, ifp);
                                return;
                        }


@@ -113,16 +129,29 @@ rip_input(from, size)
                                        ntohs(n->rip_dst.sa_family);
                                n->rip_metric = ntohl(n->rip_metric);
                        }
                                        ntohs(n->rip_dst.sa_family);
                                n->rip_metric = ntohl(n->rip_metric);
                        }

-                       if ((unsigned) n->rip_metric >= HOPCNT_INFINITY)
+                       if ((unsigned) n->rip_metric > HOPCNT_INFINITY)

                                continue;
                                continue;

-                       if (n->rip_dst.sa_family >= AF_MAX)
+                       if (n->rip_dst.sa_family >= af_max ||
+                           (afp = &afswitch[n->rip_dst.sa_family])->af_hash ==
+                           (int (*)())0) {
+                               syslog(LOG_INFO,
+               "route in unsupported address family (%d), from %s (af %d)\n",
+                                  n->rip_dst.sa_family,
+                                  (*afswitch[from->sa_family].af_format)(from),
+                                  from->sa_family);

                                continue;
                                continue;

-                       afp = &afswitch[n->rip_dst.sa_family];
-                       if (((*afp->af_checkhost)(&n->rip_dst)) == 0)
+                       }
+                       if (((*afp->af_checkhost)(&n->rip_dst)) == 0) {
+                               syslog(LOG_DEBUG,
+                                   "bad host in route from %s (af %d)\n",
+                                  (*afswitch[from->sa_family].af_format)(from),
+                                  from->sa_family);

                                continue;
                                continue;

+                       }

                        rt = rtlookup(&n->rip_dst);
                        if (rt == 0) {
                        rt = rtlookup(&n->rip_dst);
                        if (rt == 0) {

-                               rtadd(&n->rip_dst, from, n->rip_metric, 0);
+                               if (n->rip_metric < HOPCNT_INFINITY)
+                                   rtadd(&n->rip_dst, from, n->rip_metric, 0);

                                continue;
                        }
 
                                continue;
                        }
 


@@ -131,6 +160,10 @@ rip_input(from, size)
                         * shorter, or getting stale and equivalent.
                         */
                        if (equal(from, &rt->rt_router)) {
                         * shorter, or getting stale and equivalent.
                         */
                        if (equal(from, &rt->rt_router)) {

+                               if (n->rip_metric == HOPCNT_INFINITY) {
+                                       rtdelete(rt);
+                                       continue;
+                               }

                                if (n->rip_metric != rt->rt_metric)
                                        rtchange(rt, from, n->rip_metric);
                                rt->rt_timer = 0;
                                if (n->rip_metric != rt->rt_metric)
                                        rtchange(rt, from, n->rip_metric);
                                rt->rt_timer = 0;