aboutsummaryrefslogtreecommitdiff
path: root/networking/libiproute/iplink.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-12-02 18:18:50 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-12-02 18:18:50 +0000
commit360d9661b6a33b0358104623058f1c3629a469ea (patch)
tree268954b686b38c96428e3b74fc1ebb2ebdfdfb32 /networking/libiproute/iplink.c
parent928b2c0fee65cae10f683ee0f1ea8d0a29a54924 (diff)
downloadbusybox-w32-360d9661b6a33b0358104623058f1c3629a469ea.tar.gz
busybox-w32-360d9661b6a33b0358104623058f1c3629a469ea.tar.bz2
busybox-w32-360d9661b6a33b0358104623058f1c3629a469ea.zip
libbb: add strncpy_IFNAMSIZ
function old new delta ... udhcp_read_interface 225 220 -5 brctl_main 1151 1146 -5 add_interface 109 104 -5 ipaddr_list_or_flush 2174 2167 -7 do_add_ioctl 88 80 -8 vconfig_main 249 240 -9 do_del_ioctl 78 68 -10 do_iplink 1186 1173 -13 do_if_fetch 766 753 -13 buffer_fill_and_print 196 179 -17 parse_args 1709 1684 -25 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/20 up/down: 11/-140) Total: -129 bytes
Diffstat (limited to 'networking/libiproute/iplink.c')
-rw-r--r--networking/libiproute/iplink.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 8de17bfc6..d3d0338b0 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -41,7 +41,7 @@ static void do_chflags(char *dev, uint32_t flags, uint32_t mask)
41 struct ifreq ifr; 41 struct ifreq ifr;
42 int fd; 42 int fd;
43 43
44 strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name)); 44 strncpy_IFNAMSIZ(ifr.ifr_name, dev);
45 fd = get_ctl_fd(); 45 fd = get_ctl_fd();
46 xioctl(fd, SIOCGIFFLAGS, &ifr); 46 xioctl(fd, SIOCGIFFLAGS, &ifr);
47 if ((ifr.ifr_flags ^ flags) & mask) { 47 if ((ifr.ifr_flags ^ flags) & mask) {
@@ -58,8 +58,8 @@ static void do_changename(char *dev, char *newdev)
58 struct ifreq ifr; 58 struct ifreq ifr;
59 int fd; 59 int fd;
60 60
61 strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name)); 61 strncpy_IFNAMSIZ(ifr.ifr_name, dev);
62 strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname)); 62 strncpy_IFNAMSIZ(ifr.ifr_newname, newdev);
63 fd = get_ctl_fd(); 63 fd = get_ctl_fd();
64 xioctl(fd, SIOCSIFNAME, &ifr); 64 xioctl(fd, SIOCSIFNAME, &ifr);
65 close(fd); 65 close(fd);
@@ -73,7 +73,7 @@ static void set_qlen(char *dev, int qlen)
73 73
74 s = get_ctl_fd(); 74 s = get_ctl_fd();
75 memset(&ifr, 0, sizeof(ifr)); 75 memset(&ifr, 0, sizeof(ifr));
76 strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name)); 76 strncpy_IFNAMSIZ(ifr.ifr_name, dev);
77 ifr.ifr_qlen = qlen; 77 ifr.ifr_qlen = qlen;
78 xioctl(s, SIOCSIFTXQLEN, &ifr); 78 xioctl(s, SIOCSIFTXQLEN, &ifr);
79 close(s); 79 close(s);
@@ -87,7 +87,7 @@ static void set_mtu(char *dev, int mtu)
87 87
88 s = get_ctl_fd(); 88 s = get_ctl_fd();
89 memset(&ifr, 0, sizeof(ifr)); 89 memset(&ifr, 0, sizeof(ifr));
90 strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name)); 90 strncpy_IFNAMSIZ(ifr.ifr_name, dev);
91 ifr.ifr_mtu = mtu; 91 ifr.ifr_mtu = mtu;
92 xioctl(s, SIOCSIFMTU, &ifr); 92 xioctl(s, SIOCSIFMTU, &ifr);
93 close(s); 93 close(s);
@@ -104,7 +104,7 @@ static int get_address(char *dev, int *htype)
104 s = xsocket(PF_PACKET, SOCK_DGRAM, 0); 104 s = xsocket(PF_PACKET, SOCK_DGRAM, 0);
105 105
106 memset(&ifr, 0, sizeof(ifr)); 106 memset(&ifr, 0, sizeof(ifr));
107 strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name)); 107 strncpy_IFNAMSIZ(ifr.ifr_name, dev);
108 xioctl(s, SIOCGIFINDEX, &ifr); 108 xioctl(s, SIOCGIFINDEX, &ifr);
109 109
110 memset(&me, 0, sizeof(me)); 110 memset(&me, 0, sizeof(me));
@@ -128,7 +128,7 @@ static void parse_address(char *dev, int hatype, int halen, char *lla, struct if
128 int alen; 128 int alen;
129 129
130 memset(ifr, 0, sizeof(*ifr)); 130 memset(ifr, 0, sizeof(*ifr));
131 strncpy(ifr->ifr_name, dev, sizeof(ifr->ifr_name)); 131 strncpy_IFNAMSIZ(ifr->ifr_name, dev);
132 ifr->ifr_hwaddr.sa_family = hatype; 132 ifr->ifr_hwaddr.sa_family = hatype;
133 133
134 alen = hatype == 1/*ARPHRD_ETHER*/ ? 14/*ETH_HLEN*/ : 19/*INFINIBAND_HLEN*/; 134 alen = hatype == 1/*ARPHRD_ETHER*/ ? 14/*ETH_HLEN*/ : 19/*INFINIBAND_HLEN*/;