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

Always look in the TCP pool.

Browse Source 
This fixes issues with a restarting peer when the listening
1-to-1 style socket is closed.

MFC after: 3 days
This commit is contained in:
Michael Tuexen 2016-01-28 16:05:46 +00:00
parent 3f51d8888a
commit 79b67faaf6
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netinet/sctp_input.c
View File

@ -5688,6 +5688,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
if (net->port == 0) {
sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr));
}
printf("Changing remote encaps port from %u to %u.\n", ntohs(net->port), ntohs(port));
net->port = port;
}
#endif
@ -5719,6 +5720,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
if (net->port == 0) {
sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr));
}
printf("Changing remote encaps port from %u to %u.\n", ntohs(net->port), ntohs(port));
net->port = port;
}
#endif
@ -5831,6 +5833,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
if (net->port == 0) {
sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr));
}
printf("Changing remote encaps port from %u to %u.\n", ntohs(net->port), ntohs(port));
net->port = port;
}
#endif

17
sys/netinet/sctp_pcb.c
View File

@ -2256,7 +2256,6 @@ sctp_findassociation_addr(struct mbuf *m, int offset,
struct sctphdr *sh, struct sctp_chunkhdr *ch,
struct sctp_inpcb **inp_p, struct sctp_nets **netp, uint32_t vrf_id)
{
int find_tcp_pool;
struct sctp_tcb *stcb;
struct sctp_inpcb *inp;
@ -2268,25 +2267,13 @@ sctp_findassociation_addr(struct mbuf *m, int offset,
return (stcb);
}
}
find_tcp_pool = 0;
/*
* Don't consider INIT chunks since that breaks 1-to-1 sockets: When
* a server closes the listener, incoming INIT chunks are not
* responsed by an INIT-ACK chunk.
*/
if ((ch->chunk_type != SCTP_INITIATION_ACK) &&
(ch->chunk_type != SCTP_COOKIE_ACK) &&
(ch->chunk_type != SCTP_COOKIE_ECHO)) {
/* Other chunk types go to the tcp pool. */
find_tcp_pool = 1;
}
if (inp_p) {
stcb = sctp_findassociation_addr_sa(src, dst, inp_p, netp,
find_tcp_pool, vrf_id);
1, vrf_id);
inp = *inp_p;
} else {
stcb = sctp_findassociation_addr_sa(src, dst, &inp, netp,
find_tcp_pool, vrf_id);
1, vrf_id);
}
SCTPDBG(SCTP_DEBUG_PCB1, "stcb:%p inp:%p\n", (void *)stcb, (void *)inp);
if (stcb == NULL && inp) {