From: Xin Li <delphij@FreeBSD.org>
Date: Tue, 14 May 2013 19:53:02 +0000 (-0700)
Subject: Add ECE and CWR bits for TCP header, defined in RFC 3168.
X-Git-Tag: libpcap-1.9-bp~921
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/96e5ac55ec39b1682830070489327e40bcd3dbff

Add ECE and CWR bits for TCP header, defined in RFC 3168.
---

diff --git a/pcap-filter.manmisc.in b/pcap-filter.manmisc.in
index 87e1cd1c..880c7b89 100644
--- a/pcap-filter.manmisc.in
+++ b/pcap-filter.manmisc.in
@@ -876,7 +876,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/scanner.l b/scanner.l
index 1000b7a3..3bdf9c45 100644
--- a/scanner.l
+++ b/scanner.l
@@ -435,6 +435,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(yyextra, (char *)yytext); return ID; }
 "\\"[^ !()\n\t]+	{ yylval->s = sdup(yyextra, (char *)yytext + 1); return ID; }