diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
| commit | fb79a2e2cfe33002398f1898c26d8e4f341db006 (patch) | |
| tree | f5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /networking/ifconfig.c | |
| parent | fcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff) | |
| download | busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.bz2 busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.zip | |
xioctl and friends by Tito <farmatito@tiscali.it>
function old new delta
do_iptunnel 203 977 +774
process_dev 5328 5494 +166
ioctl_or_perror - 54 +54
ioctl_or_perror_and_die - 51 +51
ioctl_alt_func - 49 +49
bb_ioctl_or_warn - 47 +47
do_add_ioctl 102 145 +43
bb_xioctl - 39 +39
print_value_on_off - 31 +31
get_lcm 105 123 +18
arp_main 2155 2167 +12
..................
zcip_main 1576 1566 -10
setlogcons_main 92 82 -10
dumpkmap_main 263 253 -10
do_get_ioctl 85 75 -10
setkeycodes_main 165 154 -11
write_table 244 232 -12
vconfig_main 318 306 -12
do_del_ioctl 93 81 -12
set_address 75 62 -13
maybe_set_utc 30 16 -14
loadfont_main 495 479 -16
slattach_main 712 695 -17
do_loadfont 191 174 -17
do_iplink 1155 1136 -19
getty_main 2583 2562 -21
fbset_main 2058 2035 -23
do_time 588 565 -23
xioctl 25 - -25
read_rtc 186 160 -26
parse_conf 1299 1270 -29
udhcp_read_interface 269 239 -30
bb_ioctl 45 - -45
bb_ioctl_alt 70 - -70
bb_ioctl_on_off 78 - -78
.rodata 129370 129018 -352
do_show 799 - -799
------------------------------------------------------------------------------
(add/remove: 6/5 grow/shrink: 13/49 up/down: 1316/-1864) Total: -548 bytes
text data bss dec hex filename
675352 2740 13968 692060 a8f5c busybox_old
674804 2740 13968 691512 a8d38 busybox_unstripped
Diffstat (limited to 'networking/ifconfig.c')
| -rw-r--r-- | networking/ifconfig.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 5e11b2b7c..0d53676cd 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c | |||
| @@ -402,12 +402,10 @@ int ifconfig_main(int argc, char **argv) | |||
| 402 | 402 | ||
| 403 | /* Create a channel to the NET kernel. */ | 403 | /* Create a channel to the NET kernel. */ |
| 404 | sockfd6 = xsocket(AF_INET6, SOCK_DGRAM, 0); | 404 | sockfd6 = xsocket(AF_INET6, SOCK_DGRAM, 0); |
| 405 | if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0) | 405 | xioctl(sockfd6, SIOGIFINDEX, &ifr); |
| 406 | bb_perror_msg_and_die("SIOGIFINDEX"); | ||
| 407 | ifr6.ifr6_ifindex = ifr.ifr_ifindex; | 406 | ifr6.ifr6_ifindex = ifr.ifr_ifindex; |
| 408 | ifr6.ifr6_prefixlen = prefix_len; | 407 | ifr6.ifr6_prefixlen = prefix_len; |
| 409 | if (ioctl(sockfd6, a1op->selector, &ifr6) < 0) | 408 | ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "%s", a1op->name); |
| 410 | bb_perror_msg_and_die(a1op->name); | ||
| 411 | if (ENABLE_FEATURE_CLEAN_UP) | 409 | if (ENABLE_FEATURE_CLEAN_UP) |
| 412 | free(lsa); | 410 | free(lsa); |
| 413 | continue; | 411 | continue; |
| @@ -444,8 +442,7 @@ int ifconfig_main(int argc, char **argv) | |||
| 444 | p = ((char *)&ifr) + a1op->ifr_offset; | 442 | p = ((char *)&ifr) + a1op->ifr_offset; |
| 445 | #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ | 443 | #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ |
| 446 | if (mask & A_MAP_TYPE) { | 444 | if (mask & A_MAP_TYPE) { |
| 447 | if (ioctl(sockfd, SIOCGIFMAP, &ifr) < 0) | 445 | xioctl(sockfd, SIOCGIFMAP, &ifr); |
| 448 | bb_perror_msg_and_die("SIOCGIFMAP"); | ||
| 449 | if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR) | 446 | if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR) |
| 450 | *((unsigned char *) p) = i; | 447 | *((unsigned char *) p) = i; |
| 451 | else if (mask & A_MAP_USHORT) | 448 | else if (mask & A_MAP_USHORT) |
| @@ -460,8 +457,7 @@ int ifconfig_main(int argc, char **argv) | |||
| 460 | *((int *) p) = i; | 457 | *((int *) p) = i; |
| 461 | } | 458 | } |
| 462 | 459 | ||
| 463 | if (ioctl(sockfd, a1op->selector, &ifr) < 0) | 460 | ioctl_or_perror_and_die(sockfd, a1op->selector, &ifr, "%s", a1op->name); |
| 464 | bb_perror_msg_and_die(a1op->name); | ||
| 465 | #ifdef QUESTIONABLE_ALIAS_CASE | 461 | #ifdef QUESTIONABLE_ALIAS_CASE |
| 466 | if (mask & A_COLON_CHK) { | 462 | if (mask & A_COLON_CHK) { |
| 467 | /* | 463 | /* |
| @@ -486,15 +482,13 @@ int ifconfig_main(int argc, char **argv) | |||
| 486 | mask = N_SET; | 482 | mask = N_SET; |
| 487 | } | 483 | } |
| 488 | 484 | ||
| 489 | if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) | 485 | xioctl(sockfd, SIOCGIFFLAGS, &ifr); |
| 490 | bb_perror_msg_and_die("SIOCGIFFLAGS"); | ||
| 491 | selector = op->selector; | 486 | selector = op->selector; |
| 492 | if (mask & SET_MASK) | 487 | if (mask & SET_MASK) |
| 493 | ifr.ifr_flags |= selector; | 488 | ifr.ifr_flags |= selector; |
| 494 | else | 489 | else |
| 495 | ifr.ifr_flags &= ~selector; | 490 | ifr.ifr_flags &= ~selector; |
| 496 | if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) | 491 | xioctl(sockfd, SIOCSIFFLAGS, &ifr); |
| 497 | bb_perror_msg_and_die("SIOCSIFFLAGS"); | ||
| 498 | } /* while () */ | 492 | } /* while () */ |
| 499 | 493 | ||
| 500 | if (ENABLE_FEATURE_CLEAN_UP) | 494 | if (ENABLE_FEATURE_CLEAN_UP) |