22c22
< * $FreeBSD: head/contrib/libpcap/scanner.l 75110 2001-04-03 04:32:48Z fenner $
---
> * $FreeBSD: head/contrib/libpcap/scanner.l 98533 2002-06-21 01:38:14Z fenner $
27c27
< "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.70 2000/10/28 10:18:40 guy Exp $ (LBL)";
---
> "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.81 2001/09/14 01:40:57 fenner Exp $ (LBL)";
174a175
> sctp return SCTP;
180a182
> vrrp return VRRP;
182,183c184,197
< ip6 return IPV6;
< icmp6 return ICMPV6;
---
> ip6 {
> #ifdef INET6
> return IPV6;
> #else
> bpf_error("%s not supported", yytext);
> #endif
> }
> icmp6 {
> #ifdef INET6
> return ICMPV6;
> #else
> bpf_error("%s not supported", yytext);
> #endif
> }
201a216,221
> stp return STP;
>
> ipx return IPX;
>
> netbeui return NETBEUI;
>
240a261,262
> ${B} { yylval.e = pcap_ether_aton(((char *)yytext)+1);
> return AID; }
262c284,308
< [A-Za-z0-9][-_.A-Za-z0-9]*[.A-Za-z0-9] {
---
> icmptype { yylval.i = 0; return NUM; }
> icmpcode { yylval.i = 1; return NUM; }
> icmp-echoreply { yylval.i = 0; return NUM; }
> icmp-unreach { yylval.i = 3; return NUM; }
> icmp-sourcequench { yylval.i = 4; return NUM; }
> icmp-redirect { yylval.i = 5; return NUM; }
> icmp-echo { yylval.i = 8; return NUM; }
> icmp-routeradvert { yylval.i = 9; return NUM; }
> icmp-routersolicit { yylval.i = 10; return NUM; }
> icmp-timxceed { yylval.i = 11; return NUM; }
> icmp-paramprob { yylval.i = 12; return NUM; }
> icmp-tstamp { yylval.i = 13; return NUM; }
> icmp-tstampreply { yylval.i = 14; return NUM; }
> icmp-ireq { yylval.i = 15; return NUM; }
> icmp-ireqreply { yylval.i = 16; return NUM; }
> icmp-maskreq { yylval.i = 17; return NUM; }
> icmp-maskreply { yylval.i = 18; return NUM; }
> tcpflags { yylval.i = 13; return NUM; }
> tcp-fin { yylval.i = 0x01; return NUM; }
> tcp-syn { yylval.i = 0x02; return NUM; }
> 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; }
> [A-Za-z0-9]([-_.A-Za-z0-9]*[.A-Za-z0-9])? {
265,266c311,312
< [^ \[\]\t\n\-_.A-Za-z0-9!<>()&|=]+i {
< bpf_error("illegal token: %s\n", yytext); }
---
> [^ \[\]\t\n\-_.A-Za-z0-9!<>()&|=]+ {
> bpf_error("illegal token: %s", yytext); }
< * $FreeBSD: head/contrib/libpcap/scanner.l 75110 2001-04-03 04:32:48Z fenner $
---
> * $FreeBSD: head/contrib/libpcap/scanner.l 98533 2002-06-21 01:38:14Z fenner $
27c27
< "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.70 2000/10/28 10:18:40 guy Exp $ (LBL)";
---
> "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.81 2001/09/14 01:40:57 fenner Exp $ (LBL)";
174a175
> sctp return SCTP;
180a182
> vrrp return VRRP;
182,183c184,197
< ip6 return IPV6;
< icmp6 return ICMPV6;
---
> ip6 {
> #ifdef INET6
> return IPV6;
> #else
> bpf_error("%s not supported", yytext);
> #endif
> }
> icmp6 {
> #ifdef INET6
> return ICMPV6;
> #else
> bpf_error("%s not supported", yytext);
> #endif
> }
201a216,221
> stp return STP;
>
> ipx return IPX;
>
> netbeui return NETBEUI;
>
240a261,262
> ${B} { yylval.e = pcap_ether_aton(((char *)yytext)+1);
> return AID; }
262c284,308
< [A-Za-z0-9][-_.A-Za-z0-9]*[.A-Za-z0-9] {
---
> icmptype { yylval.i = 0; return NUM; }
> icmpcode { yylval.i = 1; return NUM; }
> icmp-echoreply { yylval.i = 0; return NUM; }
> icmp-unreach { yylval.i = 3; return NUM; }
> icmp-sourcequench { yylval.i = 4; return NUM; }
> icmp-redirect { yylval.i = 5; return NUM; }
> icmp-echo { yylval.i = 8; return NUM; }
> icmp-routeradvert { yylval.i = 9; return NUM; }
> icmp-routersolicit { yylval.i = 10; return NUM; }
> icmp-timxceed { yylval.i = 11; return NUM; }
> icmp-paramprob { yylval.i = 12; return NUM; }
> icmp-tstamp { yylval.i = 13; return NUM; }
> icmp-tstampreply { yylval.i = 14; return NUM; }
> icmp-ireq { yylval.i = 15; return NUM; }
> icmp-ireqreply { yylval.i = 16; return NUM; }
> icmp-maskreq { yylval.i = 17; return NUM; }
> icmp-maskreply { yylval.i = 18; return NUM; }
> tcpflags { yylval.i = 13; return NUM; }
> tcp-fin { yylval.i = 0x01; return NUM; }
> tcp-syn { yylval.i = 0x02; return NUM; }
> 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; }
> [A-Za-z0-9]([-_.A-Za-z0-9]*[.A-Za-z0-9])? {
265,266c311,312
< [^ \[\]\t\n\-_.A-Za-z0-9!<>()&|=]+i {
< bpf_error("illegal token: %s\n", yytext); }
---
> [^ \[\]\t\n\-_.A-Za-z0-9!<>()&|=]+ {
> bpf_error("illegal token: %s", yytext); }