projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BSD 4_3_Net_2 release
[unix-history] / usr / src / sys / net / rtsock.c
diff --git a/usr/src/sys/net/rtsock.c b/usr/src/sys/net/rtsock.c
index 8abe822..a64719b 100644 (file)
--- a/usr/src/sys/net/rtsock.c
+++ b/usr/src/sys/net/rtsock.c
@@ -1,21 +1,45 @@
 /*
 /*
- * Copyright (c) 1988 Regents of the University of California.
+ * Copyright (c) 1988, 1991 Regents of the University of California.
  * All rights reserved.
  *
  * All rights reserved.
  *
- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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.
  *
  *
- *     @(#)rtsock.c    7.16 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)rtsock.c    7.18 (Berkeley) 6/27/91
  */
 
 #include "param.h"
 #include "mbuf.h"
  */
 
 #include "param.h"
 #include "mbuf.h"
-#include "user.h"
 #include "proc.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "domain.h"
 #include "protosw.h"
 #include "proc.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "domain.h"
 #include "protosw.h"
-#include "errno.h"
 
 #include "af.h"
 #include "if.h"
 
 #include "af.h"
 #include "if.h"
@@ -90,12 +114,12 @@ route_output(m, so)
        register struct rtentry *rt = 0;
        struct rtentry *saved_nrt = 0;
        struct sockaddr *dst = 0, *gate = 0, *netmask = 0, *genmask = 0;
        register struct rtentry *rt = 0;
        struct rtentry *saved_nrt = 0;
        struct sockaddr *dst = 0, *gate = 0, *netmask = 0, *genmask = 0;
-       struct sockaddr *ifpaddr = 0, *ifaaddr;
+       struct sockaddr *ifpaddr = 0, *ifaaddr = 0;
        caddr_t cp, lim;
        int len, error = 0;
        struct ifnet *ifp = 0;
        caddr_t cp, lim;
        int len, error = 0;
        struct ifnet *ifp = 0;
-       struct  ifaddr *ifa;
-       extern struct ifaddr *ifaof_ifpforaddr(), *ifa_ifwithroute();
+       struct ifaddr *ifa = 0;
+       struct ifaddr *ifaof_ifpforaddr(), *ifa_ifwithroute();
 
 #define senderr(e) { error = e; goto flush;}
        if (m == 0 || m->m_len < sizeof(long))
 
 #define senderr(e) { error = e; goto flush;}
        if (m == 0 || m->m_len < sizeof(long))
@@ -114,7 +138,7 @@ route_output(m, so)
        m_copydata(m, 0, len, (caddr_t)rtm);
        if (rtm->rtm_version != RTM_VERSION)
                senderr(EPROTONOSUPPORT);
        m_copydata(m, 0, len, (caddr_t)rtm);
        if (rtm->rtm_version != RTM_VERSION)
                senderr(EPROTONOSUPPORT);
-       rtm->rtm_pid = u.u_procp->p_pid;
+       rtm->rtm_pid = curproc->p_pid;
        lim = len + (caddr_t) rtm;
        cp = (caddr_t) (rtm + 1);
        if (rtm->rtm_addrs & RTA_DST) {
        lim = len + (caddr_t) rtm;
        cp = (caddr_t) (rtm + 1);
        if (rtm->rtm_addrs & RTA_DST) {
@@ -142,6 +166,10 @@ route_output(m, so)
        }
        if ((rtm->rtm_addrs & RTA_IFP) && cp < lim)  {
                ifpaddr = (struct sockaddr *)cp;
        }
        if ((rtm->rtm_addrs & RTA_IFP) && cp < lim)  {
                ifpaddr = (struct sockaddr *)cp;
+               ADVANCE(cp, ifpaddr);
+       }
+       if ((rtm->rtm_addrs & RTA_IFA) && cp < lim)  {
+               ifaaddr = (struct sockaddr *)cp;
        }
        switch (rtm->rtm_type) {
        case RTM_ADD:
        }
        switch (rtm->rtm_type) {
        case RTM_ADD:
@@ -168,8 +196,12 @@ route_output(m, so)
                rt = rtalloc1(dst, 0);
                if (rt == 0)
                        senderr(ESRCH);
                rt = rtalloc1(dst, 0);
                if (rt == 0)
                        senderr(ESRCH);
-               if (((struct radix_node *)rt)->rn_dupedkey) {
-                       if (netmask == 0 && rtm->rtm_type != RTM_GET)
+               if (rtm->rtm_type != RTM_GET) {
+                       if (Bcmp(dst, rt_key(rt), dst->sa_len) != 0)
+                               senderr(ESRCH);
+                       if (rt->rt_nodes->rn_dupedkey &&
+                           (netmask == 0 ||
+                            Bcmp(netmask, rt_mask(rt), netmask->sa_len)))
                                senderr(ETOOMANYREFS);
                }
                switch(rtm->rtm_type) {
                                senderr(ETOOMANYREFS);
                }
                switch(rtm->rtm_type) {
@@ -248,32 +280,31 @@ route_output(m, so)
                        if (gate &&
                            (gate->sa_len > (len = rt->rt_gateway->sa_len)))
                                senderr(EDQUOT);
                        if (gate &&
                            (gate->sa_len > (len = rt->rt_gateway->sa_len)))
                                senderr(EDQUOT);
-                       if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
-                               rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt, gate);
                        /* new gateway could require new ifaddr, ifp;
                           flags may also be different; ifp may be specified
                           by ll sockaddr when protocol address is ambiguous */
                        /* new gateway could require new ifaddr, ifp;
                           flags may also be different; ifp may be specified
                           by ll sockaddr when protocol address is ambiguous */
-                       if (ifpaddr &&
-                           (ifa = ifa_ifwithnet(ifpaddr)) &&
-                           (ifp = ifa->ifa_ifp) &&
-                           (ifa = ifaof_ifpforaddr(gate, ifp))) {
-                                    /* We got it */
-                       } else {
-                           ifa = 0; ifp = 0;
-                       }
-                       if (gate)
-                               Bcopy(gate, rt->rt_gateway, len);
-                       rt_setmetrics(rtm->rtm_inits,
-                               &rtm->rtm_rmx, &rt->rt_rmx);
-                       if (ifa == 0)
-                           ifa = ifa_ifwithroute(rt->rt_flags, rt_key(rt),
-                                               gate);
+                       if (ifpaddr && (ifa = ifa_ifwithnet(ifpaddr)) &&
+                           (ifp = ifa->ifa_ifp))
+                               ifa = ifaof_ifpforaddr(ifaaddr ? ifaaddr : gate,
+                                                       ifp);
+                       else if ((ifaaddr && (ifa = ifa_ifwithaddr(ifaaddr))) ||
+                                (ifa = ifa_ifwithroute(rt->rt_flags,
+                                                       rt_key(rt), gate)))
+                               ifp = ifa->ifa_ifp;
                        if (ifa) {
                        if (ifa) {
-                               if (rt->rt_ifa != ifa) {
+                               register struct ifaddr *oifa = rt->rt_ifa;
+                               if (oifa != ifa) {
+                                   if (oifa && oifa->ifa_rtrequest)
+                                       oifa->ifa_rtrequest(RTM_DELETE,
+                                                               rt, gate);
                                    rt->rt_ifa = ifa;
                                    rt->rt_ifa = ifa;
-                                   rt->rt_ifp = ifa->ifa_ifp;
+                                   rt->rt_ifp = ifp;
                                }
                        }
                                }
                        }
+                       if (gate)
+                               Bcopy(gate, rt->rt_gateway, len);
+                       rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx,
+                                       &rt->rt_rmx);
                        if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
                               rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, gate);
                        if (genmask)
                        if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
                               rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, gate);
                        if (genmask)
@@ -345,6 +376,7 @@ rt_setmetrics(which, in, out)
        metric(RTV_RTTVAR, rmx_rttvar);
        metric(RTV_HOPCOUNT, rmx_hopcount);
        metric(RTV_MTU, rmx_mtu);
        metric(RTV_RTTVAR, rmx_rttvar);
        metric(RTV_HOPCOUNT, rmx_hopcount);
        metric(RTV_MTU, rmx_mtu);
+       metric(RTV_EXPIRE, rmx_expire);
 #undef metric
 }
 
 #undef metric
 }
 
@@ -366,7 +398,7 @@ m_copyback(m0, off, len, cp)
 
        if (m0 == 0)
                return;
 
        if (m0 == 0)
                return;
-       while (off >= (mlen = m->m_len)) {
+       while (off > (mlen = m->m_len)) {
                off -= mlen;
                totlen += mlen;
                if (m->m_next == 0) {
                off -= mlen;
                totlen += mlen;
                if (m->m_next == 0) {
@@ -429,7 +461,7 @@ struct sockaddr *gate, *mask, *src;
        rtm->rtm_type = type;
        rtm->rtm_addrs = RTA_DST;
        if (type == RTM_OLDADD || type == RTM_OLDDEL) {
        rtm->rtm_type = type;
        rtm->rtm_addrs = RTA_DST;
        if (type == RTM_OLDADD || type == RTM_OLDDEL) {
-               rtm->rtm_pid = u.u_procp->p_pid;
+               rtm->rtm_pid = curproc->p_pid;
        }
        m_copyback(m, sizeof (*rtm), dlen, (caddr_t)dst);
        if (gate) {
        }
        m_copyback(m, sizeof (*rtm), dlen, (caddr_t)dst);
        if (gate) {
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.