BSD 4_4_Lite1 release

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

diff --git a/usr/src/sys/netinet/tcp_usrreq.c b/usr/src/sys/netinet/tcp_usrreq.c
index f278c82..38a08d6 100644 (file)
--- a/usr/src/sys/netinet/tcp_usrreq.c
+++ b/usr/src/sys/netinet/tcp_usrreq.c
@@ -1,53 +1,68 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  *
  *

- *     @(#)tcp_usrreq.c        7.13 (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.
+ *
+ *     @(#)tcp_usrreq.c        8.2 (Berkeley) 1/3/94

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "malloc.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "protosw.h"
-#include "errno.h"
-#include "stat.h"
-
-#include "../net/if.h"
-#include "../net/route.h"
-
-#include "in.h"
-#include "in_systm.h"
-#include "ip.h"
-#include "in_pcb.h"
-#include "ip_var.h"
-#include "tcp.h"
-#include "tcp_fsm.h"
-#include "tcp_seq.h"
-#include "tcp_timer.h"
-#include "tcp_var.h"
-#include "tcpip.h"
-#include "tcp_debug.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/protosw.h>
+#include <sys/errno.h>
+#include <sys/stat.h>
+
+#include <net/if.h>
+#include <net/route.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/in_pcb.h>
+#include <netinet/ip_var.h>
+#include <netinet/tcp.h>
+#include <netinet/tcp_fsm.h>
+#include <netinet/tcp_seq.h>
+#include <netinet/tcp_timer.h>
+#include <netinet/tcp_var.h>
+#include <netinet/tcpip.h>
+#include <netinet/tcp_debug.h>

 
 /*
  * TCP protocol interface to socket abstraction.
  */
 extern char *tcpstates[];
 
 /*
  * TCP protocol interface to socket abstraction.
  */
 extern char *tcpstates[];

-struct tcpcb *tcp_newtcpcb();

 
 /*
  * Process a TCP user request for TCP tb.  If this is a send request
 
 /*
  * Process a TCP user request for TCP tb.  If this is a send request


@@ -55,10 +70,11 @@ struct      tcpcb *tcp_newtcpcb();
  * (called from the software clock routine), then timertype tells which timer.
  */
 /*ARGSUSED*/
  * (called from the software clock routine), then timertype tells which timer.
  */
 /*ARGSUSED*/

-tcp_usrreq(so, req, m, nam, rights)
+int
+tcp_usrreq(so, req, m, nam, control)

        struct socket *so;
        int req;
        struct socket *so;
        int req;

-       struct mbuf *m, *nam, *rights;
+       struct mbuf *m, *nam, *control;

 {
        register struct inpcb *inp;
        register struct tcpcb *tp;
 {
        register struct inpcb *inp;
        register struct tcpcb *tp;


@@ -66,16 +82,15 @@ tcp_usrreq(so, req, m, nam, rights)
        int error = 0;
        int ostate;
 
        int error = 0;
        int ostate;
 

-#if BSD>=43

        if (req == PRU_CONTROL)
                return (in_control(so, (int)m, (caddr_t)nam,
        if (req == PRU_CONTROL)
                return (in_control(so, (int)m, (caddr_t)nam,

-                       (struct ifnet *)rights));
-#else
-       if (req == PRU_CONTROL)
-               return(EOPNOTSUPP);
-#endif
-       if (rights && rights->m_len)
+                       (struct ifnet *)control));
+       if (control && control->m_len) {
+               m_freem(control);
+               if (m)
+                       m_freem(m);

                return (EINVAL);
                return (EINVAL);

+       }

 
        s = splnet();
        inp = sotoinpcb(so);
 
        s = splnet();
        inp = sotoinpcb(so);


@@ -171,6 +186,10 @@ tcp_usrreq(so, req, m, nam, rights)
                        error = ENOBUFS;
                        break;
                }
                        error = ENOBUFS;
                        break;
                }

+               /* Compute window scaling to request.  */
+               while (tp->request_r_scale < TCP_MAX_WINSHIFT &&
+                   (TCP_MAXWIN << tp->request_r_scale) < so->so_rcv.sb_hiwat)
+                       tp->request_r_scale++;

                soisconnecting(so);
                tcpstat.tcps_connattempt++;
                tp->t_state = TCPS_SYN_SENT;
                soisconnecting(so);
                tcpstat.tcps_connattempt++;
                tp->t_state = TCPS_SYN_SENT;


@@ -207,16 +226,9 @@ tcp_usrreq(so, req, m, nam, rights)
         * done at higher levels; just return the address
         * of the peer, storing through addr.
         */
         * done at higher levels; just return the address
         * of the peer, storing through addr.
         */

-       case PRU_ACCEPT: {
-               struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-
-               nam->m_len = sizeof (struct sockaddr_in);
-               sin->sin_family = AF_INET;
-               sin->sin_len = sizeof(*sin);
-               sin->sin_port = inp->inp_fport;
-               sin->sin_addr = inp->inp_faddr;
+       case PRU_ACCEPT:
+               in_setpeeraddr(inp, nam);

                break;
                break;

-               }

 
        /*
         * Mark the connection as being incapable of further output.
 
        /*
         * Mark the connection as being incapable of further output.


@@ -259,9 +271,7 @@ tcp_usrreq(so, req, m, nam, rights)
        case PRU_RCVOOB:
                if ((so->so_oobmark == 0 &&
                    (so->so_state & SS_RCVATMARK) == 0) ||
        case PRU_RCVOOB:
                if ((so->so_oobmark == 0 &&
                    (so->so_state & SS_RCVATMARK) == 0) ||

-#ifdef SO_OOBINLINE

                    so->so_options & SO_OOBINLINE ||
                    so->so_options & SO_OOBINLINE ||

-#endif

                    tp->t_oobflags & TCPOOB_HADDATA) {
                        error = EINVAL;
                        break;
                    tp->t_oobflags & TCPOOB_HADDATA) {
                        error = EINVAL;
                        break;


@@ -323,20 +333,33 @@ tcp_usrreq(so, req, m, nam, rights)
        return (error);
 }
 
        return (error);
 }
 

-#if BSD>=43
+int

 tcp_ctloutput(op, so, level, optname, mp)
        int op;
        struct socket *so;
        int level, optname;
        struct mbuf **mp;
 {
 tcp_ctloutput(op, so, level, optname, mp)
        int op;
        struct socket *so;
        int level, optname;
        struct mbuf **mp;
 {

-       int error = 0;
-       struct inpcb *inp = sotoinpcb(so);
-       register struct tcpcb *tp = intotcpcb(inp);
+       int error = 0, s;
+       struct inpcb *inp;
+       register struct tcpcb *tp;

        register struct mbuf *m;
        register struct mbuf *m;

+       register int i;

 
 

-       if (level != IPPROTO_TCP)
-               return (ip_ctloutput(op, so, level, optname, mp));
+       s = splnet();
+       inp = sotoinpcb(so);
+       if (inp == NULL) {
+               splx(s);
+               if (op == PRCO_SETOPT && *mp)
+                       (void) m_free(*mp);
+               return (ECONNRESET);
+       }
+       if (level != IPPROTO_TCP) {
+               error = ip_ctloutput(op, so, level, optname, mp);
+               splx(s);
+               return (error);
+       }
+       tp = intotcpcb(inp);

 
        switch (op) {
 
 
        switch (op) {
 


@@ -353,9 +376,15 @@ tcp_ctloutput(op, so, level, optname, mp)
                                tp->t_flags &= ~TF_NODELAY;
                        break;
 
                                tp->t_flags &= ~TF_NODELAY;
                        break;
 

-               case TCP_MAXSEG:        /* not yet */
+               case TCP_MAXSEG:
+                       if (m && (i = *mtod(m, int *)) > 0 && i <= tp->t_maxseg)
+                               tp->t_maxseg = i;
+                       else
+                               error = EINVAL;
+                       break;
+

                default:
                default:

-                       error = EINVAL;
+                       error = ENOPROTOOPT;

                        break;
                }
                if (m)
                        break;
                }
                if (m)


@@ -374,23 +403,24 @@ tcp_ctloutput(op, so, level, optname, mp)
                        *mtod(m, int *) = tp->t_maxseg;
                        break;
                default:
                        *mtod(m, int *) = tp->t_maxseg;
                        break;
                default:

-                       error = EINVAL;
+                       error = ENOPROTOOPT;

                        break;
                }
                break;
        }
                        break;
                }
                break;
        }

+       splx(s);

        return (error);
 }
        return (error);
 }

-#endif

 
 

-u_long tcp_sendspace = 1024*4;
-u_long tcp_recvspace = 1024*4;
+u_long tcp_sendspace = 1024*8;
+u_long tcp_recvspace = 1024*8;

 
 /*
  * Attach TCP protocol to socket, allocating
  * internet protocol control block, tcp control block,
  * bufer space, and entering LISTEN state if to accept connections.
  */
 
 /*
  * Attach TCP protocol to socket, allocating
  * internet protocol control block, tcp control block,
  * bufer space, and entering LISTEN state if to accept connections.
  */

+int

 tcp_attach(so)
        struct socket *so;
 {
 tcp_attach(so)
        struct socket *so;
 {