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
This commit is contained in:
@ -49,14 +49,11 @@ static void do_chflags(char *dev, uint32_t flags, uint32_t mask)
|
||||
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
fd = get_ctl_fd();
|
||||
if (ioctl(fd, SIOCGIFFLAGS, &ifr)) {
|
||||
bb_perror_msg_and_die("SIOCGIFFLAGS");
|
||||
}
|
||||
xioctl(fd, SIOCGIFFLAGS, &ifr);
|
||||
if ((ifr.ifr_flags ^ flags) & mask) {
|
||||
ifr.ifr_flags &= ~mask;
|
||||
ifr.ifr_flags |= mask & flags;
|
||||
if (ioctl(fd, SIOCSIFFLAGS, &ifr))
|
||||
bb_perror_msg_and_die("SIOCSIFFLAGS");
|
||||
xioctl(fd, SIOCSIFFLAGS, &ifr);
|
||||
}
|
||||
close(fd);
|
||||
}
|
||||
@ -66,15 +63,11 @@ static void do_changename(char *dev, char *newdev)
|
||||
{
|
||||
struct ifreq ifr;
|
||||
int fd;
|
||||
int err;
|
||||
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname));
|
||||
fd = get_ctl_fd();
|
||||
err = ioctl(fd, SIOCSIFNAME, &ifr);
|
||||
if (err) {
|
||||
bb_perror_msg_and_die("SIOCSIFNAME");
|
||||
}
|
||||
xioctl(fd, SIOCSIFNAME, &ifr);
|
||||
close(fd);
|
||||
}
|
||||
|
||||
@ -88,9 +81,7 @@ static void set_qlen(char *dev, int qlen)
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
ifr.ifr_qlen = qlen;
|
||||
if (ioctl(s, SIOCSIFTXQLEN, &ifr) < 0) {
|
||||
bb_perror_msg_and_die("SIOCSIFXQLEN");
|
||||
}
|
||||
xioctl(s, SIOCSIFTXQLEN, &ifr);
|
||||
close(s);
|
||||
}
|
||||
|
||||
@ -104,9 +95,7 @@ static void set_mtu(char *dev, int mtu)
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
ifr.ifr_mtu = mtu;
|
||||
if (ioctl(s, SIOCSIFMTU, &ifr) < 0) {
|
||||
bb_perror_msg_and_die("SIOCSIFMTU");
|
||||
}
|
||||
xioctl(s, SIOCSIFMTU, &ifr);
|
||||
close(s);
|
||||
}
|
||||
|
||||
@ -122,9 +111,7 @@ static int get_address(char *dev, int *htype)
|
||||
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
|
||||
bb_perror_msg_and_die("SIOCGIFINDEX");
|
||||
}
|
||||
xioctl(s, SIOCGIFINDEX, &ifr);
|
||||
|
||||
memset(&me, 0, sizeof(me));
|
||||
me.sll_family = AF_PACKET;
|
||||
@ -163,9 +150,10 @@ static void set_address(struct ifreq *ifr, int brd)
|
||||
int s;
|
||||
|
||||
s = get_ctl_fd();
|
||||
if (ioctl(s, brd ? SIOCSIFHWBROADCAST :SIOCSIFHWADDR, ifr) < 0) {
|
||||
bb_perror_msg_and_die(brd ? "SIOCSIFHWBROADCAST" : "SIOCSIFHWADDR");
|
||||
}
|
||||
if (brd)
|
||||
xioctl(s, SIOCSIFHWBROADCAST, ifr);
|
||||
else
|
||||
xioctl(s, SIOCSIFHWADDR, ifr);
|
||||
close(s);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user