Clean up documentation of "vlan" filter expression, and document "mpls"

filter expression.

diff --git a/CHANGES b/CHANGES
index e10e1b68086143657dffc2a3a4078efe665ed9ec..d345eb253ff1adfa73246395ab6ca702ef1411d4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
-$Header: /tcpdump/master/tcpdump/CHANGES,v 1.87.2.5 2005-08-23 03:40:34 guy Exp $
+$Header: /tcpdump/master/tcpdump/CHANGES,v 1.87.2.6 2005-09-05 08:57:11 guy Exp $
 
-Mon.   August 22, 2005.  [email protected]. Summary for 3.9.4 tcpdump release
+Mon.   September 5, 2005.  [email protected]. Summary for 3.9.4 tcpdump release
        Decoder support for more Juniper link-layer types
        Fix a potential buffer overflow (although it can't occur in
                practice).
@@ -9,6 +9,8 @@ Mon.    August 22, 2005.  [email protected]. Summary for 3.9.4 tcpdump release
        Add FRF.16 support, fix various Frame Relay bugs.
        Add support for RSVP integrity objects, update fast-reroute
                object printer to latest spec.
+       Clean up documentation of vlan filter expression, document mpls
+               filter expression.
 
 Tue.   July 5, 2005.  [email protected]. Summary for 3.9.3 tcpdump release
 

diff --git a/tcpdump.1 b/tcpdump.1
index b7cc99c6bd1910598c007f15d5c70d0b0473681f..2722ada988522d03fa334382e8b51da48082e6ea 100644 (file)
--- a/tcpdump.1
+++ b/tcpdump.1
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.167.2.4 2005-05-02 21:27:34 guy Exp $ (LBL)
+.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.167.2.5 2005-09-05 08:57:11 guy Exp $ (LBL)
 .\"
 .\"    $NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $
 .\"
@@ -1013,20 +1013,55 @@ Note that
 \fItcpdump\fP does not currently know how to parse these protocols.
 .IP "\fBvlan \fI[vlan_id]\fR"
 True if the packet is an IEEE 802.1Q VLAN packet.
-If \fI[vlan_id]\fR is specified, only true is the packet has the specified
+If \fI[vlan_id]\fR is specified, only true if the packet has the specified
 \fIvlan_id\fR.
 Note that the first \fBvlan\fR keyword encountered in \fIexpression\fR
-changes the decoding offsets for the remainder of \fIexpression\fR
-on the assumption that the packet is a VLAN packet.
-the \fI[vlan_id]\fR statement may be used more than once, to filter on vlan hierarchies.
-each use of the \fI[vlan_id]\fR \fIexpression\fR increments the filter offsets by 4.
+changes the decoding offsets for the remainder of \fIexpression\fR on
+the assumption that the packet is a VLAN packet.  The \fBvlan
+\fI[vlan_id]\fR expression may be used more than once, to filter on VLAN
+hierarchies.  Each use of that expression increments the filter offsets
+by 4.
+.IP
+For example:
+.in +.5i
+.nf
+\fBvlan 100 && vlan 200\fR
 .fi
-example(s):
+.in -.5i
+filters on VLAN 200 encapsulated within VLAN 100, and
+.in +.5i
+.nf
+\fBvlan && vlan 300 && ip\fR
 .fi
-"vlan 100 && vlan 200" filters on vlan 200 encapsulated within vlan 100
+.in -.5i
+filters IPv4 protocols encapsulated in VLAN 300 encapsulated within any
+higher order VLAN.
+.IP "\fBmpls \fI[label_num]\fR"
+True if the packet is an MPLS packet.
+If \fI[label_num]\fR is specified, only true is the packet has the specified
+\fIlabel_num\fR.
+Note that the first \fBmpls\fR keyword encountered in \fIexpression\fR
+changes the decoding offsets for the remainder of \fIexpression\fR on
+the assumption that the packet is a MPLS-encapsulated IP packet.  The
+\fBmpls \fI[label_num]\fR expression may be used more than once, to
+filter on MPLS hierarchies.  Each use of that expression increments the
+filter offsets by 4. 
+.IP
+For example:
+.in +.5i
+.nf
+\fBmpls 100000 && mpls 1024\fR
 .fi
-"vlan && vlan 300 && ip" filters IPv4 protocols encapsulated in vlan 300 encapsulated within any higher order vlan
+.in -.5i
+filters packets with an outer label of 100000 and an inner label of
+1024, and
+.in +.5i
+.nf
+\fBmpls && mpls 1024 && host 192.9.200.1\fR
 .fi
+.in -.5i
+filters packets to or from 192.9.200.1 with an inner label of 1024 and
+any outer label.
 .IP  "\fBtcp\fR, \fBudp\fR, \fBicmp\fR"
 Abbreviations for:
 .in +.5i