diff options
author | 2017-05-24 14:13:52 -0500 | |
---|---|---|
committer | 2017-05-24 14:13:52 -0500 | |
commit | 96c920e166b40bbe50f216e294f2efac154a1cb2 (patch) | |
tree | fa80a34e81863ab897f2f2b8ec4124b10d023516 /src/firejail/network.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/firejail/network.c')
-rw-r--r-- | src/firejail/network.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/firejail/network.c b/src/firejail/network.c index 44fc4f68f..f7ddef917 100644 --- a/src/firejail/network.c +++ b/src/firejail/network.c | |||
@@ -50,8 +50,8 @@ int net_get_mtu(const char *ifname) { | |||
50 | if (arg_debug) | 50 | if (arg_debug) |
51 | printf("MTU of %s is %d.\n", ifname, ifr.ifr_mtu); | 51 | printf("MTU of %s is %d.\n", ifname, ifr.ifr_mtu); |
52 | close(s); | 52 | close(s); |
53 | 53 | ||
54 | 54 | ||
55 | return mtu; | 55 | return mtu; |
56 | } | 56 | } |
57 | 57 | ||
@@ -84,10 +84,10 @@ int net_get_if_addr(const char *bridge, uint32_t *ip, uint32_t *mask, uint8_t ma | |||
84 | assert(bridge); | 84 | assert(bridge); |
85 | assert(ip); | 85 | assert(ip); |
86 | assert(mask); | 86 | assert(mask); |
87 | 87 | ||
88 | if (arg_debug) | 88 | if (arg_debug) |
89 | printf("get interface %s configuration\n", bridge); | 89 | printf("get interface %s configuration\n", bridge); |
90 | 90 | ||
91 | int rv = -1; | 91 | int rv = -1; |
92 | struct ifaddrs *ifaddr, *ifa; | 92 | struct ifaddrs *ifaddr, *ifa; |
93 | 93 | ||
@@ -110,7 +110,7 @@ int net_get_if_addr(const char *bridge, uint32_t *ip, uint32_t *mask, uint8_t ma | |||
110 | net_get_mac(ifa->ifa_name, mac); | 110 | net_get_mac(ifa->ifa_name, mac); |
111 | *mtu = net_get_mtu(bridge); | 111 | *mtu = net_get_mtu(bridge); |
112 | } | 112 | } |
113 | 113 | ||
114 | rv = 0; | 114 | rv = 0; |
115 | break; | 115 | break; |
116 | } | 116 | } |
@@ -126,9 +126,9 @@ void net_if_up(const char *ifname) { | |||
126 | fprintf(stderr, "Error: invalid network device name %s\n", ifname); | 126 | fprintf(stderr, "Error: invalid network device name %s\n", ifname); |
127 | exit(1); | 127 | exit(1); |
128 | } | 128 | } |
129 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 3, | 129 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 3, |
130 | PATH_FNET, "ifup", ifname); | 130 | PATH_FNET, "ifup", ifname); |
131 | } | 131 | } |
132 | 132 | ||
133 | 133 | ||
134 | // configure interface ipv6 address | 134 | // configure interface ipv6 address |
@@ -138,8 +138,8 @@ void net_if_ip6(const char *ifname, const char *addr6) { | |||
138 | fprintf(stderr, "Error: invalid IPv6 address %s\n", addr6); | 138 | fprintf(stderr, "Error: invalid IPv6 address %s\n", addr6); |
139 | exit(1); | 139 | exit(1); |
140 | } | 140 | } |
141 | 141 | ||
142 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 5, | 142 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 5, |
143 | PATH_FNET, "config", "ipv6", ifname, addr6); | 143 | PATH_FNET, "config", "ipv6", ifname, addr6); |
144 | 144 | ||
145 | } | 145 | } |
@@ -187,19 +187,19 @@ uint32_t network_get_defaultgw(void) { | |||
187 | FILE *fp = fopen("/proc/self/net/route", "r"); | 187 | FILE *fp = fopen("/proc/self/net/route", "r"); |
188 | if (!fp) | 188 | if (!fp) |
189 | errExit("fopen"); | 189 | errExit("fopen"); |
190 | 190 | ||
191 | char buf[BUFSIZE]; | 191 | char buf[BUFSIZE]; |
192 | uint32_t retval = 0; | 192 | uint32_t retval = 0; |
193 | while (fgets(buf, BUFSIZE, fp)) { | 193 | while (fgets(buf, BUFSIZE, fp)) { |
194 | if (strncmp(buf, "Iface", 5) == 0) | 194 | if (strncmp(buf, "Iface", 5) == 0) |
195 | continue; | 195 | continue; |
196 | 196 | ||
197 | char *ptr = buf; | 197 | char *ptr = buf; |
198 | while (*ptr != ' ' && *ptr != '\t') | 198 | while (*ptr != ' ' && *ptr != '\t') |
199 | ptr++; | 199 | ptr++; |
200 | while (*ptr == ' ' || *ptr == '\t') | 200 | while (*ptr == ' ' || *ptr == '\t') |
201 | ptr++; | 201 | ptr++; |
202 | 202 | ||
203 | unsigned dest; | 203 | unsigned dest; |
204 | unsigned gw; | 204 | unsigned gw; |
205 | int rv = sscanf(ptr, "%x %x", &dest, &gw); | 205 | int rv = sscanf(ptr, "%x %x", &dest, &gw); |
@@ -219,9 +219,9 @@ int net_config_mac(const char *ifname, const unsigned char mac[6]) { | |||
219 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]) == -1) | 219 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]) == -1) |
220 | errExit("asprintf"); | 220 | errExit("asprintf"); |
221 | 221 | ||
222 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 5, | 222 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 5, |
223 | PATH_FNET, "config", "mac", ifname, macstr); | 223 | PATH_FNET, "config", "mac", ifname, macstr); |
224 | 224 | ||
225 | free(macstr); | 225 | free(macstr); |
226 | return 0; | 226 | return 0; |
227 | } | 227 | } |
@@ -237,7 +237,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]) { | |||
237 | memset(&ifr, 0, sizeof(ifr)); | 237 | memset(&ifr, 0, sizeof(ifr)); |
238 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); | 238 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); |
239 | ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; | 239 | ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; |
240 | 240 | ||
241 | if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) | 241 | if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) |
242 | errExit("ioctl"); | 242 | errExit("ioctl"); |
243 | memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); | 243 | memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); |
@@ -248,7 +248,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]) { | |||
248 | 248 | ||
249 | void net_config_interface(const char *dev, uint32_t ip, uint32_t mask, int mtu) { | 249 | void net_config_interface(const char *dev, uint32_t ip, uint32_t mask, int mtu) { |
250 | assert(dev); | 250 | assert(dev); |
251 | 251 | ||
252 | char *ipstr; | 252 | char *ipstr; |
253 | if (asprintf(&ipstr, "%llu", (long long unsigned) ip) == -1) | 253 | if (asprintf(&ipstr, "%llu", (long long unsigned) ip) == -1) |
254 | errExit("asprintf"); | 254 | errExit("asprintf"); |
@@ -260,12 +260,11 @@ void net_config_interface(const char *dev, uint32_t ip, uint32_t mask, int mtu) | |||
260 | char *mtustr; | 260 | char *mtustr; |
261 | if (asprintf(&mtustr, "%d", mtu) == -1) | 261 | if (asprintf(&mtustr, "%d", mtu) == -1) |
262 | errExit("asprintf"); | 262 | errExit("asprintf"); |
263 | 263 | ||
264 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 7, | 264 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 7, |
265 | PATH_FNET, "config", "interface", dev, ipstr, maskstr, mtustr); | 265 | PATH_FNET, "config", "interface", dev, ipstr, maskstr, mtustr); |
266 | 266 | ||
267 | free(ipstr); | 267 | free(ipstr); |
268 | free(maskstr); | 268 | free(maskstr); |
269 | free(mtustr); | 269 | free(mtustr); |
270 | } | 270 | } |
271 | |||