aboutsummaryrefslogtreecommitdiffstats
path: root/src/fnet/interface.c
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-08-29 07:35:28 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-08-29 07:35:28 -0400
commitec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6 (patch)
tree44309790dc138e59143d147dda63ea7afac4094d /src/fnet/interface.c
parentsilence warning about failed unmounting of /sys (overlay options) (diff)
downloadfirejail-ec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6.tar.gz
firejail-ec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6.tar.zst
firejail-ec9ac7df45acdde1eaaec75b2e85c6ad22f6c1a6.zip
cleanup
Diffstat (limited to 'src/fnet/interface.c')
-rw-r--r--src/fnet/interface.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fnet/interface.c b/src/fnet/interface.c
index f3e9a8993..283c6d312 100644
--- a/src/fnet/interface.c
+++ b/src/fnet/interface.c
@@ -58,7 +58,7 @@ void net_bridge_add_interface(const char *bridge, const char *dev) {
58 errExit("socket"); 58 errExit("socket");
59 59
60 memset(&ifr, 0, sizeof(ifr)); 60 memset(&ifr, 0, sizeof(ifr));
61 strncpy(ifr.ifr_name, bridge, IFNAMSIZ); 61 strncpy(ifr.ifr_name, bridge, IFNAMSIZ - 1);
62#ifdef SIOCBRADDIF 62#ifdef SIOCBRADDIF
63 ifr.ifr_ifindex = ifindex; 63 ifr.ifr_ifindex = ifindex;
64 err = ioctl(sock, SIOCBRADDIF, &ifr); 64 err = ioctl(sock, SIOCBRADDIF, &ifr);
@@ -90,7 +90,7 @@ void net_if_up(const char *ifname) {
90 // get the existing interface flags 90 // get the existing interface flags
91 struct ifreq ifr; 91 struct ifreq ifr;
92 memset(&ifr, 0, sizeof(ifr)); 92 memset(&ifr, 0, sizeof(ifr));
93 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 93 strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
94 ifr.ifr_addr.sa_family = AF_INET; 94 ifr.ifr_addr.sa_family = AF_INET;
95 95
96 // read the existing flags 96 // read the existing flags
@@ -135,7 +135,7 @@ int net_get_mtu(const char *ifname) {
135 135
136 memset(&ifr, 0, sizeof(ifr)); 136 memset(&ifr, 0, sizeof(ifr));
137 ifr.ifr_addr.sa_family = AF_INET; 137 ifr.ifr_addr.sa_family = AF_INET;
138 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 138 strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
139 if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == 0) 139 if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == 0)
140 mtu = ifr.ifr_mtu; 140 mtu = ifr.ifr_mtu;
141 close(s); 141 close(s);
@@ -154,7 +154,7 @@ void net_set_mtu(const char *ifname, int mtu) {
154 154
155 memset(&ifr, 0, sizeof(ifr)); 155 memset(&ifr, 0, sizeof(ifr));
156 ifr.ifr_addr.sa_family = AF_INET; 156 ifr.ifr_addr.sa_family = AF_INET;
157 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 157 strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
158 ifr.ifr_mtu = mtu; 158 ifr.ifr_mtu = mtu;
159 if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) != 0) { 159 if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) != 0) {
160 if (!arg_quiet) 160 if (!arg_quiet)
@@ -238,7 +238,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]) {
238 errExit("socket"); 238 errExit("socket");
239 239
240 memset(&ifr, 0, sizeof(ifr)); 240 memset(&ifr, 0, sizeof(ifr));
241 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 241 strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
242 ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; 242 ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
243 243
244 if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) 244 if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1)
@@ -258,7 +258,7 @@ void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu) {
258 258
259 struct ifreq ifr; 259 struct ifreq ifr;
260 memset(&ifr, 0, sizeof(ifr)); 260 memset(&ifr, 0, sizeof(ifr));
261 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 261 strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
262 ifr.ifr_addr.sa_family = AF_INET; 262 ifr.ifr_addr.sa_family = AF_INET;
263 263
264 ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr = htonl(ip); 264 ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr = htonl(ip);
@@ -292,7 +292,7 @@ int net_if_mac(const char *ifname, const unsigned char mac[6]) {
292 errExit("socket"); 292 errExit("socket");
293 293
294 memset(&ifr, 0, sizeof(ifr)); 294 memset(&ifr, 0, sizeof(ifr));
295 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 295 strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
296 ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; 296 ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
297 memcpy(ifr.ifr_hwaddr.sa_data, mac, 6); 297 memcpy(ifr.ifr_hwaddr.sa_data, mac, 6);
298 298
@@ -350,7 +350,7 @@ void net_if_ip6(const char *ifname, const char *addr6) {
350 // find interface index 350 // find interface index
351 struct ifreq ifr; 351 struct ifreq ifr;
352 memset(&ifr, 0, sizeof(ifr)); 352 memset(&ifr, 0, sizeof(ifr));
353 strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 353 strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
354 ifr.ifr_addr.sa_family = AF_INET; 354 ifr.ifr_addr.sa_family = AF_INET;
355 if (ioctl(sock, SIOGIFINDEX, &ifr) < 0) { 355 if (ioctl(sock, SIOGIFINDEX, &ifr) < 0) {
356 perror("ioctl SIOGIFINDEX"); 356 perror("ioctl SIOGIFINDEX");