[src/netbsd-1-6]: src/sys/netinet Pull up revision 1.156 via patch (requested...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b90bd3e87f8
branches:  netbsd-1-6
changeset: 529179:6b90bd3e87f8
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Oct 21 02:22:26 2002 +0000

description:
Pull up revision 1.156 via patch (requested by itojun in ticket #915):
correct log_refused check (TH_SYN, !TH_RST and !TH_ACK).  PR 18669

diffstat:

 sys/netinet/tcp_input.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r f2c8621f1638 -r 6b90bd3e87f8 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Mon Oct 21 02:17:28 2002 +0000
+++ b/sys/netinet/tcp_input.c   Mon Oct 21 02:22:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.141.4.3 2002/09/06 06:21:17 lukem Exp $        */
+/*     $NetBSD: tcp_input.c,v 1.141.4.4 2002/10/21 02:22:26 lukem Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -152,7 +152,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.141.4.3 2002/09/06 06:21:17 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.141.4.4 2002/10/21 02:22:26 lukem Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -992,7 +992,8 @@
 #endif
                {
                        ++tcpstat.tcps_noport;
-                       if (tcp_log_refused && (tiflags & TH_SYN)) {
+                       if (tcp_log_refused &&
+                           (tiflags & (TH_RST|TH_ACK|TH_SYN)) == TH_SYN) {
                                char src[4*sizeof "123"];
                                char dst[4*sizeof "123"];
 
@@ -1045,7 +1046,8 @@
                }
                if (in6p == NULL) {
                        ++tcpstat.tcps_noport;
-                       if (tcp_log_refused && (tiflags & TH_SYN)) {
+                       if (tcp_log_refused &&
+                           (tiflags & (TH_RST|TH_ACK|TH_SYN)) == TH_SYN) {
                                char src[INET6_ADDRSTRLEN];
                                char dst[INET6_ADDRSTRLEN];