From f172dc1bd4202a6603656f6ba3482f3c32938fe4 Mon Sep 17 00:00:00 2001 From: luigi Date: Mon, 13 May 2002 10:21:13 +0000 Subject: Remove custom definitions (IP_FW_TCPF_SYN etc.) of TCP header flags which are the same as the original ones (TH_SYN etc.) --- sys/netinet/ip_fw.c | 3 +-- sys/netinet/ip_fw.h | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'sys') diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index 03ec6cc..016022e 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -272,8 +272,7 @@ tcpflg_match(struct tcphdr *tcp, struct ip_fw *f) * other flag requirements. */ if ((f->fw_ipflg & IP_FW_IF_TCPEST) && - ((tcp->th_flags & (IP_FW_TCPF_RST | IP_FW_TCPF_ACK | - IP_FW_TCPF_SYN)) == IP_FW_TCPF_SYN)) + ((tcp->th_flags & (TH_RST | TH_ACK | TH_SYN)) == TH_SYN)) return 0; flg_set = tcp->th_flags & f->fw_tcpf; diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index c41eb31..e3ffe20 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -310,16 +310,6 @@ struct ipfw_dyn_rule { #define IP_FW_TCPOPT_CC 0x10 /* - * Definitions for TCP flags. - */ -#define IP_FW_TCPF_FIN TH_FIN -#define IP_FW_TCPF_SYN TH_SYN -#define IP_FW_TCPF_RST TH_RST -#define IP_FW_TCPF_PSH TH_PUSH -#define IP_FW_TCPF_ACK TH_ACK -#define IP_FW_TCPF_URG TH_URG - -/* * Main firewall chains definitions and global var's definitions. */ #ifdef _KERNEL -- cgit v1.1