system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-21 07:45:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded wrappers for in_setsockaddr() and in_setpeeraddr(), which

Browse source 
used to exist so pcbinfo locks could be acquired, but are no longer
required as a result of socket/pcb reference model refinements.
This commit is contained in:
Robert Watson 2007-05-11 09:54:53 +00:00
parent 0230a28bf4
commit 169db7b25d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=169461
3 changed files with 6 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sys/netinet/ip_divert.c
View file

@ -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
};

27
sys/netinet/raw_ip.c
View file

@ -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,
};

27
sys/netinet/tcp_usrreq.c
View file

@ -686,29 +686,6 @@ tcp6_usr_accept(struct socket *so, struct sockaddr **nam)
}
#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.
*/
@ -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,
};