optimize boot program

[unix-history] / usr / src / sys / netns / ns_pcb.c

diff --git a/usr/src/sys/netns/ns_pcb.c b/usr/src/sys/netns/ns_pcb.c
index af3bed4..d8a859f 100644 (file)
--- a/usr/src/sys/netns/ns_pcb.c
+++ b/usr/src/sys/netns/ns_pcb.c
@@ -1,25 +1,26 @@
 /*
 /*

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

  *
  *

- *     @(#)ns_pcb.c    7.1 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)ns_pcb.c    8.1 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "dir.h"
-#include "user.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "../net/if.h"
-#include "../net/route.h"
-#include "protosw.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/errno.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/protosw.h>
+
+#include <net/if.h>
+#include <net/route.h>

 
 

-#include "ns.h"
-#include "ns_if.h"
-#include "ns_pcb.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
+#include <netns/ns_pcb.h>

 
 struct ns_addr zerons_addr;
 
 
 struct ns_addr zerons_addr;
 


@@ -47,7 +48,7 @@ ns_pcbbind(nsp, nam)
        register struct sockaddr_ns *sns;
        u_short lport = 0;
 
        register struct sockaddr_ns *sns;
        u_short lport = 0;
 

-       if(nsp->nsp_lport || !ns_nullhost(nsp->nsp_laddr))
+       if (nsp->nsp_lport || !ns_nullhost(nsp->nsp_laddr))

                return (EINVAL);
        if (nam == 0)
                goto noname;
                return (EINVAL);
        if (nam == 0)
                goto noname;


@@ -66,7 +67,8 @@ ns_pcbbind(nsp, nam)
        if (lport) {
                u_short aport = ntohs(lport);
 
        if (lport) {
                u_short aport = ntohs(lport);
 

-               if (aport < NSPORT_RESERVED && u.u_uid != 0)
+               if (aport < NSPORT_RESERVED &&
+                   (nsp->nsp_socket->so_state & SS_PRIV) == 0)

                        return (EACCES);
                if (ns_pcblookup(&zerons_addr, lport, 0))
                        return (EADDRINUSE);
                        return (EACCES);
                if (ns_pcblookup(&zerons_addr, lport, 0))
                        return (EADDRINUSE);


@@ -96,6 +98,8 @@ ns_pcbconnect(nsp, nam)
        struct ns_ifaddr *ia;
        register struct sockaddr_ns *sns = mtod(nam, struct sockaddr_ns *);
        register struct ns_addr *dst;
        struct ns_ifaddr *ia;
        register struct sockaddr_ns *sns = mtod(nam, struct sockaddr_ns *);
        register struct ns_addr *dst;

+       register struct route *ro;
+       struct ifnet *ifp;

 
        if (nam->m_len != sizeof (*sns))
                return (EINVAL);
 
        if (nam->m_len != sizeof (*sns))
                return (EINVAL);


@@ -103,72 +107,76 @@ ns_pcbconnect(nsp, nam)
                return (EAFNOSUPPORT);
        if (sns->sns_port==0 || ns_nullhost(sns->sns_addr))
                return (EADDRNOTAVAIL);
                return (EAFNOSUPPORT);
        if (sns->sns_port==0 || ns_nullhost(sns->sns_addr))
                return (EADDRNOTAVAIL);

-       if (ns_nullhost(nsp->nsp_laddr) &&
-           (!ns_neteq(nsp->nsp_lastdst, sns->sns_addr))) {
-               register struct route *ro;
-               struct ifnet *ifp;
-               ro = &nsp->nsp_route;
-               dst = &satons_addr(ro->ro_dst);
-
-               ia = ns_iaonnetof(&sns->sns_addr);
-               if (ia == 0 ||
-                       (ia->ia_ifp->if_flags & IFF_UP) == 0) {
-                       /* 
-                        * If route is known or can be allocated now,
-                        * our src addr is taken from the i/f, else punt.
-                        */
-                       if (ro->ro_rt &&
-                               !ns_hosteq(*dst, sns->sns_addr)) {
+       /*
+        * If we haven't bound which network number to use as ours,
+        * we will use the number of the outgoing interface.
+        * This depends on having done a routing lookup, which
+        * we will probably have to do anyway, so we might
+        * as well do it now.  On the other hand if we are
+        * sending to multiple destinations we may have already
+        * done the lookup, so see if we can use the route
+        * from before.  In any case, we only
+        * chose a port number once, even if sending to multiple
+        * destinations.
+        */
+       ro = &nsp->nsp_route;
+       dst = &satons_addr(ro->ro_dst);
+       if (nsp->nsp_socket->so_options & SO_DONTROUTE)
+               goto flush;
+       if (!ns_neteq(nsp->nsp_lastdst, sns->sns_addr))
+               goto flush;
+       if (!ns_hosteq(nsp->nsp_lastdst, sns->sns_addr)) {
+               if (ro->ro_rt && ! (ro->ro_rt->rt_flags & RTF_HOST)) {
+                       /* can patch route to avoid rtalloc */
+                       *dst = sns->sns_addr;
+               } else {
+       flush:
+                       if (ro->ro_rt)

                                RTFREE(ro->ro_rt);
                                RTFREE(ro->ro_rt);

-                               ro->ro_rt = (struct rtentry *)0;
-                       }
-                       if ((ro->ro_rt == (struct rtentry *)0) ||
-                           (ifp = ro->ro_rt->rt_ifp) == (struct ifnet *)0) {
-                               /* No route yet, so try to acquire one */
-                               ro->ro_dst.sa_family = AF_NS;
-                               *dst = sns->sns_addr;
-                               dst->x_port = 0;
-                               rtalloc(ro);
-                               if (ro->ro_rt == 0)
-                                       ifp = (struct ifnet *)0;
-                               else
-                                       ifp = ro->ro_rt->rt_ifp;
-                       }
-                       if (ifp) {
-                               for (ia = ns_ifaddr; ia; ia = ia->ia_next)
-                                       if (ia->ia_ifp == ifp)
-                                           break;
-                       }
+                       ro->ro_rt = (struct rtentry *)0;
+                       nsp->nsp_laddr.x_net = ns_zeronet;
+               }
+       }/* else cached route is ok; do nothing */
+       nsp->nsp_lastdst = sns->sns_addr;
+       if ((nsp->nsp_socket->so_options & SO_DONTROUTE) == 0 && /*XXX*/
+           (ro->ro_rt == (struct rtentry *)0 ||
+            ro->ro_rt->rt_ifp == (struct ifnet *)0)) {
+                   /* No route yet, so try to acquire one */
+                   ro->ro_dst.sa_family = AF_NS;
+                   ro->ro_dst.sa_len = sizeof(ro->ro_dst);
+                   *dst = sns->sns_addr;
+                   dst->x_port = 0;
+                   rtalloc(ro);
+       }
+       if (ns_neteqnn(nsp->nsp_laddr.x_net, ns_zeronet)) {
+               /* 
+                * If route is known or can be allocated now,
+                * our src addr is taken from the i/f, else punt.
+                */
+
+               ia = (struct ns_ifaddr *)0;
+               /*
+                * If we found a route, use the address
+                * corresponding to the outgoing interface
+                */
+               if (ro->ro_rt && (ifp = ro->ro_rt->rt_ifp))
+                       for (ia = ns_ifaddr; ia; ia = ia->ia_next)
+                               if (ia->ia_ifp == ifp)
+                                       break;
+               if (ia == 0) {
+                       u_short fport = sns->sns_addr.x_port;
+                       sns->sns_addr.x_port = 0;
+                       ia = (struct ns_ifaddr *)
+                               ifa_ifwithdstaddr((struct sockaddr *)sns);
+                       sns->sns_addr.x_port = fport;
+                       if (ia == 0)
+                               ia = ns_iaonnetof(&sns->sns_addr);

                        if (ia == 0)
                                ia = ns_ifaddr;
                        if (ia == 0)
                                return (EADDRNOTAVAIL);
                        if (ia == 0)
                                ia = ns_ifaddr;
                        if (ia == 0)
                                return (EADDRNOTAVAIL);

-               } else if (ro->ro_rt) {
-                       if (ns_neteq(*dst, sns->sns_addr)) {
-                               /*
-                                * This assume that we have no GH
-                                * type routes.
-                                */
-                               if (ro->ro_rt->rt_flags & RTF_HOST) {
-                                       if (!ns_hosteq(*dst, sns->sns_addr))
-                                               goto re_route;
-
-                               }
-                               if ((ro->ro_rt->rt_flags & RTF_GATEWAY) == 0) {
-                                       dst->x_host = sns->sns_addr.x_host;
-                               }
-                               /* 
-                                * Otherwise, we go through the same gateway
-                                * and dst is already set up.
-                                */
-                       } else {
-                       re_route:
-                               RTFREE(ro->ro_rt);
-                               ro->ro_rt = (struct rtentry *)0;
-                       }

                }
                nsp->nsp_laddr.x_net = satons_addr(ia->ia_addr).x_net;
                }
                nsp->nsp_laddr.x_net = satons_addr(ia->ia_addr).x_net;

-               nsp->nsp_lastdst = sns->sns_addr;

        }
        if (ns_pcblookup(&sns->sns_addr, nsp->nsp_lport, 0))
                return (EADDRINUSE);
        }
        if (ns_pcblookup(&sns->sns_addr, nsp->nsp_lport, 0))
                return (EADDRINUSE);


@@ -213,6 +221,7 @@ ns_setsockaddr(nsp, nam)
        nam->m_len = sizeof (*sns);
        sns = mtod(nam, struct sockaddr_ns *);
        bzero((caddr_t)sns, sizeof (*sns));
        nam->m_len = sizeof (*sns);
        sns = mtod(nam, struct sockaddr_ns *);
        bzero((caddr_t)sns, sizeof (*sns));

+       sns->sns_len = sizeof(*sns);

        sns->sns_family = AF_NS;
        sns->sns_addr = nsp->nsp_laddr;
 }
        sns->sns_family = AF_NS;
        sns->sns_addr = nsp->nsp_laddr;
 }


@@ -226,6 +235,7 @@ ns_setpeeraddr(nsp, nam)
        nam->m_len = sizeof (*sns);
        sns = mtod(nam, struct sockaddr_ns *);
        bzero((caddr_t)sns, sizeof (*sns));
        nam->m_len = sizeof (*sns);
        sns = mtod(nam, struct sockaddr_ns *);
        bzero((caddr_t)sns, sizeof (*sns));

+       sns->sns_len = sizeof(*sns);

        sns->sns_family = AF_NS;
        sns->sns_addr  = nsp->nsp_faddr;
 }
        sns->sns_family = AF_NS;
        sns->sns_addr  = nsp->nsp_faddr;
 }


@@ -306,8 +316,8 @@ ns_pcblookup(faddr, lport, wildp)
                        else {
                                if (!ns_hosteq(nsp->nsp_faddr, *faddr))
                                        continue;
                        else {
                                if (!ns_hosteq(nsp->nsp_faddr, *faddr))
                                        continue;

-                               if( nsp->nsp_fport != fport) {
-                                       if(nsp->nsp_fport != 0)
+                               if (nsp->nsp_fport != fport) {
+                                       if (nsp->nsp_fport != 0)

                                                continue;
                                        else
                                                wildcard++;
                                                continue;
                                        else
                                                wildcard++;