fix autoconf, move code to isa.c, remove debugging, drop redundant tlbflushes, macros...

[unix-history] / usr / src / sys / netinet / in_pcb.c

diff --git a/usr/src/sys/netinet/in_pcb.c b/usr/src/sys/netinet/in_pcb.c
index 1ece85a..7827c63 100644 (file)
--- a/usr/src/sys/netinet/in_pcb.c
+++ b/usr/src/sys/netinet/in_pcb.c
@@ -1,23 +1,25 @@
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)in_pcb.c    7.3 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)in_pcb.c    7.13 (Berkeley) %G%

  */
 
 #include "param.h"
 #include "systm.h"
  */
 
 #include "param.h"
 #include "systm.h"

-#include "dir.h"

 #include "user.h"
 #include "user.h"

+#include "malloc.h"

 #include "mbuf.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "ioctl.h"
 #include "mbuf.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "ioctl.h"

-#include "in.h"
-#include "in_systm.h"

 #include "../net/if.h"
 #include "../net/route.h"
 #include "../net/if.h"
 #include "../net/route.h"

+#include "in.h"
+#include "in_systm.h"
+#include "ip.h"

 #include "in_pcb.h"
 #include "in_var.h"
 #include "protosw.h"
 #include "in_pcb.h"
 #include "in_var.h"
 #include "protosw.h"


@@ -106,7 +108,7 @@ noname:
  * then pick one.
  */
 in_pcbconnect(inp, nam)
  * then pick one.
  */
 in_pcbconnect(inp, nam)

-       struct inpcb *inp;
+       register struct inpcb *inp;

        struct mbuf *nam;
 {
        struct in_ifaddr *ia;
        struct mbuf *nam;
 {
        struct in_ifaddr *ia;


@@ -156,6 +158,7 @@ in_pcbconnect(inp, nam)
                    ro->ro_rt->rt_ifp == (struct ifnet *)0)) {
                        /* No route yet, so try to acquire one */
                        ro->ro_dst.sa_family = AF_INET;
                    ro->ro_rt->rt_ifp == (struct ifnet *)0)) {
                        /* No route yet, so try to acquire one */
                        ro->ro_dst.sa_family = AF_INET;

+                       ro->ro_dst.sa_len = sizeof(struct sockaddr_in);

                        ((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
                                sin->sin_addr;
                        rtalloc(ro);
                        ((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
                                sin->sin_addr;
                        rtalloc(ro);


@@ -233,57 +236,91 @@ in_setsockaddr(inp, nam)
        register struct inpcb *inp;
        struct mbuf *nam;
 {
        register struct inpcb *inp;
        struct mbuf *nam;
 {

-       register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
+       register struct sockaddr_in *sin;

        
        nam->m_len = sizeof (*sin);
        sin = mtod(nam, struct sockaddr_in *);
        bzero((caddr_t)sin, sizeof (*sin));
        sin->sin_family = AF_INET;
        
        nam->m_len = sizeof (*sin);
        sin = mtod(nam, struct sockaddr_in *);
        bzero((caddr_t)sin, sizeof (*sin));
        sin->sin_family = AF_INET;

+       sin->sin_len = sizeof(*sin);

        sin->sin_port = inp->inp_lport;
        sin->sin_addr = inp->inp_laddr;
 }
 
 in_setpeeraddr(inp, nam)
        sin->sin_port = inp->inp_lport;
        sin->sin_addr = inp->inp_laddr;
 }
 
 in_setpeeraddr(inp, nam)

-       register struct inpcb *inp;
+       struct inpcb *inp;

        struct mbuf *nam;
 {
        struct mbuf *nam;
 {

-       register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
+       register struct sockaddr_in *sin;

        
        nam->m_len = sizeof (*sin);
        sin = mtod(nam, struct sockaddr_in *);
        bzero((caddr_t)sin, sizeof (*sin));
        sin->sin_family = AF_INET;
        
        nam->m_len = sizeof (*sin);
        sin = mtod(nam, struct sockaddr_in *);
        bzero((caddr_t)sin, sizeof (*sin));
        sin->sin_family = AF_INET;

+       sin->sin_len = sizeof(*sin);

        sin->sin_port = inp->inp_fport;
        sin->sin_addr = inp->inp_faddr;
 }
 
 /*
  * Pass some notification to all connections of a protocol
        sin->sin_port = inp->inp_fport;
        sin->sin_addr = inp->inp_faddr;
 }
 
 /*
  * Pass some notification to all connections of a protocol

- * associated with address dst.  Call the protocol specific
- * routine (if any) to handle each connection.
+ * associated with address dst.  The local address and/or port numbers
+ * may be specified to limit the search.  The "usual action" will be
+ * taken, depending on the ctlinput cmd.  The caller must filter any
+ * cmds that are uninteresting (e.g., no error in the map).
+ * Call the protocol specific routine (if any) to report
+ * any errors for each matching socket.
+ *
+ * Must be called at splnet.

  */
  */

-in_pcbnotify(head, dst, errno, notify)
+in_pcbnotify(head, dst, fport, laddr, lport, cmd, notify)

        struct inpcb *head;
        struct inpcb *head;

-       register struct in_addr *dst;
-       int errno, (*notify)();
+       struct sockaddr *dst;
+       u_short fport, lport;
+       struct in_addr laddr;
+       int cmd, (*notify)();

 {
        register struct inpcb *inp, *oinp;
 {
        register struct inpcb *inp, *oinp;

-       int s = splimp();
+       struct in_addr faddr;
+       int errno;
+       int in_rtchange();
+       extern u_char inetctlerrmap[];

 
 

+       if ((unsigned)cmd > PRC_NCMDS || dst->sa_family != AF_INET)
+               return;
+       faddr = ((struct sockaddr_in *)dst)->sin_addr;
+       if (faddr.s_addr == INADDR_ANY)
+               return;
+
+       /*
+        * Redirects go to all references to the destination,
+        * and use in_rtchange to invalidate the route cache.
+        * Dead host indications: notify all references to the destination.
+        * Otherwise, if we have knowledge of the local port and address,
+        * deliver only to that socket.
+        */
+       if (PRC_IS_REDIRECT(cmd) || cmd == PRC_HOSTDEAD) {
+               fport = 0;
+               lport = 0;
+               laddr.s_addr = 0;
+               if (cmd != PRC_HOSTDEAD)
+                       notify = in_rtchange;
+       }
+       errno = inetctlerrmap[cmd];

        for (inp = head->inp_next; inp != head;) {
        for (inp = head->inp_next; inp != head;) {

-               if (inp->inp_faddr.s_addr != dst->s_addr ||
-                   inp->inp_socket == 0) {
+               if (inp->inp_faddr.s_addr != faddr.s_addr ||
+                   inp->inp_socket == 0 ||
+                   (lport && inp->inp_lport != lport) ||
+                   (laddr.s_addr && inp->inp_laddr.s_addr != laddr.s_addr) ||
+                   (fport && inp->inp_fport != fport)) {

                        inp = inp->inp_next;
                        continue;
                }
                        inp = inp->inp_next;
                        continue;
                }

-               if (errno) 
-                       inp->inp_socket->so_error = errno;

                oinp = inp;
                inp = inp->inp_next;
                if (notify)
                oinp = inp;
                inp = inp->inp_next;
                if (notify)

-                       (*notify)(oinp);
+                       (*notify)(oinp, errno);

        }
        }

-       splx(s);

 }
 
 /*
 }
 
 /*


@@ -298,10 +335,15 @@ in_losing(inp)
        register struct rtentry *rt;
 
        if ((rt = inp->inp_route.ro_rt)) {
        register struct rtentry *rt;
 
        if ((rt = inp->inp_route.ro_rt)) {

+               rt_missmsg(RTM_LOSING, &inp->inp_route.ro_dst,
+                           rt->rt_gateway, (struct sockaddr *)rt_mask(rt),
+                           (struct sockaddr *)0, rt->rt_flags, 0);

                if (rt->rt_flags & RTF_DYNAMIC)
                if (rt->rt_flags & RTF_DYNAMIC)

-                       (void) rtrequest((int)SIOCDELRT, rt);
-               rtfree(rt);
+                       (void) rtrequest(RTM_DELETE, rt_key(rt),
+                               rt->rt_gateway, rt_mask(rt), rt->rt_flags, 
+                               (struct rtentry **)0);

                inp->inp_route.ro_rt = 0;
                inp->inp_route.ro_rt = 0;

+               rtfree(rt);

                /*
                 * A new route can be allocated
                 * the next time output is attempted.
                /*
                 * A new route can be allocated
                 * the next time output is attempted.