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/route.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/route.c')
| -rw-r--r-- | networking/route.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/networking/route.c b/networking/route.c index b5490ddd8..530c51b10 100644 --- a/networking/route.c +++ b/networking/route.c | |||
| @@ -327,9 +327,10 @@ static void INET_setroute(int action, char **args) | |||
| 327 | /* Create a socket to the INET kernel. */ | 327 | /* Create a socket to the INET kernel. */ |
| 328 | skfd = xsocket(AF_INET, SOCK_DGRAM, 0); | 328 | skfd = xsocket(AF_INET, SOCK_DGRAM, 0); |
| 329 | 329 | ||
| 330 | if (ioctl(skfd, ((action==RTACTION_ADD) ? SIOCADDRT : SIOCDELRT), &rt)<0) { | 330 | if (action == RTACTION_ADD) |
| 331 | bb_perror_msg_and_die("SIOC[ADD|DEL]RT"); | 331 | xioctl(skfd, SIOCADDRT, &rt); |
| 332 | } | 332 | else |
| 333 | xioctl(skfd, SIOCDELRT, &rt); | ||
| 333 | 334 | ||
| 334 | if (ENABLE_FEATURE_CLEAN_UP) close(skfd); | 335 | if (ENABLE_FEATURE_CLEAN_UP) close(skfd); |
| 335 | } | 336 | } |
| @@ -423,17 +424,15 @@ static void INET6_setroute(int action, char **args) | |||
| 423 | struct ifreq ifr; | 424 | struct ifreq ifr; |
| 424 | memset(&ifr, 0, sizeof(ifr)); | 425 | memset(&ifr, 0, sizeof(ifr)); |
| 425 | strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name)); | 426 | strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name)); |
| 426 | 427 | xioctl(skfd, SIOGIFINDEX, &ifr); | |
| 427 | if (ioctl(skfd, SIOGIFINDEX, &ifr) < 0) { | ||
| 428 | bb_perror_msg_and_die("SIOGIFINDEX"); | ||
| 429 | } | ||
| 430 | rt.rtmsg_ifindex = ifr.ifr_ifindex; | 428 | rt.rtmsg_ifindex = ifr.ifr_ifindex; |
| 431 | } | 429 | } |
| 432 | 430 | ||
| 433 | /* Tell the kernel to accept this route. */ | 431 | /* Tell the kernel to accept this route. */ |
| 434 | if (ioctl(skfd, ((action==RTACTION_ADD) ? SIOCADDRT : SIOCDELRT), &rt)<0) { | 432 | if (action == RTACTION_ADD) |
| 435 | bb_perror_msg_and_die("SIOC[ADD|DEL]RT"); | 433 | xioctl(skfd, SIOCADDRT, &rt); |
| 436 | } | 434 | else |
| 435 | xioctl(skfd, SIOCDELRT, &rt); | ||
| 437 | 436 | ||
| 438 | if (ENABLE_FEATURE_CLEAN_UP) close(skfd); | 437 | if (ENABLE_FEATURE_CLEAN_UP) close(skfd); |
| 439 | } | 438 | } |