aboutsummaryrefslogtreecommitdiff
path: root/networking/ifenslave.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-04-21 02:21:45 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-04-21 02:21:45 +0000
commit01eaee9309c09ca5d7dc6ef3b2e96084affdab30 (patch)
tree4679b85ef024d357f3e3ada864555a63172a050d /networking/ifenslave.c
parent0a1446275d88946734417ed96a3c0f1d7ea969e4 (diff)
downloadbusybox-w32-01eaee9309c09ca5d7dc6ef3b2e96084affdab30.tar.gz
busybox-w32-01eaee9309c09ca5d7dc6ef3b2e96084affdab30.tar.bz2
busybox-w32-01eaee9309c09ca5d7dc6ef3b2e96084affdab30.zip
*: s/IF_NAMESIZE/IFNAMSIZ/, regularize its use a bit.
function old new delta strncpy_IFNAMSIZ - 13 +13 set_slave_mtu 39 37 -2 set_slave_hwaddr 52 50 -2 set_master_hwaddr 52 50 -2 set_if_flags 40 38 -2 get_if_settings 101 98 -3 ifenslave_main 1680 1661 -19 vconfig_main 306 280 -26 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/7 up/down: 13/-56) Total: -43 bytes
Diffstat (limited to 'networking/ifenslave.c')
-rw-r--r--networking/ifenslave.c40
1 files changed, 22 insertions, 18 deletions
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index b11951758..0aa232028 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -148,6 +148,10 @@ static void change_active(char *master_ifname, char *slave_ifname);
148static int enslave(char *master_ifname, char *slave_ifname); 148static int enslave(char *master_ifname, char *slave_ifname);
149static int release(char *master_ifname, char *slave_ifname); 149static int release(char *master_ifname, char *slave_ifname);
150 150
151static void strncpy_IFNAMSIZ(char *dst, const char *src)
152{
153 strncpy(dst, src, IFNAMSIZ);
154}
151 155
152int ifenslave_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 156int ifenslave_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
153int ifenslave_main(int argc ATTRIBUTE_UNUSED, char **argv) 157int ifenslave_main(int argc ATTRIBUTE_UNUSED, char **argv)
@@ -302,7 +306,7 @@ static void get_drv_info(char *master_ifname)
302 struct ethtool_drvinfo info; 306 struct ethtool_drvinfo info;
303 307
304 memset(&ifr, 0, sizeof(ifr)); 308 memset(&ifr, 0, sizeof(ifr));
305 strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); 309 strncpy_IFNAMSIZ(ifr.ifr_name, master_ifname);
306 ifr.ifr_data = (caddr_t)&info; 310 ifr.ifr_data = (caddr_t)&info;
307 311
308 info.cmd = ETHTOOL_GDRVINFO; 312 info.cmd = ETHTOOL_GDRVINFO;
@@ -332,8 +336,8 @@ static void change_active(char *master_ifname, char *slave_ifname)
332 slave_ifname); 336 slave_ifname);
333 } 337 }
334 338
335 strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); 339 strncpy_IFNAMSIZ(ifr.ifr_name, master_ifname);
336 strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); 340 strncpy_IFNAMSIZ(ifr.ifr_slave, slave_ifname);
337 if (ioctl(skfd, SIOCBONDCHANGEACTIVE, &ifr) < 0 341 if (ioctl(skfd, SIOCBONDCHANGEACTIVE, &ifr) < 0
338 && ioctl(skfd, BOND_CHANGE_ACTIVE_OLD, &ifr) < 0 342 && ioctl(skfd, BOND_CHANGE_ACTIVE_OLD, &ifr) < 0
339 ) { 343 ) {
@@ -448,8 +452,8 @@ static int enslave(char *master_ifname, char *slave_ifname)
448 } 452 }
449 453
450 /* Do the real thing */ 454 /* Do the real thing */
451 strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); 455 strncpy_IFNAMSIZ(ifr.ifr_name, master_ifname);
452 strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); 456 strncpy_IFNAMSIZ(ifr.ifr_slave, slave_ifname);
453 if (ioctl(skfd, SIOCBONDENSLAVE, &ifr) < 0 457 if (ioctl(skfd, SIOCBONDENSLAVE, &ifr) < 0
454 && ioctl(skfd, BOND_ENSLAVE_OLD, &ifr) < 0 458 && ioctl(skfd, BOND_ENSLAVE_OLD, &ifr) < 0
455 ) { 459 ) {
@@ -484,8 +488,8 @@ static int release(char *master_ifname, char *slave_ifname)
484 return 1; 488 return 1;
485 } 489 }
486 490
487 strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); 491 strncpy_IFNAMSIZ(ifr.ifr_name, master_ifname);
488 strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); 492 strncpy_IFNAMSIZ(ifr.ifr_slave, slave_ifname);
489 if (ioctl(skfd, SIOCBONDRELEASE, &ifr) < 0 493 if (ioctl(skfd, SIOCBONDRELEASE, &ifr) < 0
490 && ioctl(skfd, BOND_RELEASE_OLD, &ifr) < 0 494 && ioctl(skfd, BOND_RELEASE_OLD, &ifr) < 0
491 ) { 495 ) {
@@ -508,11 +512,11 @@ static int get_if_settings(char *ifname, struct dev_data *dd)
508{ 512{
509 int res; 513 int res;
510 514
511 strncpy(dd->mtu.ifr_name, ifname, IFNAMSIZ); 515 strncpy_IFNAMSIZ(dd->mtu.ifr_name, ifname);
512 res = ioctl(skfd, SIOCGIFMTU, &dd->mtu); 516 res = ioctl(skfd, SIOCGIFMTU, &dd->mtu);
513 strncpy(dd->flags.ifr_name, ifname, IFNAMSIZ); 517 strncpy_IFNAMSIZ(dd->flags.ifr_name, ifname);
514 res |= ioctl(skfd, SIOCGIFFLAGS, &dd->flags); 518 res |= ioctl(skfd, SIOCGIFFLAGS, &dd->flags);
515 strncpy(dd->hwaddr.ifr_name, ifname, IFNAMSIZ); 519 strncpy_IFNAMSIZ(dd->hwaddr.ifr_name, ifname);
516 res |= ioctl(skfd, SIOCGIFHWADDR, &dd->hwaddr); 520 res |= ioctl(skfd, SIOCGIFHWADDR, &dd->hwaddr);
517 521
518 return res; 522 return res;
@@ -520,7 +524,7 @@ static int get_if_settings(char *ifname, struct dev_data *dd)
520 524
521static int get_slave_flags(char *slave_ifname) 525static int get_slave_flags(char *slave_ifname)
522{ 526{
523 strncpy(slave.flags.ifr_name, slave_ifname, IFNAMSIZ); 527 strncpy_IFNAMSIZ(slave.flags.ifr_name, slave_ifname);
524 return ioctl(skfd, SIOCGIFFLAGS, &slave.flags); 528 return ioctl(skfd, SIOCGIFFLAGS, &slave.flags);
525} 529}
526 530
@@ -528,7 +532,7 @@ static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr)
528{ 532{
529 struct ifreq ifr; 533 struct ifreq ifr;
530 534
531 strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); 535 strncpy_IFNAMSIZ(ifr.ifr_name, master_ifname);
532 memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr)); 536 memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr));
533 return ioctl(skfd, SIOCSIFHWADDR, &ifr); 537 return ioctl(skfd, SIOCSIFHWADDR, &ifr);
534} 538}
@@ -537,7 +541,7 @@ static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr)
537{ 541{
538 struct ifreq ifr; 542 struct ifreq ifr;
539 543
540 strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); 544 strncpy_IFNAMSIZ(ifr.ifr_name, slave_ifname);
541 memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr)); 545 memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr));
542 return ioctl(skfd, SIOCSIFHWADDR, &ifr); 546 return ioctl(skfd, SIOCSIFHWADDR, &ifr);
543} 547}
@@ -547,7 +551,7 @@ static int set_slave_mtu(char *slave_ifname, int mtu)
547 struct ifreq ifr; 551 struct ifreq ifr;
548 552
549 ifr.ifr_mtu = mtu; 553 ifr.ifr_mtu = mtu;
550 strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); 554 strncpy_IFNAMSIZ(ifr.ifr_name, slave_ifname);
551 return ioctl(skfd, SIOCSIFMTU, &ifr); 555 return ioctl(skfd, SIOCSIFMTU, &ifr);
552} 556}
553 557
@@ -556,7 +560,7 @@ static int set_if_flags(char *ifname, short flags)
556 struct ifreq ifr; 560 struct ifreq ifr;
557 561
558 ifr.ifr_flags = flags; 562 ifr.ifr_flags = flags;
559 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 563 strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
560 return ioctl(skfd, SIOCSIFFLAGS, &ifr); 564 return ioctl(skfd, SIOCSIFFLAGS, &ifr);
561} 565}
562 566
@@ -580,7 +584,7 @@ static int clear_if_addr(char *ifname)
580{ 584{
581 struct ifreq ifr; 585 struct ifreq ifr;
582 586
583 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 587 strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
584 ifr.ifr_addr.sa_family = AF_INET; 588 ifr.ifr_addr.sa_family = AF_INET;
585 memset(ifr.ifr_addr.sa_data, 0, sizeof(ifr.ifr_addr.sa_data)); 589 memset(ifr.ifr_addr.sa_data, 0, sizeof(ifr.ifr_addr.sa_data));
586 return ioctl(skfd, SIOCSIFADDR, &ifr); 590 return ioctl(skfd, SIOCSIFADDR, &ifr);
@@ -603,7 +607,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
603 int i; 607 int i;
604 608
605 for (i = 0; i < ARRAY_SIZE(ifra); i++) { 609 for (i = 0; i < ARRAY_SIZE(ifra); i++) {
606 strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); 610 strncpy_IFNAMSIZ(ifr.ifr_name, master_ifname);
607 res = ioctl(skfd, ifra[i].g_ioctl, &ifr); 611 res = ioctl(skfd, ifra[i].g_ioctl, &ifr);
608 if (res < 0) { 612 if (res < 0) {
609 ifr.ifr_addr.sa_family = AF_INET; 613 ifr.ifr_addr.sa_family = AF_INET;
@@ -611,7 +615,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
611 sizeof(ifr.ifr_addr.sa_data)); 615 sizeof(ifr.ifr_addr.sa_data));
612 } 616 }
613 617
614 strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); 618 strncpy_IFNAMSIZ(ifr.ifr_name, slave_ifname);
615 res = ioctl(skfd, ifra[i].s_ioctl, &ifr); 619 res = ioctl(skfd, ifra[i].s_ioctl, &ifr);
616 if (res < 0) 620 if (res < 0)
617 return res; 621 return res;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 09:42:57 +0000