checkpoint of hacking for mail.cs.berkeley.edu

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

diff --git a/usr/src/sbin/XNSrouted/af.c b/usr/src/sbin/XNSrouted/af.c
index c4f7425..3d39bed 100644 (file)
--- a/usr/src/sbin/XNSrouted/af.c
+++ b/usr/src/sbin/XNSrouted/af.c
@@ -1,6 +1,16 @@
+/*
+ * Copyright (c) 1985 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This file includes significant work done at Cornell University by
+ * Bill Nesheim.  That work included by permission.
+ *
+ * %sccs.include.redist.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char rcsid[] = "$Header$";
-#endif
+static char sccsid[] = "@(#)af.c       5.11 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "defs.h"
 
 
 #include "defs.h"
 


@@ -11,7 +21,7 @@ int   null_hash(), null_netmatch(), null_output(),
        null_portmatch(), null_portcheck(),
        null_checkhost(), null_ishost(), null_canon();
 int    xnnet_hash(), xnnet_netmatch(), xnnet_output(),
        null_portmatch(), null_portcheck(),
        null_checkhost(), null_ishost(), null_canon();
 int    xnnet_hash(), xnnet_netmatch(), xnnet_output(),

-       xnnet_portmatch();
+       xnnet_portmatch(),

        xnnet_checkhost(), xnnet_ishost(), xnnet_canon();
 #define NIL \
        { null_hash,            null_netmatch,          null_output, \
        xnnet_checkhost(), xnnet_ishost(), xnnet_canon();
 #define NIL \
        { null_hash,            null_netmatch,          null_output, \


@@ -25,7 +35,10 @@ int  xnnet_hash(), xnnet_netmatch(), xnnet_output(),
 struct afswitch afswitch[AF_MAX] =
        { NIL, NIL, NIL, NIL, NIL, NIL, XNSNET, NIL, NIL, NIL, NIL };
 
 struct afswitch afswitch[AF_MAX] =
        { NIL, NIL, NIL, NIL, NIL, NIL, XNSNET, NIL, NIL, NIL, NIL };
 

-struct sockaddr_ns xnnet_default = { AF_NS };
+struct sockaddr_ns xnnet_default = { sizeof(struct sockaddr_ns), AF_NS };
+
+union ns_net ns_anynet;
+union ns_net ns_zeronet;

 
 xnnet_hash(sns, hp)
        register struct sockaddr_ns *sns;
 
 xnnet_hash(sns, hp)
        register struct sockaddr_ns *sns;


@@ -33,7 +46,10 @@ xnnet_hash(sns, hp)
 {
        register long hash = 0;
        register u_short *s = sns->sns_addr.x_host.s_host;
 {
        register long hash = 0;
        register u_short *s = sns->sns_addr.x_host.s_host;

-       hp->afh_nethash = xnnet(sns->sns_addr.x_net);
+       union ns_net_u net;
+
+       net.net_e = sns->sns_addr.x_net;
+       hp->afh_nethash = net.long_e;

        hash = *s++; hash <<= 8; hash += *s++; hash <<= 8; hash += *s;
        hp->afh_hosthash = hash;
 }
        hash = *s++; hash <<= 8; hash += *s++; hash <<= 8; hash += *s;
        hp->afh_hosthash = hash;
 }


@@ -41,8 +57,7 @@ xnnet_hash(sns, hp)
 xnnet_netmatch(sxn1, sxn2)
        struct sockaddr_ns *sxn1, *sxn2;
 {
 xnnet_netmatch(sxn1, sxn2)
        struct sockaddr_ns *sxn1, *sxn2;
 {

-
-       return (xnnet(sxn1->sns_addr.x_net) == xnnet(sxn2->sns_addr.x_net));
+       return (ns_neteq(sxn1->sns_addr, sxn2->sns_addr));

 }
 
 /*
 }
 
 /*


@@ -76,18 +91,43 @@ xnnet_output(flags, sns, size)
 #ifdef DEBUG
        if(do_output || ntohs(msg->rip_cmd) == RIPCMD_REQUEST)
 #endif 
 #ifdef DEBUG
        if(do_output || ntohs(msg->rip_cmd) == RIPCMD_REQUEST)
 #endif 

-       if (sendto(s, msg, size, flags, sns, sizeof (*sns)) < 0)
-               perror("sendto");
+       /*
+        * Kludge to allow us to get routes out to machines that
+        * don't know their addresses yet; send to that address on
+        * ALL connected nets
+        */
+        if (ns_neteqnn(sns->sns_addr.x_net, ns_zeronet)) {
+               extern  struct interface *ifnet;
+               register struct interface *ifp;
+               
+               for (ifp = ifnet; ifp; ifp = ifp->int_next) {
+                       sns->sns_addr.x_net = 
+                               satons_addr(ifp->int_addr).x_net;
+                       (void) sendto(s, msg, size, flags,
+                           (struct sockaddr *)sns, sizeof (*sns));
+               }
+               return;
+       }
+       
+       (void) sendto(s, msg, size, flags,
+           (struct sockaddr *)sns, sizeof (*sns));

 }
 
 /*
 }
 
 /*

- * Return 1 if the address is believed
- *  -- THIS IS A KLUDGE.
+ * Return 1 if we want this route.
+ * We use this to disallow route net G entries for one for multiple
+ * point to point links.

  */
 xnnet_checkhost(sns)
        struct sockaddr_ns *sns;
 {
  */
 xnnet_checkhost(sns)
        struct sockaddr_ns *sns;
 {

-       return (1);
+       register struct interface *ifp = if_ifwithnet(sns);
+       /*
+        * We want this route if there is no more than one 
+        * point to point interface with this network.
+        */
+       if (ifp == 0 || (ifp->int_flags & IFF_POINTOPOINT)==0) return (1);
+       return (ifp->int_sq.n == ifp->int_sq.p);

 }
 
 /*
 }
 
 /*