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

sctp: retire sctp_mtu_size_reset()

Browse Source 
Thanks to Timo Voelker for making me aware that sctp_mtu_size_reset()
is very similar to sctp_pathmtu_adjustment().

MFC after:	3 days
This commit is contained in:
Michael Tuexen 2021-12-30 15:30:11 +01:00
parent 2de2ae331b
commit 1adb91e521
3 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/netinet/sctp_output.c
View File

@ -4244,10 +4244,10 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
mtu -= sizeof(struct udphdr);
}
if (mtu < net->mtu) {
if ((stcb != NULL) && (stcb->asoc.smallest_mtu > mtu)) {
sctp_mtu_size_reset(inp, &stcb->asoc, mtu);
}
net->mtu = mtu;
if ((stcb != NULL) && (stcb->asoc.smallest_mtu > mtu)) {
sctp_pathmtu_adjustment(stcb, mtu, true);
}
}
}
} else if (ro->ro_nh == NULL) {
@ -4586,18 +4586,16 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
mtu -= sizeof(struct udphdr);
}
if (mtu < net->mtu) {
if ((stcb != NULL) && (stcb->asoc.smallest_mtu > mtu)) {
sctp_mtu_size_reset(inp, &stcb->asoc, mtu);
}
net->mtu = mtu;
if ((stcb != NULL) && (stcb->asoc.smallest_mtu > mtu)) {
sctp_pathmtu_adjustment(stcb, mtu, false);
}
}
}
} else if (ifp) {
if (ND_IFINFO(ifp)->linkmtu &&
} else if (ifp != NULL) {
if ((ND_IFINFO(ifp)->linkmtu > 0) &&
(stcb->asoc.smallest_mtu > ND_IFINFO(ifp)->linkmtu)) {
sctp_mtu_size_reset(inp,
&stcb->asoc,
ND_IFINFO(ifp)->linkmtu);
sctp_pathmtu_adjustment(stcb, ND_IFINFO(ifp)->linkmtu, false);
}
}
}

31
sys/netinet/sctputil.c
View File

@ -2905,37 +2905,6 @@ sctp_calculate_len(struct mbuf *m)
return (tlen);
}
void
sctp_mtu_size_reset(struct sctp_inpcb *inp,
struct sctp_association *asoc, uint32_t mtu)
{
/*
* Reset the P-MTU size on this association, this involves changing
* the asoc MTU, going through ANY chunk+overhead larger than mtu to
* allow the DF flag to be cleared.
*/
struct sctp_tmit_chunk *chk;
unsigned int eff_mtu, ovh;
asoc->smallest_mtu = mtu;
if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) {
ovh = SCTP_MIN_OVERHEAD;
} else {
ovh = SCTP_MIN_V4_OVERHEAD;
}
eff_mtu = mtu - ovh;
TAILQ_FOREACH(chk, &asoc->send_queue, sctp_next) {
if (chk->send_size > eff_mtu) {
chk->flags |= CHUNK_FLAGS_FRAGMENT_OK;
}
}
TAILQ_FOREACH(chk, &asoc->sent_queue, sctp_next) {
if (chk->send_size > eff_mtu) {
chk->flags |= CHUNK_FLAGS_FRAGMENT_OK;
}
}
}
/*
* Given an association and starting time of the current RTT period, update
* RTO in number of msecs. net should point to the current network.

3
sys/netinet/sctputil.h
View File

@ -108,9 +108,6 @@ sctp_timer_stop(int, struct sctp_inpcb *, struct sctp_tcb *,
int
sctp_dynamic_set_primary(struct sockaddr *sa, uint32_t vrf_id);
void
sctp_mtu_size_reset(struct sctp_inpcb *, struct sctp_association *, uint32_t);
void
sctp_wakeup_the_read_socket(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
int so_locked