BSD 4_3_Reno release

[unix-history] / usr / src / sys / net / route.c

diff --git a/usr/src/sys/net/route.c b/usr/src/sys/net/route.c
index 9a79206..676a6e6 100644 (file)
--- a/usr/src/sys/net/route.c
+++ b/usr/src/sys/net/route.c
@@ -1,21 +1,64 @@
-/*     route.c 6.6     84/08/28        */
-
+/*
+ * Copyright (c) 1980, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  Neither the name of the University nor the names of
+ * its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)route.c     7.17 (Berkeley) 6/28/90
+ */
+#include "machine/reg.h"
+ 

 #include "param.h"
 #include "systm.h"
 #include "param.h"
 #include "systm.h"

+#include "user.h"
+#include "proc.h"

 #include "mbuf.h"
 #include "mbuf.h"

-#include "protosw.h"

 #include "socket.h"
 #include "socket.h"

-#include "dir.h"
-#include "user.h"
-#include "ioctl.h"
+#include "socketvar.h"
+#include "domain.h"
+#include "protosw.h"

 #include "errno.h"
 #include "errno.h"

+#include "ioctl.h"

 
 #include "if.h"
 #include "af.h"
 #include "route.h"
 
 #include "if.h"
 #include "af.h"
 #include "route.h"

+#include "raw_cb.h"
+#include "../netinet/in.h"
+#include "../netinet/in_var.h"
+
+#include "../netns/ns.h"
+#include "machine/mtpr.h"
+#include "netisr.h"
+#define        SA(p) ((struct sockaddr *)(p))

 
 int    rttrash;                /* routes not in table but not freed */
 struct sockaddr wildcard;      /* zero valued cookie for wildcard searches */
 
 int    rttrash;                /* routes not in table but not freed */
 struct sockaddr wildcard;      /* zero valued cookie for wildcard searches */

+int    rthashsize = RTHASHSIZ; /* for netstat, etc. */
+
+static int rtinits_done = 0;
+struct radix_node_head *ns_rnhead, *in_rnhead;
+struct radix_node *rn_match(), *rn_delete(), *rn_addroute();
+rtinitheads()
+{
+       if (rtinits_done == 0 &&
+           rn_inithead(&ns_rnhead, 16, AF_NS) &&
+           rn_inithead(&in_rnhead, 32, AF_INET))
+               rtinits_done = 1;
+}

 
 /*
  * Packet routing routines.
 
 /*
  * Packet routing routines.


@@ -23,76 +66,55 @@ struct      sockaddr wildcard;      /* zero valued cookie for wildcard searches */
 rtalloc(ro)
        register struct route *ro;
 {
 rtalloc(ro)
        register struct route *ro;
 {

-       register struct rtentry *rt;
-       register struct mbuf *m;
-       register u_long hash;
-       struct sockaddr *dst = &ro->ro_dst;
-       int (*match)(), doinghost;
-       struct afhash h;
-       u_int af = dst->sa_family;
-       struct rtentry *rtmin;
-       struct mbuf **table;
-

        if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
                return;                          /* XXX */
        if (ro->ro_rt && ro->ro_rt->rt_ifp && (ro->ro_rt->rt_flags & RTF_UP))
                return;                          /* XXX */

-       if (af >= AF_MAX)
-               return;
-       (*afswitch[af].af_hash)(dst, &h);
-       rtmin = 0;
-       match = afswitch[af].af_netmatch;
-       hash = h.afh_hosthash, table = rthost, doinghost = 1;
-again:
-       for (m = table[RTHASHMOD(hash)]; m; m = m->m_next) {
-               rt = mtod(m, struct rtentry *);
-               if (rt->rt_hash != hash)
-                       continue;
-               if ((rt->rt_flags & RTF_UP) == 0 ||
-                   (rt->rt_ifp->if_flags & IFF_UP) == 0)
-                       continue;
-               if (doinghost) {
-                       if (bcmp((caddr_t)&rt->rt_dst, (caddr_t)dst,
-                           sizeof (*dst)))
-                               continue;
-               } else {
-                       if (rt->rt_dst.sa_family != af ||
-                           !(*match)(&rt->rt_dst, dst))
-                               continue;
-               }
-               if (rtmin == 0 || rt->rt_use < rtmin->rt_use)
-                       rtmin = rt;
-       }
-       if (rtmin == 0 && doinghost) {
-               doinghost = 0;
-               hash = h.afh_nethash, table = rtnet;
-               goto again;
-       }
-       /*
-        * Check for wildcard gateway, by convention network 0.
-        */
-       if (rtmin == 0 && dst != &wildcard) {
-               dst = &wildcard, hash = 0;
-               goto again;
-       }
-       ro->ro_rt = rtmin;
-       if (rtmin == 0) {
+       ro->ro_rt = rtalloc1(&ro->ro_dst, 1);
+}
+
+struct rtentry *
+rtalloc1(dst, report)
+       register struct sockaddr *dst;
+       int  report;
+{
+       register struct radix_node_head *rnh;
+       register struct rtentry *rt;
+       register struct radix_node *rn;
+       struct rtentry *newrt = 0;
+       int  s = splnet(), err = 0;
+
+       for (rnh = radix_node_head; rnh && (dst->sa_family != rnh->rnh_af); )
+               rnh = rnh->rnh_next;
+       if (rnh && rnh->rnh_treetop &&
+           (rn = rn_match((caddr_t)dst, rnh->rnh_treetop)) &&
+           ((rn->rn_flags & RNF_ROOT) == 0)) {
+               newrt = rt = (struct rtentry *)rn;
+               if (report && (rt->rt_flags & RTF_CLONING)) {
+                       if (err = rtrequest(RTM_RESOLVE, dst, SA(0),
+                                             SA(0), 0, &newrt))
+                               goto miss;
+               } else
+                       rt->rt_refcnt++;
+       } else {

                rtstat.rts_unreach++;
                rtstat.rts_unreach++;

-               return;
+       miss:   if (report)
+                       rt_missmsg(RTM_MISS, dst, SA(0), SA(0), SA(0), 0, err);

        }
        }

-       rtmin->rt_refcnt++;
-       if (dst == &wildcard)
-               rtstat.rts_wildcard++;
+       splx(s);
+       return (newrt);

 }
 
 rtfree(rt)
        register struct rtentry *rt;
 {
 }
 
 rtfree(rt)
        register struct rtentry *rt;
 {

-
+       register struct ifaddr *ifa;

        if (rt == 0)
                panic("rtfree");
        rt->rt_refcnt--;
        if (rt == 0)
                panic("rtfree");
        rt->rt_refcnt--;

-       if (rt->rt_refcnt == 0 && (rt->rt_flags&RTF_UP) == 0) {
+       if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_UP) == 0) {

                rttrash--;
                rttrash--;

-               (void) m_free(dtom(rt));
+               if (rt->rt_nodes->rn_flags & (RNF_ACTIVE | RNF_ROOT))
+                       panic ("rtfree 2");
+               free((caddr_t)rt, M_RTABLE);

        }
 }
 
        }
 }
 


@@ -102,45 +124,45 @@ rtfree(rt)
  * Normally called as a result of a routing redirect
  * message from the network layer.
  *
  * Normally called as a result of a routing redirect
  * message from the network layer.
  *

- * N.B.: must be called at splnet or higher
+ * N.B.: must be called at splnet

  *
  *

- * Should notify all parties with a reference to
- * the route that it's changed (so, for instance,
- * current round trip time estimates could be flushed),
- * but we have no back pointers at the moment.

  */
  */

-rtredirect(dst, gateway, flags)
-       struct sockaddr *dst, *gateway;
+rtredirect(dst, gateway, netmask, flags, src, rtp)
+       struct sockaddr *dst, *gateway, *netmask, *src;

        int flags;
        int flags;

+       struct rtentry **rtp;

 {
 {

-       struct route ro;

        register struct rtentry *rt;
        register struct rtentry *rt;

+       int error = 0;
+       short *stat = 0;

 
        /* verify the gateway is directly reachable */
 
        /* verify the gateway is directly reachable */

-       if (if_ifwithnet(gateway) == 0) {
-               rtstat.rts_badredirect++;
-               return;
+       if (ifa_ifwithnet(gateway) == 0) {
+               error = ENETUNREACH;
+               goto done;

        }
        }

-       ro.ro_dst = *dst;
-       ro.ro_rt = 0;
-       rtalloc(&ro);
-       rt = ro.ro_rt;
+       rt = rtalloc1(dst, 0);
+       /*
+        * If the redirect isn't from our current router for this dst,
+        * it's either old or wrong.  If it redirects us to ourselves,
+        * we have a routing loop, perhaps as a result of an interface
+        * going down recently.
+        */
+#define        equal(a1, a2) (bcmp((caddr_t)(a1), (caddr_t)(a2), (a1)->sa_len) == 0)
+       if (!(flags & RTF_DONE) && rt && !equal(src, rt->rt_gateway))
+               error = EINVAL;
+       else if (ifa_ifwithaddr(gateway))
+               error = EHOSTUNREACH;
+       if (error)
+               goto done;

        /*
         * Create a new entry if we just got back a wildcard entry
         * or the the lookup failed.  This is necessary for hosts
         * which use routing redirects generated by smart gateways
         * to dynamically build the routing tables.
         */
        /*
         * Create a new entry if we just got back a wildcard entry
         * or the the lookup failed.  This is necessary for hosts
         * which use routing redirects generated by smart gateways
         * to dynamically build the routing tables.
         */

-       if (rt &&
-           (*afswitch[dst->sa_family].af_netmatch)(&wildcard, &rt->rt_dst)) {
-               rtfree(rt);
-               rt = 0;
-       }
-       if (rt == 0) {
-               rtinit(dst, gateway, (flags & RTF_HOST) | RTF_GATEWAY);
-               rtstat.rts_dynamic++;
-               return;
-       }
+       if ((rt == 0) || (rt_mask(rt) && rt_mask(rt)->sa_len < 2))
+               goto create;

        /*
         * Don't listen to the redirect if it's
         * for a route to an interface. 
        /*
         * Don't listen to the redirect if it's
         * for a route to an interface. 


@@ -151,131 +173,232 @@ rtredirect(dst, gateway, flags)
                         * Changing from route to net => route to host.
                         * Create new route, rather than smashing route to net.
                         */
                         * Changing from route to net => route to host.
                         * Create new route, rather than smashing route to net.
                         */

-                       rtfree(rt);
-                       rtinit(dst, gateway, flags);
+               create:
+                       flags |=  RTF_GATEWAY | RTF_DYNAMIC;
+                       error = rtrequest((int)RTM_ADD, dst, gateway,
+                                   SA(0), flags,
+                                   (struct rtentry **)0);
+                       stat = &rtstat.rts_dynamic;

                } else {
                        /*
                         * Smash the current notion of the gateway to
                } else {
                        /*
                         * Smash the current notion of the gateway to

-                        * this destination.  This is probably not right,
-                        * as it's conceivable a flurry of redirects could
-                        * cause the gateway value to fluctuate wildly during
-                        * dynamic routing reconfiguration.
+                        * this destination.  Should check about netmask!!!

                         */
                         */

-                       rt->rt_gateway = *gateway;
-                       rtfree(rt);
+                       if (gateway->sa_len <= rt->rt_gateway->sa_len) {
+                               Bcopy(gateway, rt->rt_gateway, gateway->sa_len);
+                               rt->rt_flags |= RTF_MODIFIED;
+                               flags |= RTF_MODIFIED;
+                               stat = &rtstat.rts_newgateway;
+                       } else
+                               error = ENOSPC;

                }
                }

-               rtstat.rts_newgateway++;
+       } else
+               error = EHOSTUNREACH;
+done:
+       if (rt) {
+               if (rtp && !error)
+                       *rtp = rt;
+               else
+                       rtfree(rt);

        }
        }

+       if (error)
+               rtstat.rts_badredirect++;
+       else
+               (stat && (*stat)++);
+       rt_missmsg(RTM_REDIRECT, dst, gateway, netmask, src, flags, error);

 }
 
 /*
 }
 
 /*

- * Routing table ioctl interface.
- */
-rtioctl(cmd, data)
-       int cmd;
+* Routing table ioctl interface.
+*/
+rtioctl(req, data)
+       int req;

        caddr_t data;
 {
        caddr_t data;
 {

+#ifndef COMPAT_43
+       return (EOPNOTSUPP);
+#else
+       register struct ortentry *entry = (struct ortentry *)data;
+       int error;
+       struct sockaddr *netmask = 0;

 
 

-       if (cmd != SIOCADDRT && cmd != SIOCDELRT)
+       if (req == SIOCADDRT)
+               req = RTM_ADD;
+       else if (req == SIOCDELRT)
+               req = RTM_DELETE;
+       else

                return (EINVAL);
                return (EINVAL);

-       if (!suser())
-               return (u.u_error);
-       return (rtrequest(cmd, (struct rtentry *)data));
+
+       if (error = suser(u.u_cred, &u.u_acflag))
+               return (error);
+#if BYTE_ORDER != BIG_ENDIAN
+       if (entry->rt_dst.sa_family == 0 && entry->rt_dst.sa_len < 16) {
+               entry->rt_dst.sa_family = entry->rt_dst.sa_len;
+               entry->rt_dst.sa_len = 16;
+       }
+       if (entry->rt_gateway.sa_family == 0 && entry->rt_gateway.sa_len < 16) {
+               entry->rt_gateway.sa_family = entry->rt_gateway.sa_len;
+               entry->rt_gateway.sa_len = 16;
+       }
+#else
+       if (entry->rt_dst.sa_len == 0)
+               entry->rt_dst.sa_len = 16;
+       if (entry->rt_gateway.sa_len == 0)
+               entry->rt_gateway.sa_len = 16;
+#endif
+       if ((entry->rt_flags & RTF_HOST) == 0)
+               switch (entry->rt_dst.sa_family) {
+#ifdef INET
+               case AF_INET:
+                       {
+                               extern struct sockaddr_in icmpmask;
+                               struct sockaddr_in *dst_in = 
+                                       (struct sockaddr_in *)&entry->rt_dst;
+
+                               in_sockmaskof(dst_in->sin_addr, &icmpmask);
+                               netmask = (struct sockaddr *)&icmpmask;
+                       }
+                       break;
+#endif
+#ifdef NS
+               case AF_NS:
+                       {
+                               extern struct sockaddr_ns ns_netmask;
+                               netmask = (struct sockaddr *)&ns_netmask;
+                       }
+#endif
+               }
+       error =  rtrequest(req, &(entry->rt_dst), &(entry->rt_gateway), netmask,
+                               entry->rt_flags, (struct rtentry **)0);
+       rt_missmsg((req == RTM_ADD ? RTM_OLDADD : RTM_OLDDEL),
+                  &(entry->rt_dst), &(entry->rt_gateway),
+                  netmask, SA(0), entry->rt_flags, error);
+       return (error);
+#endif

 }
 
 }
 

-/*
- * Carry out a request to change the routing table.  Called by
- * interfaces at boot time to make their ``local routes'' known,
- * for ioctl's, and as the result of routing redirects.
- */
-rtrequest(req, entry)
-       int req;
-       register struct rtentry *entry;
+struct ifaddr *
+ifa_ifwithroute(flags, dst, gateway)
+int    flags;
+struct sockaddr        *dst, *gateway;

 {
 {

-       register struct mbuf *m, **mprev;
-       register struct rtentry *rt;
-       struct afhash h;
-       int s, error = 0, (*match)();
-       u_int af;
-       u_long hash;
-       struct ifnet *ifp;
-
-       af = entry->rt_dst.sa_family;
-       if (af >= AF_MAX)
-               return (EAFNOSUPPORT);
-       (*afswitch[af].af_hash)(&entry->rt_dst, &h);
-       if (entry->rt_flags & RTF_HOST) {
-               hash = h.afh_hosthash;
-               mprev = &rthost[RTHASHMOD(hash)];
+       struct ifaddr *ifa;
+       if ((flags & RTF_GATEWAY) == 0) {
+               /*
+                * If we are adding a route to an interface,
+                * and the interface is a pt to pt link
+                * we should search for the destination
+                * as our clue to the interface.  Otherwise
+                * we can use the local address.
+                */
+               ifa = 0;
+               if (flags & RTF_HOST) 
+                       ifa = ifa_ifwithdstaddr(dst);
+               if (ifa == 0)
+                       ifa = ifa_ifwithaddr(gateway);

        } else {
        } else {

-               hash = h.afh_nethash;
-               mprev = &rtnet[RTHASHMOD(hash)];
-       }
-       match = afswitch[af].af_netmatch;
-       s = splimp();
-       for (; m = *mprev; mprev = &m->m_next) {
-               rt = mtod(m, struct rtentry *);
-               if (rt->rt_hash != hash)
-                       continue;
-               if (entry->rt_flags & RTF_HOST) {
-#define        equal(a1, a2) \
-       (bcmp((caddr_t)(a1), (caddr_t)(a2), sizeof (struct sockaddr)) == 0)
-                       if (!equal(&rt->rt_dst, &entry->rt_dst))
-                               continue;
-               } else {
-                       if (rt->rt_dst.sa_family != entry->rt_dst.sa_family ||
-                           (*match)(&rt->rt_dst, &entry->rt_dst) == 0)
-                               continue;
-               }
-               if (equal(&rt->rt_gateway, &entry->rt_gateway))
-                       break;
+               /*
+                * If we are adding a route to a remote net
+                * or host, the gateway may still be on the
+                * other end of a pt to pt link.
+                */
+               ifa = ifa_ifwithdstaddr(gateway);

        }
        }

-       switch (req) {
+       if (ifa == 0)
+               ifa = ifa_ifwithnet(gateway);
+       return (ifa);
+}
+
+#define ROUNDUP(a) (1 + (((a) - 1) | (sizeof(long) - 1)))
+
+rtrequest(req, dst, gateway, netmask, flags, ret_nrt)
+       int req, flags;
+       struct sockaddr *dst, *gateway, *netmask;
+       struct rtentry **ret_nrt;
+{
+       int s = splnet(), len, error = 0;
+       register struct rtentry *rt;
+       register struct radix_node *rn;
+       register struct radix_node_head *rnh;
+       struct ifaddr *ifa, *ifa_ifwithdstaddr();
+       struct sockaddr *ndst;
+       u_char af = dst->sa_family;
+#define senderr(x) { error = x ; goto bad; }

 
 

-       case SIOCDELRT:
-               if (m == 0) {
-                       error = ESRCH;
-                       goto bad;
+       if (rtinits_done == 0)
+               rtinitheads();
+       for (rnh = radix_node_head; rnh && (af != rnh->rnh_af); )
+               rnh = rnh->rnh_next;
+       if (rnh == 0)
+               senderr(ESRCH);
+       if (flags & RTF_HOST)
+               netmask = 0;
+       switch (req) {
+       case RTM_DELETE:
+               if (ret_nrt && (rt = *ret_nrt)) {
+                       RTFREE(rt);
+                       *ret_nrt = 0;

                }
                }

-               *mprev = m->m_next;
-               if (rt->rt_refcnt > 0) {
-                       rt->rt_flags &= ~RTF_UP;
-                       rttrash++;
-                       m->m_next = 0;
-               } else
-                       (void) m_free(m);
+               if ((rn = rn_delete((caddr_t)dst, (caddr_t)netmask, 
+                                       rnh->rnh_treetop)) == 0)
+                       senderr(ESRCH);
+               if (rn->rn_flags & (RNF_ACTIVE | RNF_ROOT))
+                       panic ("rtrequest delete");
+               rt = (struct rtentry *)rn;
+               rt->rt_flags &= ~RTF_UP;
+               if ((ifa = rt->rt_ifa) && ifa->ifa_rtrequest)
+                       ifa->ifa_rtrequest(RTM_DELETE, rt, SA(0));
+               rttrash++;
+               if (rt->rt_refcnt <= 0)
+                       rtfree(rt);

                break;
 
                break;
 

-       case SIOCADDRT:
-               if (m) {
-                       error = EEXIST;
-                       goto bad;
-               }
-               ifp = if_ifwithaddr(&entry->rt_gateway);
-               if (ifp == 0) {
-                       ifp = if_ifwithnet(&entry->rt_gateway);
-                       if (ifp == 0) {
-                               error = ENETUNREACH;
-                               goto bad;
-                       }
+       case RTM_RESOLVE:
+               if (ret_nrt == 0 || (rt = *ret_nrt) == 0)
+                       senderr(EINVAL);
+               ifa = rt->rt_ifa;
+               flags = rt->rt_flags & ~RTF_CLONING;
+               gateway = rt->rt_gateway;
+               if ((netmask = rt->rt_genmask) == 0)
+                       flags |= RTF_HOST;
+               goto makeroute;
+
+       case RTM_ADD:
+               if ((ifa = ifa_ifwithroute(flags, dst, gateway)) == 0)
+                       senderr(ENETUNREACH);
+       makeroute:
+               len = sizeof (*rt) + ROUNDUP(gateway->sa_len)
+                   + ROUNDUP(dst->sa_len);
+               R_Malloc(rt, struct rtentry *, len);
+               if (rt == 0)
+                       senderr(ENOBUFS);
+               Bzero(rt, len);
+               ndst = (struct sockaddr *)(rt + 1);
+               if (netmask) {
+                       rt_maskedcopy(dst, ndst, netmask);
+               } else
+                       Bcopy(dst, ndst, dst->sa_len);
+               rn = rn_addroute((caddr_t)ndst, (caddr_t)netmask,
+                                       rnh->rnh_treetop, rt->rt_nodes);
+               if (rn == 0) {
+                       free((caddr_t)rt, M_RTABLE);
+                       senderr(EEXIST);

                }
                }

-               m = m_get(M_DONTWAIT, MT_RTABLE);
-               if (m == 0) {
-                       error = ENOBUFS;
-                       goto bad;
+               rt->rt_ifa = ifa;
+               rt->rt_ifp = ifa->ifa_ifp;
+               rt->rt_flags = RTF_UP | flags;
+               rn->rn_key = (caddr_t) ndst; /* == rt_dst */
+               rt->rt_gateway = (struct sockaddr *)
+                                       (rn->rn_key + ROUNDUP(dst->sa_len));
+               Bcopy(gateway, rt->rt_gateway, gateway->sa_len);
+               if (req == RTM_RESOLVE)
+                       rt->rt_rmx = (*ret_nrt)->rt_rmx; /* copy metrics */
+               if (ifa->ifa_rtrequest)
+                       ifa->ifa_rtrequest(req, rt, SA(ret_nrt ? *ret_nrt : 0));
+               if (ret_nrt) {
+                       *ret_nrt = rt;
+                       rt->rt_refcnt++;

                }
                }

-               *mprev = m;
-               m->m_off = MMINOFF;
-               m->m_len = sizeof (struct rtentry);
-               rt = mtod(m, struct rtentry *);
-               rt->rt_hash = hash;
-               rt->rt_dst = entry->rt_dst;
-               rt->rt_gateway = entry->rt_gateway;
-               rt->rt_flags =
-                   RTF_UP | (entry->rt_flags & (RTF_HOST|RTF_GATEWAY));
-               rt->rt_refcnt = 0;
-               rt->rt_use = 0;
-               rt->rt_ifp = ifp;

                break;
        }
 bad:
                break;
        }
 bad:


@@ -283,26 +406,32 @@ bad:
        return (error);
 }
 
        return (error);
 }
 

+rt_maskedcopy(src, dst, netmask)
+struct sockaddr *src, *dst, *netmask;
+{
+       register u_char *cp1 = (u_char *)src;
+       register u_char *cp2 = (u_char *)dst;
+       register u_char *cp3 = (u_char *)netmask;
+       u_char *cplim = cp2 + *cp3;
+       u_char *cplim2 = cp2 + *cp1;
+
+       *cp2++ = *cp1++; *cp2++ = *cp1++; /* copies sa_len & sa_family */
+       cp3 += 2;
+       if (cplim > cplim2)
+               cplim = cplim2;
+       while (cp2 < cplim)
+               *cp2++ = *cp1++ & *cp3++;
+       if (cp2 < cplim2)
+               bzero((caddr_t)cp2, (unsigned)(cplim2 - cp2));
+}

 /*
  * Set up a routing table entry, normally
  * for an interface.
  */
 /*
  * Set up a routing table entry, normally
  * for an interface.
  */

-rtinit(dst, gateway, flags)
-       struct sockaddr *dst, *gateway;
-       int flags;
+rtinit(ifa, cmd, flags)
+       register struct ifaddr *ifa;
+       int cmd, flags;

 {
 {

-       struct rtentry route;
-       int cmd;
-
-       if (flags == -1) {
-               cmd = (int)SIOCDELRT;
-               flags = 0;
-       } else {
-               cmd = (int)SIOCADDRT;
-       }
-       bzero((caddr_t)&route, sizeof (route));
-       route.rt_dst = *dst;
-       route.rt_gateway = *gateway;
-       route.rt_flags = flags;
-       (void) rtrequest(cmd, &route);
+       return rtrequest(cmd, ifa->ifa_dstaddr, ifa->ifa_addr,
+                   ifa->ifa_netmask, flags | ifa->ifa_flags, &ifa->ifa_rt);

 }
 }