delay deletion from internal tables when cur router deletes

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

diff --git a/usr/src/sbin/routed/output.c b/usr/src/sbin/routed/output.c
index 1a83fb4..3928140 100644 (file)
--- a/usr/src/sbin/routed/output.c
+++ b/usr/src/sbin/routed/output.c
@@ -1,6 +1,12 @@
+/*
+ * 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[] = "@(#)output.c   4.4 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)output.c   5.3 (Berkeley) %G%";
+#endif not lint

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


@@ -62,12 +68,33 @@ supply(dst, flags, ifp)
        struct rthash *base = hosthash;
        int doinghost = 1, size;
        int (*output)() = afswitch[dst->sa_family].af_output;
        struct rthash *base = hosthash;
        int doinghost = 1, size;
        int (*output)() = afswitch[dst->sa_family].af_output;

+       int (*sendsubnet)() = afswitch[dst->sa_family].af_sendsubnet;

 
        msg->rip_cmd = RIPCMD_RESPONSE;
        msg->rip_vers = RIPVERSION;
 again:
        for (rh = base; rh < &base[ROUTEHASHSIZ]; rh++)
        for (rt = rh->rt_forw; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {
 
        msg->rip_cmd = RIPCMD_RESPONSE;
        msg->rip_vers = RIPVERSION;
 again:
        for (rh = base; rh < &base[ROUTEHASHSIZ]; rh++)
        for (rt = rh->rt_forw; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {

+               /*
+                * Don't resend the information
+                * on the network from which it was received.
+                */
+               if (ifp && rt->rt_ifp == ifp)
+                       continue;
+               if (rt->rt_state & RTS_EXTERNAL)
+                       continue;
+               /*
+                * Limit the spread of subnet information
+                * to those who are interested.
+                */
+               if (doinghost == 0 && rt->rt_state & RTS_SUBNET) {
+                       if (ifp && (ifp->int_flags & IFF_SUBNET) == 0)
+                               continue;
+                       if (rt->rt_dst.sa_family != dst->sa_family)
+                               continue;
+                       if ((*sendsubnet)(rt, dst) == 0)
+                               continue;
+               }

                size = (char *)n - packet;
                if (size > MAXPACKETSIZE - sizeof (struct netinfo)) {
                        (*output)(s, flags, dst, size);
                size = (char *)n - packet;
                if (size > MAXPACKETSIZE - sizeof (struct netinfo)) {
                        (*output)(s, flags, dst, size);