vitalif
/
f-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge branch 'master' of https://github.com/F-Stack/f-stack" 

Refer #322 #323 #343

This reverts commit 2bc927fd77, reversing
changes made to 2576201343.
dev
fengbojiang(姜凤波) 2019-03-14 18:07:36 +08:00
parent 773060480a
commit 944e508861
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freebsd/netinet/in_pcb.c
View File

@ -1126,10 +1126,7 @@ if (lport == 0)
ifp_sin.sin_len = sizeof(ifp_sin);
ifa = ifa_ifwithnet((struct sockaddr *)&ifp_sin, 0, RT_ALL_FIBS);
if (ifa == NULL) {
ifp_sin.sin_addr.s_addr = faddr.s_addr;
ifa = ifa_ifwithnet((struct sockaddr *)&ifp_sin, 0, RT_ALL_FIBS);
if ( ifa == NULL )
return (EADDRNOTAVAIL);
return (EADDRNOTAVAIL);
}
ifp = ifa->ifa_ifp;
while (lport == 0) {

20
freebsd/netinet/tcp_usrreq.c
View File

@ -1321,22 +1321,14 @@ tcp_connect(struct tcpcb *tp, struct sockaddr *nam, struct thread *td)
error = EADDRINUSE;
goto out;
}
// inp->inp_lport != lport means in_pcbconnect_setup selected new port to inp->inp_lport.
// inp will inhash.
if (in_pcbinshash(inp) != 0) {
inp->inp_laddr.s_addr = INADDR_ANY;
inp->inp_lport = 0;
return (EAGAIN);
}
}
else
{
// app call bind() and connect(), lport is set when bind, and the inp is inhashed in bind() function.
// in_pcbconnect_setup() update inp->inp_faddr/inp->inp_fport, so inp should be rehashed.
in_pcbrehash(inp);
if (in_pcbinshash(inp) != 0) {
inp->inp_laddr.s_addr = INADDR_ANY;
inp->inp_lport = 0;
return (EAGAIN);
}
if (anonport) {
inp->inp_flags |= INP_ANONPORT;
}