diff options
| author | Mike Heffner <mikeh@FreeBSD.org> | 2002-03-20 01:35:53 +0000 |
|---|---|---|
| committer | Mike Heffner <mikeh@FreeBSD.org> | 2002-03-20 01:35:53 +0000 |
| commit | 0c60c54afa74fcc8c21f7282992e2e59f4609ece (patch) | |
| tree | 37d7c19588a016e468f8524b71c58746f05c5f66 | |
| parent | 58df1e5a623e0afcd470c43e23377618e1b80b54 (diff) | |
Notes
| -rw-r--r-- | usr.sbin/arp/arp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 86e388c15bb6..b4677a10ed9b 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -158,7 +158,7 @@ main(int argc, char *argv[]) argv += optind; bzero(&so_mask, sizeof(so_mask)); - so_mask.sin_family = 8; + so_mask.sin_len = 8; so_mask.sin_addr.s_addr = 0xffffffff; bzero(&blank_sin, sizeof(blank_sin)); blank_sin.sin_len = sizeof(blank_sin); @@ -681,7 +681,7 @@ get_ether_addr(u_int32_t ipaddr, u_char *hwaddr) ifc.ifc_len = sizeof(ifs); ifc.ifc_req = ifs; - if (ioctl(s, SIOCGIFCONF, &ifc) < 0) { + if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) { warnx("ioctl(SIOCGIFCONF)"); close(sock); return 0; @@ -702,7 +702,7 @@ get_ether_addr(u_int32_t ipaddr, u_char *hwaddr) * Check that the interface is up, * and not point-to-point or loopback. */ - if (ioctl(s, SIOCGIFFLAGS, &ifreq) < 0) + if (ioctl(sock, SIOCGIFFLAGS, &ifreq) < 0) continue; if ((ifreq.ifr_flags & (IFF_UP|IFF_BROADCAST|IFF_POINTOPOINT| @@ -713,7 +713,7 @@ get_ether_addr(u_int32_t ipaddr, u_char *hwaddr) * Get its netmask and check that it's on * the right subnet. */ - if (ioctl(s, SIOCGIFNETMASK, &ifreq) < 0) + if (ioctl(sock, SIOCGIFNETMASK, &ifreq) < 0) continue; mask = ((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr.s_addr; @@ -744,7 +744,7 @@ nextif: */ dla = (struct sockaddr_dl *) &ifr->ifr_addr; memcpy(hwaddr, LLADDR(dla), dla->sdl_alen); - close (s); + close (sock); printf("using interface %s for proxy with address ", ifp->ifr_name); ether_print(hwaddr); |
