d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused pcbinfo arguments to in_setsockaddr() and

Browse Source 
in_setpeeraddr().
This commit is contained in:
Robert Watson 2007-05-01 16:31:02 +00:00
parent c2fa6c1890
commit 84ca8aa609
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netinet/in_pcb.c
View File

@ -796,8 +796,7 @@ in_sockaddr(in_port_t port, struct in_addr *addr_p)
* because there actually /is/ a programming error somewhere... XXX)
*/
int
in_setsockaddr(struct socket *so, struct sockaddr **nam,
struct inpcbinfo *pcbinfo)
in_setsockaddr(struct socket *so, struct sockaddr **nam)
{
struct inpcb *inp;
struct in_addr addr;
@ -819,8 +818,7 @@ in_setsockaddr(struct socket *so, struct sockaddr **nam,
* The wrapper function will pass down the pcbinfo for this function to lock.
*/
int
in_setpeeraddr(struct socket *so, struct sockaddr **nam,
struct inpcbinfo *pcbinfo)
in_setpeeraddr(struct socket *so, struct sockaddr **nam)
{
struct inpcb *inp;
struct in_addr addr;

4
sys/netinet/in_pcb.h
View File

@ -391,8 +391,8 @@ void in_pcbnotifyall(struct inpcbinfo *pcbinfo, struct in_addr,
int, struct inpcb *(*)(struct inpcb *, int));
void in_pcbrehash(struct inpcb *);
void in_pcbsetsolabel(struct socket *so);
int in_setpeeraddr(struct socket *so, struct sockaddr **nam, struct inpcbinfo *pcbinfo);
int in_setsockaddr(struct socket *so, struct sockaddr **nam, struct inpcbinfo *pcbinfo);
int in_setpeeraddr(struct socket *so, struct sockaddr **nam);
int in_setsockaddr(struct socket *so, struct sockaddr **nam);
struct sockaddr *
in_sockaddr(in_port_t port, struct in_addr *addr);
void in_pcbsosetlabel(struct socket *so);

4
sys/netinet/ip_divert.c
View File

@ -630,7 +630,7 @@ div_pcblist(SYSCTL_HANDLER_ARGS)
static int
div_sockaddr(struct socket *so, struct sockaddr **nam)
{
return (in_setsockaddr(so, nam, &divcbinfo));
return (in_setsockaddr(so, nam));
}
/*
@ -640,7 +640,7 @@ div_sockaddr(struct socket *so, struct sockaddr **nam)
static int
div_peeraddr(struct socket *so, struct sockaddr **nam)
{
return (in_setpeeraddr(so, nam, &divcbinfo));
return (in_setpeeraddr(so, nam));
}
#ifdef SYSCTL_NODE

4
sys/netinet/raw_ip.c
View File

@ -915,7 +915,7 @@ rip_pcblist(SYSCTL_HANDLER_ARGS)
static int
rip_sockaddr(struct socket *so, struct sockaddr **nam)
{
return (in_setsockaddr(so, nam, &ripcbinfo));
return (in_setsockaddr(so, nam));
}
/*
@ -925,7 +925,7 @@ rip_sockaddr(struct socket *so, struct sockaddr **nam)
static int
rip_peeraddr(struct socket *so, struct sockaddr **nam)
{
return (in_setpeeraddr(so, nam, &ripcbinfo));
return (in_setpeeraddr(so, nam));
}

4
sys/netinet/tcp_usrreq.c
View File

@ -694,7 +694,7 @@ tcp6_usr_accept(struct socket *so, struct sockaddr **nam)
static int
tcp_sockaddr(struct socket *so, struct sockaddr **nam)
{
return (in_setsockaddr(so, nam, &tcbinfo));
return (in_setsockaddr(so, nam));
}
/*
@ -704,7 +704,7 @@ tcp_sockaddr(struct socket *so, struct sockaddr **nam)
static int
tcp_peeraddr(struct socket *so, struct sockaddr **nam)
{
return (in_setpeeraddr(so, nam, &tcbinfo));
return (in_setpeeraddr(so, nam));
}
/*

4
sys/netinet/udp_usrreq.c
View File

@ -1139,7 +1139,7 @@ static int
udp_sockaddr(struct socket *so, struct sockaddr **nam)
{
return (in_setsockaddr(so, nam, &udbinfo));
return (in_setsockaddr(so, nam));
}
/*
@ -1150,7 +1150,7 @@ static int
udp_peeraddr(struct socket *so, struct sockaddr **nam)
{
return (in_setpeeraddr(so, nam, &udbinfo));
return (in_setpeeraddr(so, nam));
}
struct pr_usrreqs udp_usrreqs = {

4
sys/netinet6/in6_pcb.c
View File

@ -563,7 +563,7 @@ in6_mapped_sockaddr(struct socket *so, struct sockaddr **nam)
KASSERT(inp != NULL, ("in6_mapped_sockaddr: inp == NULL"));
if ((inp->inp_vflag & (INP_IPV4 | INP_IPV6)) == INP_IPV4) {
error = in_setsockaddr(so, nam, &tcbinfo);
error = in_setsockaddr(so, nam);
if (error == 0)
in6_sin_2_v4mapsin6_in_sock(nam);
} else {
@ -584,7 +584,7 @@ in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam)
KASSERT(inp != NULL, ("in6_mapped_peeraddr: inp == NULL"));
if ((inp->inp_vflag & (INP_IPV4 | INP_IPV6)) == INP_IPV4) {
error = in_setpeeraddr(so, nam, &tcbinfo);
error = in_setpeeraddr(so, nam);
if (error == 0)
in6_sin_2_v4mapsin6_in_sock(nam);
} else