diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 18:09:04 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 18:09:04 +0000 |
| commit | 1907987c215571d956467e511af31fb08df5e7ae (patch) | |
| tree | 792afbbcf047be9dd1402f871834480d01679ee8 /contrib/libpcap/grammar.y | |
| parent | 3fcae53268f8352ec4919fb2b103f016893c2a1b (diff) | |
| download | FreeBSD-src-1907987c215571d956467e511af31fb08df5e7ae.zip FreeBSD-src-1907987c215571d956467e511af31fb08df5e7ae.tar.gz | |
resolve merge conflicts
Reviewed by: bms (earlier version)
Diffstat (limited to 'contrib/libpcap/grammar.y')
| -rw-r--r-- | contrib/libpcap/grammar.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y index 63ca863..0d41499 100644 --- a/contrib/libpcap/grammar.y +++ b/contrib/libpcap/grammar.y @@ -23,7 +23,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.79.2.3 2004/03/28 21:45:32 fenner Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86 2004/12/18 08:49:23 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -34,7 +34,6 @@ static const char rcsid[] _U_ = #include <pcap-stdinc.h> #else /* WIN32 */ #include <sys/types.h> -#include <sys/time.h> #include <sys/socket.h> #endif /* WIN32 */ @@ -50,7 +49,6 @@ struct rtentry; #endif /* WIN32 */ #include <stdio.h> -#include <strings.h> #include "pcap-int.h" @@ -129,7 +127,7 @@ pcap_parse() %token LSH RSH %token LEN %token IPV6 ICMPV6 AH ESP -%token VLAN +%token VLAN MPLS %token ISO ESIS CLNP ISIS L1 L2 IIH LSP SNP CSNP PSNP %token STP %token IPX @@ -325,6 +323,8 @@ other: pqual TK_BROADCAST { $$ = gen_broadcast($1); } | OUTBOUND { $$ = gen_inbound(1); } | VLAN pnum { $$ = gen_vlan($2); } | VLAN { $$ = gen_vlan(-1); } + | MPLS pnum { $$ = gen_mpls($2); } + | MPLS { $$ = gen_mpls(-1); } | pfvar { $$ = $1; } ; |
