new signals

[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 dd0a668..ebed585 100644 (file)
--- a/usr/src/sys/netinet/tcp_usrreq.c
+++ b/usr/src/sys/netinet/tcp_usrreq.c
@@ -1,19 +1,25 @@
 /*
 /*

- * Copyright (c) 1982, 1986 Regents of the University of California.
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * 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.

  *
  *

- *     @(#)tcp_usrreq.c        7.9 (Berkeley) %G%
+ *     @(#)tcp_usrreq.c        7.12 (Berkeley) %G%

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

+#include "malloc.h"

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


@@ -206,6 +212,7 @@ tcp_usrreq(so, req, m, nam, rights)
 
                nam->m_len = sizeof (struct sockaddr_in);
                sin->sin_family = AF_INET;
 
                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;
                break;
                sin->sin_port = inp->inp_fport;
                sin->sin_addr = inp->inp_faddr;
                break;


@@ -378,6 +385,7 @@ tcp_ctloutput(op, so, level, optname, mp)
 
 u_long tcp_sendspace = 1024*4;
 u_long tcp_recvspace = 1024*4;
 
 u_long tcp_sendspace = 1024*4;
 u_long tcp_recvspace = 1024*4;

+

 /*
  * Attach TCP protocol to socket, allocating
  * internet protocol control block, tcp control block,
 /*
  * Attach TCP protocol to socket, allocating
  * internet protocol control block, tcp control block,