aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiren Panchasara <hiren@FreeBSD.org>2013-05-16 05:16:56 +0000
committerHiren Panchasara <hiren@FreeBSD.org>2013-05-16 05:16:56 +0000
commita385d0b340ca59b346e65e7652c5ff4a53b82c60 (patch)
treec1666a5d309c9fd784f2b3b46f3a9533cb2626ad
parent78a4f635f811234260878856babc787cebe8bae5 (diff)
downloadsrc-a385d0b340ca59b346e65e7652c5ff4a53b82c60.tar.gz
src-a385d0b340ca59b346e65e7652c5ff4a53b82c60.zip
Add tcp header flags ECE and CWR defined in RFC 3168.
PR: 140349 Submitted by: Alan Amesbury <amesbury@umn.edu> (earlier version) Reviewed by: delphij Approved by: sbruno (mentor)
Notes
Notes: svn path=/head/; revision=250693
-rw-r--r--contrib/libpcap/pcap-filter.manmisc3
-rw-r--r--contrib/libpcap/pcap-filter.manmisc.in3
-rw-r--r--contrib/libpcap/scanner.l2
3 files changed, 6 insertions, 2 deletions
diff --git a/contrib/libpcap/pcap-filter.manmisc b/contrib/libpcap/pcap-filter.manmisc
index 293a241d226e..360c034b80c5 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 d7b4b0a5f0f3..c63f1bbf3939 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 88c0028320fb..ae726bc8ba2f 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; }