emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arp: code shrink

Browse Source 
function                                             old     new   delta
packed_usage                                       29257   29252      -5
arp_main                                            1487    1471     -16

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-02-04 16:18:58 +01:00
parent a8816dafc4
commit 06af569f44
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
networking/arp.c
View File

@ -22,12 +22,12 @@
//usage:#define arp_full_usage "\n\n" //usage:#define arp_full_usage "\n\n"
//usage: "Manipulate ARP cache\n" //usage: "Manipulate ARP cache\n"
//usage: "\n -a Display (all) hosts" //usage: "\n -a Display (all) hosts"
//usage: "\n -s Set new ARP entry" //usage: "\n -d Delete ARP entry"
//usage: "\n -d Delete a specified entry" //usage: "\n -s Set new entry"
//usage: "\n -v Verbose" //usage: "\n -v Verbose"
//usage: "\n -n Don't resolve names" //usage: "\n -n Don't resolve names"
//usage: "\n -i IF Network interface" //usage: "\n -i IF Network interface"
//usage: "\n -D Read <hwaddr> from given device" //usage: "\n -D Read HWADDR from IFACE"
//usage: "\n -A,-p AF Protocol family" //usage: "\n -A,-p AF Protocol family"
//usage: "\n -H HWTYPE Hardware address type" //usage: "\n -H HWTYPE Hardware address type"
@ -213,16 +213,15 @@ static int arp_del(char **args)
} }
/* Get the hardware address to a specified interface name */ /* Get the hardware address to a specified interface name */
static void arp_getdevhw(char *ifname, struct sockaddr *sa, static void arp_getdevhw(char *ifname, struct sockaddr *sa)
const struct hwtype *hwt)
{ {
struct ifreq ifr; struct ifreq ifr;
const struct hwtype *xhw; const struct hwtype *xhw;
strcpy(ifr.ifr_name, ifname); strcpy(ifr.ifr_name, ifname);
ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr, ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr,
"cant get HW-Address for '%s'", ifname); "can't get HW-Address for '%s'", ifname);
if (hwt && (ifr.ifr_hwaddr.sa_family != hw->type)) { if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) {
bb_error_msg_and_die("protocol type mismatch"); bb_error_msg_and_die("protocol type mismatch");
} }
memcpy(sa, &(ifr.ifr_hwaddr), sizeof(struct sockaddr)); memcpy(sa, &(ifr.ifr_hwaddr), sizeof(struct sockaddr));
@ -261,7 +260,7 @@ static int arp_set(char **args)
bb_error_msg_and_die("need hardware address"); bb_error_msg_and_die("need hardware address");
} }
if (option_mask32 & ARP_OPT_D) { if (option_mask32 & ARP_OPT_D) {
arp_getdevhw(*args++, &req.arp_ha, hw_set ? hw : NULL); arp_getdevhw(*args++, &req.arp_ha);
} else { } else {
if (hw->input(*args++, &req.arp_ha) < 0) { if (hw->input(*args++, &req.arp_ha) < 0) {
bb_error_msg_and_die("invalid hardware address"); bb_error_msg_and_die("invalid hardware address");