Remove custom definitions (IP_FW_TCPF_SYN etc.) of TCP header flags

which are the same as the original ones (TH_SYN etc.)
This commit is contained in:
Luigi Rizzo 2002-05-13 10:21:13 +00:00
parent ed81aa8668
commit 2f8707ca5d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=96509
2 changed files with 1 additions and 12 deletions

View File

@ -272,8 +272,7 @@ tcpflg_match(struct tcphdr *tcp, struct ip_fw *f)
* other flag requirements. * other flag requirements.
*/ */
if ((f->fw_ipflg & IP_FW_IF_TCPEST) && if ((f->fw_ipflg & IP_FW_IF_TCPEST) &&
((tcp->th_flags & (IP_FW_TCPF_RST | IP_FW_TCPF_ACK | ((tcp->th_flags & (TH_RST | TH_ACK | TH_SYN)) == TH_SYN))
IP_FW_TCPF_SYN)) == IP_FW_TCPF_SYN))
return 0; return 0;
flg_set = tcp->th_flags & f->fw_tcpf; flg_set = tcp->th_flags & f->fw_tcpf;

View File

@ -309,16 +309,6 @@ struct ipfw_dyn_rule {
#define IP_FW_TCPOPT_TS 0x08 #define IP_FW_TCPOPT_TS 0x08
#define IP_FW_TCPOPT_CC 0x10 #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. * Main firewall chains definitions and global var's definitions.
*/ */