diff options
author | rwatson <rwatson@FreeBSD.org> | 2007-05-11 09:54:53 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2007-05-11 09:54:53 +0000 |
commit | 46a4c44c3b39d3c635f686c57785c0dd7511f2b6 (patch) | |
tree | 06fe2e804fec39c9d13a2efd9748ff6aa6e81222 /sys | |
parent | 2f7d5b8b3fb4672daf809cabd3678d9fe4db2005 (diff) | |
download | FreeBSD-src-46a4c44c3b39d3c635f686c57785c0dd7511f2b6.zip FreeBSD-src-46a4c44c3b39d3c635f686c57785c0dd7511f2b6.tar.gz |
Remove unneeded wrappers for in_setsockaddr() and in_setpeeraddr(), which
used to exist so pcbinfo locks could be acquired, but are no longer
required as a result of socket/pcb reference model refinements.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netinet/ip_divert.c | 26 | ||||
-rw-r--r-- | sys/netinet/raw_ip.c | 27 | ||||
-rw-r--r-- | sys/netinet/tcp_usrreq.c | 27 |
3 files changed, 6 insertions, 74 deletions
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index d50c921..2d2a314 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -624,28 +624,6 @@ div_pcblist(SYSCTL_HANDLER_ARGS) return error; } -/* - * This is the wrapper function for in_setsockaddr. We just pass down - * the pcbinfo for in_setpeeraddr to lock. - */ -static int -div_sockaddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setsockaddr(so, nam)); -} - -/* - * This is the wrapper function for in_setpeeraddr. We just pass down - * the pcbinfo for in_setpeeraddr to lock. - */ -static int -div_peeraddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setpeeraddr(so, nam)); -} - #ifdef SYSCTL_NODE SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, divert, CTLFLAG_RW, 0, "IPDIVERT"); SYSCTL_PROC(_net_inet_divert, OID_AUTO, pcblist, CTLFLAG_RD, 0, 0, @@ -657,10 +635,10 @@ struct pr_usrreqs div_usrreqs = { .pru_bind = div_bind, .pru_control = in_control, .pru_detach = div_detach, - .pru_peeraddr = div_peeraddr, + .pru_peeraddr = in_setpeeraddr, .pru_send = div_send, .pru_shutdown = div_shutdown, - .pru_sockaddr = div_sockaddr, + .pru_sockaddr = in_setsockaddr, .pru_sosetlabel = in_pcbsosetlabel }; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index d48dca8..0fecafa 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -909,29 +909,6 @@ rip_pcblist(SYSCTL_HANDLER_ARGS) return error; } -/* - * This is the wrapper function for in_setsockaddr. We just pass down - * the pcbinfo for in_setpeeraddr to lock. - */ -static int -rip_sockaddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setsockaddr(so, nam)); -} - -/* - * This is the wrapper function for in_setpeeraddr. We just pass down - * the pcbinfo for in_setpeeraddr to lock. - */ -static int -rip_peeraddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setpeeraddr(so, nam)); -} - - SYSCTL_PROC(_net_inet_raw, OID_AUTO/*XXX*/, pcblist, CTLFLAG_RD, 0, 0, rip_pcblist, "S,xinpcb", "List of active raw IP sockets"); @@ -943,10 +920,10 @@ struct pr_usrreqs rip_usrreqs = { .pru_control = in_control, .pru_detach = rip_detach, .pru_disconnect = rip_disconnect, - .pru_peeraddr = rip_peeraddr, + .pru_peeraddr = in_setpeeraddr, .pru_send = rip_send, .pru_shutdown = rip_shutdown, - .pru_sockaddr = rip_sockaddr, + .pru_sockaddr = in_setsockaddr, .pru_sosetlabel = in_pcbsosetlabel, .pru_close = rip_close, }; diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index b975915..f28b0ba 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -687,29 +687,6 @@ out: #endif /* INET6 */ /* - * This is the wrapper function for in_setsockaddr. We just pass down - * the pcbinfo for in_setsockaddr to lock. We don't want to do the locking - * here because in_setsockaddr will call malloc and can block. - */ -static int -tcp_sockaddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setsockaddr(so, nam)); -} - -/* - * This is the wrapper function for in_setpeeraddr. We just pass down - * the pcbinfo for in_setpeeraddr to lock. - */ -static int -tcp_peeraddr(struct socket *so, struct sockaddr **nam) -{ - - return (in_setpeeraddr(so, nam)); -} - -/* * Mark the connection as being incapable of further output. */ static int @@ -1059,12 +1036,12 @@ struct pr_usrreqs tcp_usrreqs = { .pru_detach = tcp_usr_detach, .pru_disconnect = tcp_usr_disconnect, .pru_listen = tcp_usr_listen, - .pru_peeraddr = tcp_peeraddr, + .pru_peeraddr = in_setpeeraddr, .pru_rcvd = tcp_usr_rcvd, .pru_rcvoob = tcp_usr_rcvoob, .pru_send = tcp_usr_send, .pru_shutdown = tcp_usr_shutdown, - .pru_sockaddr = tcp_sockaddr, + .pru_sockaddr = in_setsockaddr, .pru_sosetlabel = in_pcbsosetlabel, .pru_close = tcp_usr_close, }; |