From 9b71c4e88b74ba3278cb5cc8c025915dcc4d1ec7 Mon Sep 17 00:00:00 2001 From: hiren Date: Thu, 16 May 2013 05:16:56 +0000 Subject: Add tcp header flags ECE and CWR defined in RFC 3168. PR: 140349 Submitted by: Alan Amesbury (earlier version) Reviewed by: delphij Approved by: sbruno (mentor) --- contrib/libpcap/pcap-filter.manmisc | 3 ++- contrib/libpcap/pcap-filter.manmisc.in | 3 ++- contrib/libpcap/scanner.l | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/libpcap/pcap-filter.manmisc b/contrib/libpcap/pcap-filter.manmisc index 293a241..360c034 100644 --- a/contrib/libpcap/pcap-filter.manmisc +++ b/contrib/libpcap/pcap-filter.manmisc @@ -783,7 +783,8 @@ The following ICMP type field values are available: \fBicmp-echoreply\fP, The following TCP flags field values are available: \fBtcp-fin\fP, \fBtcp-syn\fP, \fBtcp-rst\fP, \fBtcp-push\fP, -\fBtcp-ack\fP, \fBtcp-urg\fP. +\fBtcp-ack\fP, \fBtcp-urg\fP, \fBtcp-ece\fP, +\fBtcp-cwr\fP. .LP Primitives may be combined using: .IP diff --git a/contrib/libpcap/pcap-filter.manmisc.in b/contrib/libpcap/pcap-filter.manmisc.in index d7b4b0a..c63f1bb 100644 --- a/contrib/libpcap/pcap-filter.manmisc.in +++ b/contrib/libpcap/pcap-filter.manmisc.in @@ -783,7 +783,8 @@ The following ICMP type field values are available: \fBicmp-echoreply\fP, The following TCP flags field values are available: \fBtcp-fin\fP, \fBtcp-syn\fP, \fBtcp-rst\fP, \fBtcp-push\fP, -\fBtcp-ack\fP, \fBtcp-urg\fP. +\fBtcp-ack\fP, \fBtcp-urg\fP, \fBtcp-ece\fP, +\fBtcp-cwr\fP. .LP Primitives may be combined using: .IP diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l index 88c0028..ae726bc 100644 --- a/contrib/libpcap/scanner.l +++ b/contrib/libpcap/scanner.l @@ -385,6 +385,8 @@ tcp-rst { yylval.i = 0x04; return NUM; } tcp-push { yylval.i = 0x08; return NUM; } tcp-ack { yylval.i = 0x10; return NUM; } tcp-urg { yylval.i = 0x20; return NUM; } +tcp-ece { yylval.i = 0x40; return NUM; } +tcp-cwr { yylval.i = 0x80; return NUM; } [A-Za-z0-9]([-_.A-Za-z0-9]*[.A-Za-z0-9])? { yylval.s = sdup((char *)yytext); return ID; } "\\"[^ !()\n\t]+ { yylval.s = sdup((char *)yytext + 1); return ID; } -- cgit v1.1