diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
commit | c7bda1ce659294d6e22c06e087f6f265983c7578 (patch) | |
tree | 4c6d2217f4d8306c59cf1096f8664e1cfd167213 /networking/udhcp/arpping.c | |
parent | 8854004b41065b3d081af7f3df13a100b0c8bfbe (diff) | |
download | busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.bz2 busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.zip |
Remove trailing whitespace. Update copyright to include 2004.
Diffstat (limited to 'networking/udhcp/arpping.c')
-rw-r--r-- | networking/udhcp/arpping.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index 23c7d46b3..ab4c6d20c 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c | |||
@@ -25,8 +25,8 @@ | |||
25 | * interface - interface to use | 25 | * interface - interface to use |
26 | * retn: 1 addr free | 26 | * retn: 1 addr free |
27 | * 0 addr used | 27 | * 0 addr used |
28 | * -1 error | 28 | * -1 error |
29 | */ | 29 | */ |
30 | 30 | ||
31 | /* FIXME: match response against chaddr */ | 31 | /* FIXME: match response against chaddr */ |
32 | int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) | 32 | int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) |
@@ -51,7 +51,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) | |||
51 | #endif | 51 | #endif |
52 | return -1; | 52 | return -1; |
53 | } | 53 | } |
54 | 54 | ||
55 | if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)) == -1) { | 55 | if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)) == -1) { |
56 | LOG(LOG_ERR, "Could not setsocketopt on raw socket"); | 56 | LOG(LOG_ERR, "Could not setsocketopt on raw socket"); |
57 | close(s); | 57 | close(s); |
@@ -71,12 +71,12 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) | |||
71 | memcpy(arp.sInaddr, &ip, sizeof(ip)); /* source IP address */ | 71 | memcpy(arp.sInaddr, &ip, sizeof(ip)); /* source IP address */ |
72 | memcpy(arp.sHaddr, mac, 6); /* source hardware address */ | 72 | memcpy(arp.sHaddr, mac, 6); /* source hardware address */ |
73 | memcpy(arp.tInaddr, &yiaddr, sizeof(yiaddr)); /* target IP address */ | 73 | memcpy(arp.tInaddr, &yiaddr, sizeof(yiaddr)); /* target IP address */ |
74 | 74 | ||
75 | memset(&addr, 0, sizeof(addr)); | 75 | memset(&addr, 0, sizeof(addr)); |
76 | strcpy(addr.sa_data, interface); | 76 | strcpy(addr.sa_data, interface); |
77 | if (sendto(s, &arp, sizeof(arp), 0, &addr, sizeof(addr)) < 0) | 77 | if (sendto(s, &arp, sizeof(arp), 0, &addr, sizeof(addr)) < 0) |
78 | rv = 0; | 78 | rv = 0; |
79 | 79 | ||
80 | /* wait arp reply, and check it */ | 80 | /* wait arp reply, and check it */ |
81 | tm.tv_usec = 0; | 81 | tm.tv_usec = 0; |
82 | time(&prevTime); | 82 | time(&prevTime); |
@@ -89,8 +89,8 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) | |||
89 | if (errno != EINTR) rv = 0; | 89 | if (errno != EINTR) rv = 0; |
90 | } else if (FD_ISSET(s, &fdset)) { | 90 | } else if (FD_ISSET(s, &fdset)) { |
91 | if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0; | 91 | if (recv(s, &arp, sizeof(arp), 0) < 0 ) rv = 0; |
92 | if (arp.operation == htons(ARPOP_REPLY) && | 92 | if (arp.operation == htons(ARPOP_REPLY) && |
93 | bcmp(arp.tHaddr, mac, 6) == 0 && | 93 | bcmp(arp.tHaddr, mac, 6) == 0 && |
94 | *((uint32_t *) arp.sInaddr) == yiaddr) { | 94 | *((uint32_t *) arp.sInaddr) == yiaddr) { |
95 | DEBUG(LOG_INFO, "Valid arp reply receved for this address"); | 95 | DEBUG(LOG_INFO, "Valid arp reply receved for this address"); |
96 | rv = 0; | 96 | rv = 0; |
@@ -101,6 +101,6 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) | |||
101 | time(&prevTime); | 101 | time(&prevTime); |
102 | } | 102 | } |
103 | close(s); | 103 | close(s); |
104 | DEBUG(LOG_INFO, "%salid arp replies for this address", rv ? "No v" : "V"); | 104 | DEBUG(LOG_INFO, "%salid arp replies for this address", rv ? "No v" : "V"); |
105 | return rv; | 105 | return rv; |
106 | } | 106 | } |