diff options
| author | sam <sam@FreeBSD.org> | 2005-07-11 03:43:25 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-11 03:43:25 +0000 |
| commit | b0948cc146b74585abbc8e1ddb07a0ed768ac090 (patch) | |
| tree | b1290283be00a899ee2c6555fc04d310d7b651d8 /contrib/libpcap/scanner.l | |
| parent | 17d5b030de962032fa5ffb4b3f2b4b774145bb34 (diff) | |
| download | FreeBSD-src-b0948cc146b74585abbc8e1ddb07a0ed768ac090.zip FreeBSD-src-b0948cc146b74585abbc8e1ddb07a0ed768ac090.tar.gz | |
resolve merge conflicts
Approved by: re (scottl)
Diffstat (limited to 'contrib/libpcap/scanner.l')
| -rw-r--r-- | contrib/libpcap/scanner.l | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l index 8be0cae..2bed45b 100644 --- a/contrib/libpcap/scanner.l +++ b/contrib/libpcap/scanner.l @@ -24,7 +24,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.99 2004/06/16 08:20:28 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.99.2.3 2005/06/20 21:30:19 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -184,6 +184,7 @@ igmp return IGMP; igrp return IGRP; pim return PIM; vrrp return VRRP; +radio return RADIO; ip6 { #ifdef INET6 @@ -235,6 +236,7 @@ host return HOST; net return NET; mask return NETMASK; port return PORT; +portrange return PORTRANGE; proto return PROTO; protochain { #ifdef NO_PROTOCHAIN @@ -285,6 +287,11 @@ srnr|subrulenum return PF_SRNR; reason return PF_REASON; action return PF_ACTION; +sio return SIO; +opc return OPC; +dpc return DPC; +sls return SLS; + [ \r\n\t] ; [+\-*/:\[\]!<>()&|=] return yytext[0]; ">=" return GEQ; |
