diff options
| author | sam <sam@FreeBSD.org> | 2006-09-04 19:54:21 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-09-04 19:54:21 +0000 |
| commit | 8bcc947abca2294c34328ac33c001fc8b000b77d (patch) | |
| tree | e0aa52f0d15c797ed6153b7446fd850742a6c1dd /contrib/libpcap/grammar.y | |
| parent | d439ca5cfb2e498bd8338759a5310dbd287201a7 (diff) | |
| download | FreeBSD-src-8bcc947abca2294c34328ac33c001fc8b000b77d.zip FreeBSD-src-8bcc947abca2294c34328ac33c001fc8b000b77d.tar.gz | |
resolve merge conflicts
MFC after: 1 month
Diffstat (limited to 'contrib/libpcap/grammar.y')
| -rw-r--r-- | contrib/libpcap/grammar.y | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y index 3e40006..1072f96 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.86.2.4 2005/06/20 21:30:17 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.86.2.5 2005/09/05 09:08:06 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -132,6 +132,7 @@ pcap_parse() %token LEN %token IPV6 ICMPV6 AH ESP %token VLAN MPLS +%token PPPOED PPPOES %token ISO ESIS CLNP ISIS L1 L2 IIH LSP SNP CSNP PSNP %token STP %token IPX @@ -334,6 +335,8 @@ other: pqual TK_BROADCAST { $$ = gen_broadcast($1); } | VLAN { $$ = gen_vlan(-1); } | MPLS pnum { $$ = gen_mpls($2); } | MPLS { $$ = gen_mpls(-1); } + | PPPOED { $$ = gen_pppoed(); } + | PPPOES { $$ = gen_pppoes(); } | pfvar { $$ = $1; } ; |
