X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b4e465c6fbdab58ae67827e034483a7003846fd4..7f9cbfdbd66ac6b0cd8862795bb7eb149605b349:/package/libpcap/patches/102-alt-ether.patch?ds=sidebyside diff --git a/package/libpcap/patches/102-alt-ether.patch b/package/libpcap/patches/102-alt-ether.patch index d5e010ec6..e9cc15ff3 100644 --- a/package/libpcap/patches/102-alt-ether.patch +++ b/package/libpcap/patches/102-alt-ether.patch @@ -1,6 +1,6 @@ ---- libpcap-0.8.3-orig/nametoaddr.c 2003-11-19 19:13:48.000000000 +0100 -+++ libpcap-0.8.3-7/nametoaddr.c 2005-03-08 03:38:22.000000000 +0100 -@@ -333,7 +333,7 @@ +--- a/nametoaddr.c ++++ b/nametoaddr.c +@@ -410,7 +410,7 @@ e = ep = (u_char *)malloc(6); while (*s) { @@ -9,17 +9,17 @@ s += 1; d = xdtoi(*s++); if (isxdigit((unsigned char)*s)) { ---- libpcap-0.8.3-orig/scanner.l 2004-03-28 23:45:33.000000000 +0200 -+++ libpcap-0.8.3-7/scanner.l 2005-03-08 03:38:22.000000000 +0100 +--- a/scanner.l ++++ b/scanner.l @@ -80,6 +80,7 @@ N ([0-9]+|(0X|0x)[0-9A-Fa-f]+) B ([0-9A-Fa-f][0-9A-Fa-f]?) W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?) -+X [0-9A-Fa-f] ++X [0-9A-Fa-f] - %a 16000 - %o 19000 -@@ -296,7 +297,7 @@ + %a 18400 + %o 21500 +@@ -310,7 +311,7 @@ {N} { yylval.i = stoi((char *)yytext); return NUM; } ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) { yylval.s = sdup((char *)yytext); return HID; } @@ -28,12 +28,11 @@ return EID; } {V6} { #ifdef INET6 -@@ -314,6 +315,8 @@ +@@ -328,6 +329,7 @@ #endif /*INET6*/ } {B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); } -+{X}{12} { yylval.e = pcap_ether_aton((char *)yytext); return EID;} -+ ++{X}{12} { yylval.e = pcap_ether_aton((char *)yytext); return EID;} icmptype { yylval.i = 0; return NUM; } icmpcode { yylval.i = 1; return NUM; } icmp-echoreply { yylval.i = 0; return NUM; }