From owner-svn-src-head@FreeBSD.ORG Thu May 16 05:16:58 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A9CF7DB7; Thu, 16 May 2013 05:16:58 +0000 (UTC) (envelope-from hiren@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 81959EE5; Thu, 16 May 2013 05:16:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4G5GvZR076412; Thu, 16 May 2013 05:16:57 GMT (envelope-from hiren@svn.freebsd.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4G5Gvv8076406; Thu, 16 May 2013 05:16:57 GMT (envelope-from hiren@svn.freebsd.org) Message-Id: <201305160516.r4G5Gvv8076406@svn.freebsd.org> From: Hiren Panchasara Date: Thu, 16 May 2013 05:16:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250693 - head/contrib/libpcap X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2013 05:16:58 -0000 Author: hiren Date: Thu May 16 05:16:56 2013 New Revision: 250693 URL: http://svnweb.freebsd.org/changeset/base/250693 Log: 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) Modified: head/contrib/libpcap/pcap-filter.manmisc head/contrib/libpcap/pcap-filter.manmisc.in head/contrib/libpcap/scanner.l Modified: head/contrib/libpcap/pcap-filter.manmisc ============================================================================== --- head/contrib/libpcap/pcap-filter.manmisc Thu May 16 03:51:00 2013 (r250692) +++ head/contrib/libpcap/pcap-filter.manmisc Thu May 16 05:16:56 2013 (r250693) @@ -783,7 +783,8 @@ The following ICMP type field values are 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 Modified: head/contrib/libpcap/pcap-filter.manmisc.in ============================================================================== --- head/contrib/libpcap/pcap-filter.manmisc.in Thu May 16 03:51:00 2013 (r250692) +++ head/contrib/libpcap/pcap-filter.manmisc.in Thu May 16 05:16:56 2013 (r250693) @@ -783,7 +783,8 @@ The following ICMP type field values are 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 Modified: head/contrib/libpcap/scanner.l ============================================================================== --- head/contrib/libpcap/scanner.l Thu May 16 03:51:00 2013 (r250692) +++ head/contrib/libpcap/scanner.l Thu May 16 05:16:56 2013 (r250693) @@ -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; }