SILENT->HIDDEN (more mnemonic?)

SCCS-vsn: sbin/routed/routed.c 4.10
SCCS-vsn: sbin/routed/defs.h 4.4

diff --git a/usr/src/sbin/routed/defs.h b/usr/src/sbin/routed/defs.h
index a4915a4..ad5c95c 100644 (file)
--- a/usr/src/sbin/routed/defs.h
+++ b/usr/src/sbin/routed/defs.h
@@ -1,4 +1,4 @@
-/*     defs.h  4.3     82/05/26        */
+/*     defs.h  4.4     82/05/31        */

 
 /*
  * Internal data structure definitions for
 
 /*
  * Internal data structure definitions for


@@ -57,7 +57,7 @@ struct rt_entry {
 #define        RTS_DELRT       0x1             /* delete pending */
 #define        RTS_CHGRT       0x2             /* change command pending */
 #define        RTS_ADDRT       0x4             /* add command pending */
 #define        RTS_DELRT       0x1             /* delete pending */
 #define        RTS_CHGRT       0x2             /* change command pending */
 #define        RTS_ADDRT       0x4             /* add command pending */

-#define        RTS_SILENT      0x8             /* don't send to router */
+#define        RTS_HIDDEN      0x8             /* don't send to router */

 
 struct rthash nethash[ROUTEHASHSIZ], hosthash[ROUTEHASHSIZ];
 struct rt_entry *rtlookup();
 
 struct rthash nethash[ROUTEHASHSIZ], hosthash[ROUTEHASHSIZ];
 struct rt_entry *rtlookup();

diff --git a/usr/src/sbin/routed/routed.c b/usr/src/sbin/routed/routed.c
index a812278..52b9c82 100644 (file)
--- a/usr/src/sbin/routed/routed.c
+++ b/usr/src/sbin/routed/routed.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)routed.c   4.9 %G%";
+static char sccsid[] = "@(#)routed.c   4.10 %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -140,7 +140,7 @@ getothers()
                rtadd((struct sockaddr *)&dst, (struct sockaddr *)&gate, 1);
                rt = rtlookup((struct sockaddr *)&dst);
                if (rt)
                rtadd((struct sockaddr *)&dst, (struct sockaddr *)&gate, 1);
                rt = rtlookup((struct sockaddr *)&dst);
                if (rt)

-                       rt->rt_state |= RTS_SILENT;
+                       rt->rt_state |= RTS_HIDDEN;

        }
        fclose(fp);
 }
        }
        fclose(fp);
 }


@@ -172,11 +172,11 @@ again:
 
                        /*
                         * If the host is indicated to be
 
                        /*
                         * If the host is indicated to be

-                        * "silent" (i.e. it's one we got
+                        * "hidden" (i.e. it's one we got

                         * from the initialization file),
                         * don't time out it's entry.
                         */
                         * from the initialization file),
                         * don't time out it's entry.
                         */

-                       if ((rt->rt_state & RTS_SILENT) == 0)
+                       if ((rt->rt_state & RTS_HIDDEN) == 0)

                                rt->rt_timer += TIMER_RATE;
                        log("", rt);
 
                                rt->rt_timer += TIMER_RATE;
                        log("", rt);
 


@@ -396,7 +396,7 @@ sendall()
 again:
        for (rh = base; rh < &base[ROUTEHASHSIZ]; rh++)
        for (rt = rh->rt_forw; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {
 again:
        for (rh = base; rh < &base[ROUTEHASHSIZ]; rh++)
        for (rt = rh->rt_forw; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {

-               if ((rt->rt_state & RTS_SILENT) || rt->rt_metric > 0)
+               if ((rt->rt_state & RTS_HIDDEN) || rt->rt_metric > 0)

                        continue;
                if (rt->rt_ifp && (rt->rt_ifp->if_flags & IFF_BROADCAST))
                        dst = &rt->rt_ifp->if_broadaddr;
                        continue;
                if (rt->rt_ifp && (rt->rt_ifp->if_flags & IFF_BROADCAST))
                        dst = &rt->rt_ifp->if_broadaddr;


@@ -426,7 +426,7 @@ supplyall()
 again:
        for (rh = base; rh < &base[ROUTEHASHSIZ]; rh++)
        for (rt = rh->rt_forw; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {
 again:
        for (rh = base; rh < &base[ROUTEHASHSIZ]; rh++)
        for (rt = rh->rt_forw; rt != (struct rt_entry *)rh; rt = rt->rt_forw) {

-               if ((rt->rt_state & RTS_SILENT) || rt->rt_metric > 0)
+               if ((rt->rt_state & RTS_HIDDEN) || rt->rt_metric > 0)

                        continue;
                if (rt->rt_ifp && (rt->rt_ifp->if_flags & IFF_BROADCAST))
                        dst = &rt->rt_ifp->if_broadaddr;
                        continue;
                if (rt->rt_ifp && (rt->rt_ifp->if_flags & IFF_BROADCAST))
                        dst = &rt->rt_ifp->if_broadaddr;


@@ -790,7 +790,7 @@ log(operation, rt)
        }, statebits[] = {
                { RTS_DELRT,    "DELETE" },
                { RTS_CHGRT,    "CHANGE" },
        }, statebits[] = {
                { RTS_DELRT,    "DELETE" },
                { RTS_CHGRT,    "CHANGE" },

-               { RTS_SILENT,   "SILENT" },
+               { RTS_HIDDEN,   "HIDDEN" },

                { 0 }
        };
        register struct bits *p;
                { 0 }
        };
        register struct bits *p;