diff options
| author |   chrisz <chrisz@openbsd.org> | 2014-04-06 16:49:40 +0000 |
|---|---|---|
| committer | chrisz <chrisz@openbsd.org> | 2014-04-06 16:49:40 +0000 |
| commit | bd479d06739fe985f21aa8ed08779c9da8507e50 (patch) | |
| tree | 948eb439071cf3c2abdbaf0199e107e78c983624 /sys/netinet/tcp_usrreq.c | |
| parent | Regen .pc and header with new version info. Bump not needed, confirmed (diff) | |
| download | wireguard-openbsd-bd479d06739fe985f21aa8ed08779c9da8507e50.tar.xz wireguard-openbsd-bd479d06739fe985f21aa8ed08779c9da8507e50.zip | |
Remove redundant call to in{,6}_pcbbind() from tcp PRU_CONNECT.
Make sure that in_pcbbind() is called from in_pcbconnect() by KASSERTing that
local port == 0 implies an unspecified local address.
OK claudio@
Diffstat (limited to 'sys/netinet/tcp_usrreq.c')
| -rw-r--r-- | sys/netinet/tcp_usrreq.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index b45ed2dca35..e674a51f88a 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.117 2013/11/22 07:59:09 mpi Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.118 2014/04/06 16:49:40 chrisz Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -274,11 +274,6 @@ tcp_usrreq(so, req, m, nam, control, p) break; } - if (inp->inp_lport == 0) { - error = in6_pcbbind(inp, NULL, p); - if (error) - break; - } error = in6_pcbconnect(inp, nam); } else if (sin->sin_family == AF_INET) #endif /* INET6 */ @@ -291,11 +286,6 @@ tcp_usrreq(so, req, m, nam, control, p) break; } - if (inp->inp_lport == 0) { - error = in_pcbbind(inp, NULL, p); - if (error) - break; - } error = in_pcbconnect(inp, nam); } |