Module Name: src
Committed By: rmind
Date: Thu Aug 29 17:49:21 UTC 2013
Modified Files:
src/sys/dev: kttcp.c
src/sys/kern: uipc_socket.c uipc_socket2.c uipc_syscalls.c
uipc_usrreq.c
src/sys/net: if_gre.c
src/sys/netbt: l2cap_socket.c rfcomm_socket.c sco_socket.c
src/sys/netinet: tcp_input.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: socketvar.h
Log Message:
Remove SS_ISCONFIRMING, it is unused and TP4 will not come back.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/kttcp.c
cvs rdiff -u -r1.216 -r1.217 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.112 -r1.113 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.161 -r1.162 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.143 -r1.144 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.150 -r1.151 src/sys/net/if_gre.c
cvs rdiff -u -r1.9 -r1.10 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.327 -r1.328 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.34 -r1.35 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.130 -r1.131 src/sys/sys/socketvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/kttcp.c
diff -u src/sys/dev/kttcp.c:1.30 src/sys/dev/kttcp.c:1.31
--- src/sys/dev/kttcp.c:1.30 Thu Dec 22 02:00:19 2011
+++ src/sys/dev/kttcp.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.30 2011/12/22 02:00:19 jakllsch Exp $ */
+/* $NetBSD: kttcp.c,v 1.31 2013/08/29 17:49:21 rmind Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.30 2011/12/22 02:00:19 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.31 2013/08/29 17:49:21 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -226,10 +226,10 @@ kttcp_sosend(struct socket *so, unsigned
}
if ((so->so_state & SS_ISCONNECTED) == 0) {
if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
- if ((so->so_state & SS_ISCONFIRMING) == 0)
- snderr(ENOTCONN);
- } else
+ snderr(ENOTCONN);
+ } else {
snderr(EDESTADDRREQ);
+ }
}
space = sbspace(&so->so_snd);
if (flags & MSG_OOB)
@@ -375,8 +375,6 @@ kttcp_soreceive(struct socket *so, unsig
if (mp)
*mp = NULL;
solock(so);
- if (so->so_state & SS_ISCONFIRMING && resid)
- (*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, NULL);
restart:
if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0)
return (error);
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.216 src/sys/kern/uipc_socket.c:1.217
--- src/sys/kern/uipc_socket.c:1.216 Fri Aug 2 20:00:33 2013
+++ src/sys/kern/uipc_socket.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.216 2013/08/02 20:00:33 spz Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.217 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.216 2013/08/02 20:00:33 spz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.217 2013/08/29 17:49:21 rmind Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -927,8 +927,7 @@ sosend(struct socket *so, struct mbuf *a
}
if ((so->so_state & SS_ISCONNECTED) == 0) {
if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
- if ((so->so_state & SS_ISCONFIRMING) == 0 &&
- !(resid == 0 && clen != 0)) {
+ if (resid || clen == 0) {
error = ENOTCONN;
goto release;
}
@@ -1185,9 +1184,6 @@ soreceive(struct socket *so, struct mbuf
*/
s = splsoftnet();
solock(so);
- if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
- (*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, l);
-
restart:
if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) {
sounlock(so);
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.112 src/sys/kern/uipc_socket2.c:1.113
--- src/sys/kern/uipc_socket2.c:1.112 Fri Jun 28 01:23:38 2013
+++ src/sys/kern/uipc_socket2.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.112 2013/06/28 01:23:38 matt Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.113 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.112 2013/06/28 01:23:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.113 2013/08/29 17:49:21 rmind Exp $");
#include "opt_mbuftrace.h"
#include "opt_sb_max.h"
@@ -175,7 +175,7 @@ soisconnected(struct socket *so)
KASSERT(solocked(so));
KASSERT(head == NULL || solocked2(so, head));
- so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
+ so->so_state &= ~(SS_ISCONNECTING | SS_ISDISCONNECTING);
so->so_state |= SS_ISCONNECTED;
if (head && so->so_onq == &head->so_q0) {
if ((so->so_options & SO_ACCEPTFILTER) == 0) {
@@ -239,21 +239,19 @@ soinit2(void)
* connection is possible (subject to space constraints, etc.)
* then we allocate a new structure, propoerly linked into the
* data structure of the original socket, and return this.
- * Connstatus may be 0, SS_ISCONFIRMING, or SS_ISCONNECTED.
*/
struct socket *
-sonewconn(struct socket *head, int connstatus)
+sonewconn(struct socket *head, bool conncomplete)
{
struct socket *so;
int soqueue, error;
- KASSERT(connstatus == 0 || connstatus == SS_ISCONFIRMING ||
- connstatus == SS_ISCONNECTED);
KASSERT(solocked(head));
if ((head->so_options & SO_ACCEPTFILTER) != 0)
- connstatus = 0;
- soqueue = connstatus ? 1 : 0;
+ conncomplete = false;
+ soqueue = conncomplete ? 1 : 0;
+
if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2)
return NULL;
so = soget(false);
@@ -301,10 +299,10 @@ out:
soput(so);
return NULL;
}
- if (connstatus) {
+ if (conncomplete) {
sorwakeup(head);
cv_broadcast(&head->so_cv);
- so->so_state |= connstatus;
+ so->so_state |= SS_ISCONNECTED;
}
return so;
}
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.161 src/sys/kern/uipc_syscalls.c:1.162
--- src/sys/kern/uipc_syscalls.c:1.161 Mon Jun 3 23:45:31 2013
+++ src/sys/kern/uipc_syscalls.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.161 2013/06/03 23:45:31 christos Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.162 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.161 2013/06/03 23:45:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.162 2013/08/29 17:49:21 rmind Exp $");
#include "opt_pipe.h"
@@ -1289,7 +1289,6 @@ pipe1(struct lwp *l, register_t *retval,
/*
* Get socket name.
*/
-/* ARGSUSED */
int
do_sys_getsockname(struct lwp *l, int fd, int which, struct mbuf **nam)
{
@@ -1304,8 +1303,7 @@ do_sys_getsockname(struct lwp *l, int fd
MCLAIM(m, so->so_mowner);
solock(so);
- if (which == PRU_PEERADDR
- && (so->so_state & (SS_ISCONNECTED | SS_ISCONFIRMING)) == 0) {
+ if (which == PRU_PEERADDR && (so->so_state & SS_ISCONNECTED) == 0) {
error = ENOTCONN;
} else {
*nam = m;
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.143 src/sys/kern/uipc_usrreq.c:1.144
--- src/sys/kern/uipc_usrreq.c:1.143 Thu Aug 1 19:33:21 2013
+++ src/sys/kern/uipc_usrreq.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.143 2013/08/01 19:33:21 drochner Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.144 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.143 2013/08/01 19:33:21 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.144 2013/08/29 17:49:21 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1046,7 +1046,7 @@ unp_connect(struct socket *so, struct mb
KASSERT((so2->so_options & SO_ACCEPTCONN) == 0 ||
so2->so_lock == uipc_lock);
if ((so2->so_options & SO_ACCEPTCONN) == 0 ||
- (so3 = sonewconn(so2, 0)) == NULL) {
+ (so3 = sonewconn(so2, false)) == NULL) {
error = ECONNREFUSED;
sounlock(so);
goto bad;
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.150 src/sys/net/if_gre.c:1.151
--- src/sys/net/if_gre.c:1.150 Wed Nov 9 19:43:22 2011
+++ src/sys/net/if_gre.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.150 2011/11/09 19:43:22 christos Exp $ */
+/* $NetBSD: if_gre.c,v 1.151 2013/08/29 17:49:21 rmind Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.150 2011/11/09 19:43:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.151 2013/08/29 17:49:21 rmind Exp $");
#include "opt_atalk.h"
#include "opt_gre.h"
@@ -516,10 +516,10 @@ gre_sosend(struct socket *so, struct mbu
}
if ((so->so_state & SS_ISCONNECTED) == 0) {
if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
- if ((so->so_state & SS_ISCONFIRMING) == 0)
- snderr(ENOTCONN);
- } else
+ snderr(ENOTCONN);
+ } else {
snderr(EDESTADDRREQ);
+ }
}
space = sbspace(&so->so_snd);
if (resid > so->so_snd.sb_hiwat)
@@ -566,9 +566,6 @@ gre_soreceive(struct socket *so, struct
*mp = NULL;
KASSERT(pr->pr_flags & PR_ATOMIC);
-
- if (so->so_state & SS_ISCONFIRMING)
- (*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, curlwp);
restart:
if ((error = sblock(&so->so_rcv, M_NOWAIT)) != 0) {
return error;
Index: src/sys/netbt/l2cap_socket.c
diff -u src/sys/netbt/l2cap_socket.c:1.9 src/sys/netbt/l2cap_socket.c:1.10
--- src/sys/netbt/l2cap_socket.c:1.9 Wed Aug 6 15:01:24 2008
+++ src/sys/netbt/l2cap_socket.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: l2cap_socket.c,v 1.9 2008/08/06 15:01:24 plunky Exp $ */
+/* $NetBSD: l2cap_socket.c,v 1.10 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.9 2008/08/06 15:01:24 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.10 2013/08/29 17:49:21 rmind Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -336,7 +336,7 @@ l2cap_newconn(void *arg, struct sockaddr
struct socket *so = arg;
DPRINTF("New Connection\n");
- so = sonewconn(so, 0);
+ so = sonewconn(so, false);
if (so == NULL)
return NULL;
Index: src/sys/netbt/rfcomm_socket.c
diff -u src/sys/netbt/rfcomm_socket.c:1.10 src/sys/netbt/rfcomm_socket.c:1.11
--- src/sys/netbt/rfcomm_socket.c:1.10 Wed Aug 6 15:01:24 2008
+++ src/sys/netbt/rfcomm_socket.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_socket.c,v 1.10 2008/08/06 15:01:24 plunky Exp $ */
+/* $NetBSD: rfcomm_socket.c,v 1.11 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.10 2008/08/06 15:01:24 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.11 2013/08/29 17:49:21 rmind Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -338,7 +338,7 @@ rfcomm_newconn(void *arg, struct sockadd
struct socket *so = arg;
DPRINTF("New Connection\n");
- so = sonewconn(so, 0);
+ so = sonewconn(so, false);
if (so == NULL)
return NULL;
Index: src/sys/netbt/sco_socket.c
diff -u src/sys/netbt/sco_socket.c:1.11 src/sys/netbt/sco_socket.c:1.12
--- src/sys/netbt/sco_socket.c:1.11 Wed Aug 6 15:01:24 2008
+++ src/sys/netbt/sco_socket.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sco_socket.c,v 1.11 2008/08/06 15:01:24 plunky Exp $ */
+/* $NetBSD: sco_socket.c,v 1.12 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.11 2008/08/06 15:01:24 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.12 2013/08/29 17:49:21 rmind Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
@@ -322,7 +322,7 @@ sco_newconn(void *arg, struct sockaddr_b
struct socket *so = arg;
DPRINTF("New Connection\n");
- so = sonewconn(so, 0);
+ so = sonewconn(so, false);
if (so == NULL)
return NULL;
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.327 src/sys/netinet/tcp_input.c:1.328
--- src/sys/netinet/tcp_input.c:1.327 Thu Jun 6 00:03:14 2013
+++ src/sys/netinet/tcp_input.c Thu Aug 29 17:49:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.327 2013/06/06 00:03:14 christos Exp $ */
+/* $NetBSD: tcp_input.c,v 1.328 2013/08/29 17:49:20 rmind Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.327 2013/06/06 00:03:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.328 2013/08/29 17:49:20 rmind Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -3967,7 +3967,7 @@ syn_cache_get(struct sockaddr *src, stru
* to the new one.
*/
oso = so;
- so = sonewconn(so, SS_ISCONNECTED);
+ so = sonewconn(so, true);
if (so == NULL)
goto resetandabort;
Index: src/sys/rump/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.34 src/sys/rump/net/lib/libsockin/sockin.c:1.35
--- src/sys/rump/net/lib/libsockin/sockin.c:1.34 Sun Jun 23 19:24:08 2013
+++ src/sys/rump/net/lib/libsockin/sockin.c Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.34 2013/06/23 19:24:08 stacktic Exp $ */
+/* $NetBSD: sockin.c,v 1.35 2013/08/29 17:49:21 rmind Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.34 2013/06/23 19:24:08 stacktic Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.35 2013/08/29 17:49:21 rmind Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -280,7 +280,7 @@ sockin_accept(struct socket *so)
return;
mutex_enter(softnet_lock);
- nso = sonewconn(so, SS_ISCONNECTED);
+ nso = sonewconn(so, true);
if (nso == NULL)
goto errout;
if (registersock(nso, news) != 0)
Index: src/sys/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.130 src/sys/sys/socketvar.h:1.131
--- src/sys/sys/socketvar.h:1.130 Thu Jun 27 18:53:18 2013
+++ src/sys/sys/socketvar.h Thu Aug 29 17:49:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.130 2013/06/27 18:53:18 christos Exp $ */
+/* $NetBSD: socketvar.h,v 1.131 2013/08/29 17:49:21 rmind Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -204,7 +204,6 @@ do { \
#define SS_ISDISCONNECTED 0x800 /* socket disconnected from peer */
#define SS_ASYNC 0x100 /* async i/o notify */
-#define SS_ISCONFIRMING 0x200 /* deciding to accept connection req */
#define SS_MORETOCOME 0x400 /*
* hint from sosend to lower layer;
* more data coming
@@ -307,7 +306,7 @@ void soisdisconnected(struct socket *);
void soisdisconnecting(struct socket *);
int solisten(struct socket *, int, struct lwp *);
struct socket *
- sonewconn(struct socket *, int);
+ sonewconn(struct socket *, bool);
void soqinsque(struct socket *, struct socket *, int);
int soqremque(struct socket *, int);
int soreceive(struct socket *, struct mbuf **, struct uio *,
