diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2021-06-03 11:32:40 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-06-03 11:32:40 +0200 |
| commit | 0d15d5bccabff2a46b5da360b07c1ae1909b37b8 (patch) | |
| tree | 273e0695f7c16e168af98db9dd0b52ada99e55a2 | |
| parent | 774020c224653590110b30ea461d0ead34a6d875 (diff) | |
| download | busybox-w32-0d15d5bccabff2a46b5da360b07c1ae1909b37b8.tar.gz busybox-w32-0d15d5bccabff2a46b5da360b07c1ae1909b37b8.tar.bz2 busybox-w32-0d15d5bccabff2a46b5da360b07c1ae1909b37b8.zip | |
udhcp: shrink arpping()
function old new delta
.rodata 103249 103246 -3
arpping 437 420 -17
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-20) Total: -20 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/udhcp/arpping.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index a395e838d..a11c4e841 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c | |||
| @@ -47,6 +47,7 @@ int FAST_FUNC arpping(uint32_t test_nip, | |||
| 47 | int rv = 1; /* "no reply received" yet */ | 47 | int rv = 1; /* "no reply received" yet */ |
| 48 | struct sockaddr addr; /* for interface name */ | 48 | struct sockaddr addr; /* for interface name */ |
| 49 | struct arpMsg arp; | 49 | struct arpMsg arp; |
| 50 | const char *msg; | ||
| 50 | 51 | ||
| 51 | if (!timeo) | 52 | if (!timeo) |
| 52 | return 1; | 53 | return 1; |
| @@ -58,7 +59,7 @@ int FAST_FUNC arpping(uint32_t test_nip, | |||
| 58 | } | 59 | } |
| 59 | 60 | ||
| 60 | if (setsockopt_broadcast(s) == -1) { | 61 | if (setsockopt_broadcast(s) == -1) { |
| 61 | bb_simple_perror_msg("can't enable bcast on raw socket"); | 62 | bb_simple_perror_msg("can't enable bcast on ARP socket"); |
| 62 | goto ret; | 63 | goto ret; |
| 63 | } | 64 | } |
| 64 | 65 | ||
| @@ -131,6 +132,9 @@ int FAST_FUNC arpping(uint32_t test_nip, | |||
| 131 | 132 | ||
| 132 | ret: | 133 | ret: |
| 133 | close(s); | 134 | close(s); |
| 134 | log1("%srp reply received for this address", rv ? "no a" : "A"); | 135 | msg = "no ARP reply received for this address"; |
| 136 | if (rv == 0) | ||
| 137 | msg += 3; | ||
| 138 | log1s(msg); | ||
| 135 | return rv; | 139 | return rv; |
| 136 | } | 140 | } |
