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 a028a0b..3d39bed 100644 (file)
--- a/usr/src/sbin/XNSrouted/af.c
+++ b/usr/src/sbin/XNSrouted/af.c
@@ -1,16 +1,16 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1985 The Regents of the University of California.
+ * All rights reserved.

  *
  *

- * This file include significant work done at Cornell University
- * by Bill Nesheim.  That work included by permission.
+ * 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 sccsid[] = "@(#)af.c       5.5 (Berkeley) %G%";
-#endif not lint
-
+static char sccsid[] = "@(#)af.c       5.11 (Berkeley) %G%";
+#endif /* not lint */

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


@@ -21,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, \


@@ -35,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;


@@ -43,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;
 }


@@ -51,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));

 }
 
 /*
 }
 
 /*


@@ -91,21 +96,21 @@ xnnet_output(flags, sns, size)
         * don't know their addresses yet; send to that address on
         * ALL connected nets
         */
         * don't know their addresses yet; send to that address on
         * ALL connected nets
         */

-        if (ns_netof(sns->sns_addr) == 0L) {
+        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) {
                extern  struct interface *ifnet;
                register struct interface *ifp;
                
                for (ifp = ifnet; ifp; ifp = ifp->int_next) {

-                       ns_netof(sns->sns_addr) = 
-                               ns_netof(((struct sockaddr_ns *)&ifp->int_addr)->sns_addr);
-                       if (sendto(s, msg, size, flags, sns, sizeof (*sns)) < 0)
-                               syslog(LOG_ERR,"sendto: %m");
+                       sns->sns_addr.x_net = 
+                               satons_addr(ifp->int_addr).x_net;
+                       (void) sendto(s, msg, size, flags,
+                           (struct sockaddr *)sns, sizeof (*sns));

                }
                return;
        }
        
                }
                return;
        }
        

-       if (sendto(s, msg, size, flags, sns, sizeof (*sns)) < 0)
-               syslog(LOG_ERR,"sendto: %m");
+       (void) sendto(s, msg, size, flags,
+           (struct sockaddr *)sns, sizeof (*sns));

 }
 
 /*
 }
 
 /*