diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:13:52 -0500 |
---|---|---|
committer | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:13:52 -0500 |
commit | 96c920e166b40bbe50f216e294f2efac154a1cb2 (patch) | |
tree | fa80a34e81863ab897f2f2b8ec4124b10d023516 /src/fnet/interface.c | |
parent | remove trailing whitespace from etc/ (diff) | |
download | firejail-96c920e166b40bbe50f216e294f2efac154a1cb2.tar.gz firejail-96c920e166b40bbe50f216e294f2efac154a1cb2.tar.zst firejail-96c920e166b40bbe50f216e294f2efac154a1cb2.zip |
Remove trailing whitespace from src/
Diffstat (limited to 'src/fnet/interface.c')
-rw-r--r-- | src/fnet/interface.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fnet/interface.c b/src/fnet/interface.c index 33ad766ec..8c1fd6ca4 100644 --- a/src/fnet/interface.c +++ b/src/fnet/interface.c | |||
@@ -40,7 +40,7 @@ static void check_if_name(const char *ifname) { | |||
40 | void net_bridge_add_interface(const char *bridge, const char *dev) { | 40 | void net_bridge_add_interface(const char *bridge, const char *dev) { |
41 | check_if_name(bridge); | 41 | check_if_name(bridge); |
42 | check_if_name(dev); | 42 | check_if_name(dev); |
43 | 43 | ||
44 | // somehow adding the interface to the bridge resets MTU on bridge device!!! | 44 | // somehow adding the interface to the bridge resets MTU on bridge device!!! |
45 | // workaround: restore MTU on the bridge device | 45 | // workaround: restore MTU on the bridge device |
46 | // todo: put a real fix in | 46 | // todo: put a real fix in |
@@ -82,7 +82,7 @@ void net_bridge_add_interface(const char *bridge, const char *dev) { | |||
82 | // bring interface up | 82 | // bring interface up |
83 | void net_if_up(const char *ifname) { | 83 | void net_if_up(const char *ifname) { |
84 | check_if_name(ifname); | 84 | check_if_name(ifname); |
85 | 85 | ||
86 | int sock = socket(AF_INET,SOCK_DGRAM,0); | 86 | int sock = socket(AF_INET,SOCK_DGRAM,0); |
87 | if (sock < 0) | 87 | if (sock < 0) |
88 | errExit("socket"); | 88 | errExit("socket"); |
@@ -139,8 +139,8 @@ int net_get_mtu(const char *ifname) { | |||
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); |
142 | 142 | ||
143 | 143 | ||
144 | return mtu; | 144 | return mtu; |
145 | } | 145 | } |
146 | 146 | ||
@@ -197,7 +197,7 @@ void net_ifprint(int scan) { | |||
197 | sprintf(ipstr, "%d.%d.%d.%d", PRINT_IP(ip)); | 197 | sprintf(ipstr, "%d.%d.%d.%d", PRINT_IP(ip)); |
198 | char maskstr[30]; | 198 | char maskstr[30]; |
199 | sprintf(maskstr, "%d.%d.%d.%d", PRINT_IP(mask)); | 199 | sprintf(maskstr, "%d.%d.%d.%d", PRINT_IP(mask)); |
200 | 200 | ||
201 | // mac address | 201 | // mac address |
202 | unsigned char mac[6]; | 202 | unsigned char mac[6]; |
203 | net_get_mac(ifa->ifa_name, mac); | 203 | net_get_mac(ifa->ifa_name, mac); |
@@ -207,7 +207,7 @@ void net_ifprint(int scan) { | |||
207 | else | 207 | else |
208 | sprintf(macstr, "%02x:%02x:%02x:%02x:%02x:%02x", PRINT_MAC(mac)); | 208 | sprintf(macstr, "%02x:%02x:%02x:%02x:%02x:%02x", PRINT_MAC(mac)); |
209 | 209 | ||
210 | 210 | ||
211 | printf("%-17.17s%-19.19s%-17.17s%-17.17s%-6.6s\n", | 211 | printf("%-17.17s%-19.19s%-17.17s%-17.17s%-6.6s\n", |
212 | ifa->ifa_name, macstr, ipstr, maskstr, status); | 212 | ifa->ifa_name, macstr, ipstr, maskstr, status); |
213 | 213 | ||
@@ -240,7 +240,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]) { | |||
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); |
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) |
245 | errExit("ioctl"); | 245 | errExit("ioctl"); |
246 | memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); | 246 | memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); |
@@ -262,7 +262,7 @@ void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu) { | |||
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); |
265 | if (ioctl( sock, SIOCSIFADDR, &ifr ) < 0) | 265 | if (ioctl( sock, SIOCSIFADDR, &ifr ) < 0) |
266 | errExit("ioctl"); | 266 | errExit("ioctl"); |
267 | 267 | ||
268 | if (ip != 0) { | 268 | if (ip != 0) { |
@@ -270,7 +270,7 @@ void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu) { | |||
270 | if (ioctl( sock, SIOCSIFNETMASK, &ifr ) < 0) | 270 | if (ioctl( sock, SIOCSIFNETMASK, &ifr ) < 0) |
271 | errExit("ioctl"); | 271 | errExit("ioctl"); |
272 | } | 272 | } |
273 | 273 | ||
274 | // configure mtu | 274 | // configure mtu |
275 | if (mtu > 0) { | 275 | if (mtu > 0) { |
276 | ifr.ifr_mtu = mtu; | 276 | ifr.ifr_mtu = mtu; |
@@ -295,7 +295,7 @@ int net_if_mac(const char *ifname, const unsigned char mac[6]) { | |||
295 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); | 295 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); |
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 | ||
299 | if (ioctl(sock, SIOCSIFHWADDR, &ifr) == -1) | 299 | if (ioctl(sock, SIOCSIFHWADDR, &ifr) == -1) |
300 | errExit("ioctl"); | 300 | errExit("ioctl"); |
301 | close(sock); | 301 | close(sock); |
@@ -315,7 +315,7 @@ void net_if_ip6(const char *ifname, const char *addr6) { | |||
315 | fprintf(stderr, "Error fnet: invalid IPv6 address %s\n", addr6); | 315 | fprintf(stderr, "Error fnet: invalid IPv6 address %s\n", addr6); |
316 | exit(1); | 316 | exit(1); |
317 | } | 317 | } |
318 | 318 | ||
319 | // extract prefix | 319 | // extract prefix |
320 | unsigned long prefix; | 320 | unsigned long prefix; |
321 | char *ptr; | 321 | char *ptr; |
@@ -367,6 +367,6 @@ void net_if_ip6(const char *ifname, const char *addr6) { | |||
367 | perror("ioctl SIOCSIFADDR"); | 367 | perror("ioctl SIOCSIFADDR"); |
368 | exit(1); | 368 | exit(1); |
369 | } | 369 | } |
370 | 370 | ||
371 | close(sock); | 371 | close(sock); |
372 | } | 372 | } |