Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-03 00:31:16 +00:00
Code Issues Projects Releases Wiki Activity

Minor update to arping, patch from Nick Fedchik

Browse Source
This commit is contained in:
Glenn L McGrath 2003-02-09 07:01:33 +00:00
parent 06e9565b6c
commit a837e2d9b3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
networking/arping.c
View File

@ -336,7 +336,7 @@ int arping_main(int argc, char **argv)
exit(socket_errno); exit(socket_errno);
} }
if (1) { {
struct ifreq ifr; struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
@ -361,7 +361,7 @@ int arping_main(int argc, char **argv)
} }
} }
if (inet_aton(target, &dst) != 1) { if (!inet_aton(target, &dst)) {
struct hostent *hp; struct hostent *hp;
hp = gethostbyname2(target, AF_INET); hp = gethostbyname2(target, AF_INET);
@ -372,7 +372,7 @@ int arping_main(int argc, char **argv)
memcpy(&dst, hp->h_addr, 4); memcpy(&dst, hp->h_addr, 4);
} }
if (source && inet_aton(source, &src) != 1) { if (source && !inet_aton(source, &src)) {
error_msg("invalid source address %s", source); error_msg("invalid source address %s", source);
exit(2); exit(2);
} }
@ -436,7 +436,7 @@ int arping_main(int argc, char **argv)
exit(2); exit(2);
} }
if (1) { {
int alen = sizeof(me); int alen = sizeof(me);
if (getsockname(s, (struct sockaddr *) &me, &alen) == -1) { if (getsockname(s, (struct sockaddr *) &me, &alen) == -1) {
@ -451,9 +451,11 @@ int arping_main(int argc, char **argv)
he = me; he = me;
memset(he.sll_addr, -1, he.sll_halen); memset(he.sll_addr, -1, he.sll_halen);
if (!quiet) if (!quiet) {
printf("ARPING to %s from %s via %s\n", inet_ntoa(dst), printf("ARPING to %s", inet_ntoa(dst));
inet_ntoa(src), device ? device : "unknown"); printf(" from %s via %s\n", inet_ntoa(src),
device ? device : "unknown");
}
if (!src.s_addr && !dad) { if (!src.s_addr && !dad) {
error_msg("no src address in the non-DAD mode"); error_msg("no src address in the non-DAD mode");