From f861330504a73aecaca721e0ce1752528377770e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Tue, 14 Sep 1999 16:14:05 +0000 Subject: [PATCH] Fix some more disordering, as well as the description string for the net.inet.tcp.drop_synfin sysctl, which for some mysterious reason said "Drop TCP packets with FIN+ACK set" (instead of "...with SYN+FIN set") --- sys/conf/options | 2 +- sys/netinet/tcp_input.c | 12 ++++++------ sys/netinet/tcp_reass.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index c7458add5d91..d29884b0b9b7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -228,8 +228,8 @@ PPP_FILTER opt_ppp.h SLIP_IFF_OPTS opt_slip.h TCP_COMPAT_42 opt_compat.h TCPDEBUG -TCP_RESTRICT_RST opt_tcp_input.h TCP_DROP_SYNFIN opt_tcp_input.h +TCP_RESTRICT_RST opt_tcp_input.h # ATM (HARP version) ATM_CORE opt_atm.h diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 7fa0da2cd779..e45c64b6c9d1 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -94,18 +94,18 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, delayed_ack, CTLFLAG_RW, &tcp_delack_enabled, 0, "Delay ACK to try and piggyback it onto a data packet"); +#ifdef TCP_DROP_SYNFIN +static int drop_synfin = 0; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, drop_synfin, CTLFLAG_RW, + &drop_synfin, 0, "Drop TCP packets with SYN+FIN set"); +#endif + #ifdef TCP_RESTRICT_RST static int restrict_rst = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, restrict_rst, CTLFLAG_RW, &restrict_rst, 0, "Restrict RST emission"); #endif -#ifdef TCP_DROP_SYNFIN -static int drop_synfin = 0; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, drop_synfin, CTLFLAG_RW, - &drop_synfin, 0, "Drop TCP packets with FIN+ACK set"); -#endif - struct inpcbhead tcb; struct inpcbinfo tcbinfo; diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 7fa0da2cd779..e45c64b6c9d1 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -94,18 +94,18 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, delayed_ack, CTLFLAG_RW, &tcp_delack_enabled, 0, "Delay ACK to try and piggyback it onto a data packet"); +#ifdef TCP_DROP_SYNFIN +static int drop_synfin = 0; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, drop_synfin, CTLFLAG_RW, + &drop_synfin, 0, "Drop TCP packets with SYN+FIN set"); +#endif + #ifdef TCP_RESTRICT_RST static int restrict_rst = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, restrict_rst, CTLFLAG_RW, &restrict_rst, 0, "Restrict RST emission"); #endif -#ifdef TCP_DROP_SYNFIN -static int drop_synfin = 0; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, drop_synfin, CTLFLAG_RW, - &drop_synfin, 0, "Drop TCP packets with FIN+ACK set"); -#endif - struct inpcbhead tcb; struct inpcbinfo tcbinfo;