1 --- libpcap_0_5rel2/nametoaddr.c.wiget Thu Nov 25 09:25:35 1999
2 +++ libpcap_0_5rel2/nametoaddr.c Thu Jul 13 16:31:19 2000
4 e = ep = (u_char *)malloc(6);
8 + if (*s == ':' || *s == '.')
12 --- libpcap_0_5rel2/scanner.l.wiget Wed Nov 17 05:09:58 1999
13 +++ libpcap_0_5rel2/scanner.l Thu Jul 13 16:30:01 2000
15 N ([0-9]+|(0X|0x)[0-9A-Fa-f]+)
16 B ([0-9A-Fa-f][0-9A-Fa-f]?)
17 W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
23 {N} { yylval.i = stoi((char *)yytext); return NUM; }
24 ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) {
25 yylval.s = sdup((char *)yytext); return HID; }
26 -{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext);
27 +({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) {
28 + yylval.e = pcap_ether_aton((char *)yytext);
35 {B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); }
36 +{X}{12} { yylval.e = pcap_ether_aton((char *)yytext);
38 [A-Za-z0-9][-_.A-Za-z0-9]*[.A-Za-z0-9] {
39 yylval.s = sdup((char *)yytext); return ID; }
40 "\\"[^ !()\n\t]+ { yylval.s = sdup((char *)yytext + 1); return ID; }