Page MenuHomeFreeBSD

D61685.1795032810.diff
No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D61685.1795032810.diff

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2424,10 +2424,7 @@
/*
* Ack processing.
*/
- if (SEQ_GT(tp->snd_una, tp->iss + (TCP_MAXWIN << tp->snd_scale))) {
- /* Checking SEG.ACK against ISS is definitely redundant. */
- tp->t_flags2 |= TF2_NO_ISS_CHECK;
- }
+ tcp_adapt_iss_check(tp);
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -7681,10 +7681,7 @@
bbr = (struct tcp_bbr *)tp->t_fb_ptr;
lost = bbr->r_ctl.rc_lost;
nsegs = max(1, m->m_pkthdr.lro_nsegs);
- if (SEQ_GEQ(tp->snd_una, tp->iss + (65535 << tp->snd_scale))) {
- /* Checking SEG.ACK against ISS is definitely redundant. */
- tp->t_flags2 |= TF2_NO_ISS_CHECK;
- }
+ tcp_adapt_iss_check(tp);
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -11701,10 +11701,7 @@
INP_WLOCK_ASSERT(tptoinpcb(tp));
rack = (struct tcp_rack *)tp->t_fb_ptr;
- if (SEQ_GEQ(tp->snd_una, tp->iss + (65535 << tp->snd_scale))) {
- /* Checking SEG.ACK against ISS is definitely redundant. */
- tp->t_flags2 |= TF2_NO_ISS_CHECK;
- }
+ tcp_adapt_iss_check(tp);
if (!V_tcp_insecure_ack) {
tcp_seq seq_min;
bool ghost_ack_check;
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -34,6 +34,7 @@
#include <netinet/tcp.h>
#include <netinet/tcp_fsm.h>
+#include <netinet/tcp_seq.h>
#ifdef _KERNEL
#include <net/vnet.h>
@@ -1625,6 +1626,15 @@
th->th_win = htons(th->th_win);
th->th_urp = htons(th->th_urp);
}
+
+static inline void
+tcp_adapt_iss_check(struct tcpcb *tp)
+{
+ if (SEQ_GT(tp->snd_una, tp->iss + (TCP_MAXWIN << tp->snd_scale))) {
+ /* Checking SEG.ACK against ISS is definitely redundant. */
+ tp->t_flags2 |= TF2_NO_ISS_CHECK;
+ }
+}
#endif /* _KERNEL */
#endif /* _NETINET_TCP_VAR_H_ */

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 18, 8:13 PM (22 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41830823
Default Alt Text
D61685.1795032810.diff (2 KB)

Event Timeline