diff options
Diffstat (limited to 'net-mgmt/choparp/files/patch-choparp.c')
-rw-r--r-- | net-mgmt/choparp/files/patch-choparp.c | 75 |
1 files changed, 67 insertions, 8 deletions
diff --git a/net-mgmt/choparp/files/patch-choparp.c b/net-mgmt/choparp/files/patch-choparp.c index eb0351cdbc73..dce53bc45021 100644 --- a/net-mgmt/choparp/files/patch-choparp.c +++ b/net-mgmt/choparp/files/patch-choparp.c @@ -1,5 +1,5 @@ ---- choparp.c.orig Fri Nov 8 07:36:03 2002 -+++ choparp.c Thu Apr 20 23:56:38 2006 +--- choparp.c.orig 2002-11-08 07:36:03.000000000 +0900 ++++ choparp.c 2010-05-04 20:39:28.279310506 +0900 @@ -42,6 +42,7 @@ #include <string.h> #include <sys/types.h> @@ -8,18 +8,32 @@ #include <sys/time.h> #include <sys/ioctl.h> #include <net/bpf.h> -@@ -239,6 +240,10 @@ +@@ -75,6 +76,7 @@ + + struct cidr *targets = NULL, *excludes = NULL; + u_char target_mac[ETHER_ADDR_LEN]; /* target MAC address */ ++int verbose = 0; + + /* + ARP filter program +@@ -239,6 +241,16 @@ fprintf(stderr,"checkarp: WARNING: received unknown type ARP request.\n"); return(0); } + if (ntohl(*(u_int32_t *)(arp->arp_tpa)) == ntohl(*(u_int32_t *)(arp->arp_spa))) { -+ fprintf(stderr,"checkarp: WARNING: sender equal dest.\n"); ++ if (verbose != 0) ++ fprintf(stderr,"checkarp: WARNING: sender equal dest.\n"); ++ return(0); ++ } ++ if (0 == ntohl(*(u_int32_t *)(arp->arp_spa))) { ++ if (verbose != 0) ++ fprintf(stderr,"checkarp: WARNING: zero sender address.\n"); + return(0); + } target_ip = ntohl(*(u_int32_t *)(arp->arp_tpa)); return match(target_ip, targets) && !match(target_ip, excludes); } -@@ -280,13 +285,22 @@ +@@ -280,13 +292,22 @@ char *rframe; char *sframe; size_t frame_len; @@ -46,7 +60,7 @@ if (r < 0) { if (errno == EINTR) -@@ -295,7 +309,7 @@ +@@ -295,7 +316,7 @@ return; } @@ -55,7 +69,7 @@ if (rlen < 0) { if (errno == EINTR) continue; -@@ -307,7 +321,7 @@ +@@ -307,7 +328,7 @@ while((rframe = getarp(p, rlen, &nextp, &nextlen)) != NULL){ if (checkarp(rframe)){ sframe = gen_arpreply(rframe, &frame_len); @@ -64,7 +78,52 @@ } p = nextp; rlen = nextlen; -@@ -437,6 +451,9 @@ +@@ -362,13 +383,13 @@ + + void + usage(void){ +- fprintf(stderr,"usage: choparp if_name mac_addr [-]addr/mask...\n"); ++ fprintf(stderr,"usage: choparp [-v] if_name mac_addr [-]addr/mask...\n"); + exit(-1); + } + + int + main(int argc, char **argv){ +- int fd; ++ int ch, fd; + char *buf, *ifname; + struct cidr **targets_tail = &targets, **excludes_tail = &excludes; + #define APPEND(LIST,ADDR,MASK) \ +@@ -381,13 +402,24 @@ + } while (0) + size_t buflen; + +- if (argc < 4) ++ while ((ch = getopt(argc, argv, "v")) != -1) ++ switch (ch) { ++ case 'v': ++ verbose++; ++ break; ++ default: ++ usage(); ++ } ++ argc -= optind; ++ argv += optind; ++ ++ if (argc < 3) + usage(); + +- ifname = argv[1]; +- if (setmac(argv[2], ifname)) ++ ifname = argv[0]; ++ if (setmac(argv[1], ifname)) + usage(); +- argv += 3; argc -= 3; ++ argv += 2; argc -= 2; + + while (argc > 0) { + u_int32_t addr, mask = ~0; +@@ -437,6 +469,9 @@ #endif if ((fd = openbpf(ifname, &buf, &buflen)) < 0) return(-1); |