don't send net route to subnet gw's unless on subnet 0;

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

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

 /*
  * Temporarily, copy these routines from the kernel,
  * as we need to know about subnets.
 /*
  * Temporarily, copy these routines from the kernel,
  * as we need to know about subnets.


@@ -93,3 +100,79 @@ inet_lnaof(in)
                        return (host &~ ifp->int_subnetmask);
        return (host);
 }
                        return (host &~ ifp->int_subnetmask);
        return (host);
 }

+
+/*
+ * Return RTF_HOST if the address is
+ * for an Internet host, RTF_SUBNET for a subnet,
+ * 0 for a network.
+ */
+inet_rtflags(sin)
+       struct sockaddr_in *sin;
+{
+       register u_long i = ntohl(sin->sin_addr.s_addr);
+       register u_long net, host;
+       register struct interface *ifp;
+
+       if (IN_CLASSA(i)) {
+               net = i & IN_CLASSA_NET;
+               host = i & IN_CLASSA_HOST;
+       } else if (IN_CLASSB(i)) {
+               net = i & IN_CLASSB_NET;
+               host = i & IN_CLASSB_HOST;
+       } else {
+               net = i & IN_CLASSC_NET;
+               host = i & IN_CLASSC_HOST;
+       }
+
+       if (host == 0)
+               return (0);     /* network */
+       /*
+        * Check whether this network is subnetted;
+        * if so, check whether this is a subnet or a host.
+        */
+       for (ifp = ifnet; ifp; ifp = ifp->int_next)
+               if (net == ifp->int_net) {
+                       if ((host &~ ifp->int_subnetmask) == 0)
+                               return (RTF_SUBNET);
+                       else
+                               return (RTF_HOST);
+               }
+       return (RTF_HOST);
+}
+
+/*
+ * Return true if a route to subnet rtsin should be sent to dst.
+ * Send it only if dst is on the same logical network,
+ * or the route turns out to be for the net (aka subnet 0).
+ */
+inet_sendsubnet(rt, dst)
+       struct rt_entry *rt;
+       struct sockaddr_in *dst;
+{
+       register u_long r =
+           ntohl(((struct sockaddr_in *)&rt->rt_dst)->sin_addr.s_addr);
+       register u_long d = ntohl(dst->sin_addr.s_addr);
+
+       if (IN_CLASSA(r)) {
+               if ((r & IN_CLASSA_NET) == (d & IN_CLASSA_NET)) {
+                       if ((r & IN_CLASSA_HOST) == 0)
+                               return ((rt->rt_state & RTS_INTERNAL) == 0);
+                       return (1);
+               }
+               return ((r & IN_CLASSA_HOST) == 0);
+       } else if (IN_CLASSB(r)) {
+               if ((r & IN_CLASSB_NET) == (d & IN_CLASSB_NET)) {
+                       if ((r & IN_CLASSB_HOST) == 0)
+                               return ((rt->rt_state & RTS_INTERNAL) == 0);
+                       return (1);
+               }
+               return ((r & IN_CLASSB_HOST) == 0);
+       } else {
+               if ((r & IN_CLASSC_NET) == (d & IN_CLASSC_NET)) {
+                       if ((r & IN_CLASSC_HOST) == 0)
+                               return ((rt->rt_state & RTS_INTERNAL) == 0);
+                       return (1);
+               }
+               return ((r & IN_CLASSC_HOST) == 0);
+       }
+}