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/firejail/network_main.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_main.c')
-rw-r--r-- | src/firejail/network_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c index 3450bceea..1da25dd08 100644 --- a/src/firejail/network_main.c +++ b/src/firejail/network_main.c | |||
@@ -50,7 +50,7 @@ void net_configure_bridge(Bridge *br, char *dev_name) { | |||
50 | if (asprintf(&newname, "%s-%u", br->devsandbox, getpid()) == -1) | 50 | if (asprintf(&newname, "%s-%u", br->devsandbox, getpid()) == -1) |
51 | errExit("asprintf"); | 51 | errExit("asprintf"); |
52 | br->devsandbox = newname; | 52 | br->devsandbox = newname; |
53 | } | 53 | } |
54 | else { | 54 | else { |
55 | fprintf(stderr, "Error: cannot find network device %s\n", br->dev); | 55 | fprintf(stderr, "Error: cannot find network device %s\n", br->dev); |
56 | exit(1); | 56 | exit(1); |
@@ -72,7 +72,7 @@ void net_configure_bridge(Bridge *br, char *dev_name) { | |||
72 | printf("macvlan parent device %s at %d.%d.%d.%d/%d\n", | 72 | printf("macvlan parent device %s at %d.%d.%d.%d/%d\n", |
73 | br->dev, PRINT_IP(br->ip), mask2bits(br->mask)); | 73 | br->dev, PRINT_IP(br->ip), mask2bits(br->mask)); |
74 | } | 74 | } |
75 | 75 | ||
76 | uint32_t range = ~br->mask + 1; // the number of potential addresses | 76 | uint32_t range = ~br->mask + 1; // the number of potential addresses |
77 | // this software is not supported for /31 networks | 77 | // this software is not supported for /31 networks |
78 | if (range < 4) { | 78 | if (range < 4) { |
@@ -127,7 +127,7 @@ void net_configure_veth_pair(Bridge *br, const char *ifname, pid_t child) { | |||
127 | } | 127 | } |
128 | else | 128 | else |
129 | dev = br->veth_name; | 129 | dev = br->veth_name; |
130 | 130 | ||
131 | char *cstr; | 131 | char *cstr; |
132 | if (asprintf(&cstr, "%d", child) == -1) | 132 | if (asprintf(&cstr, "%d", child) == -1) |
133 | errExit("asprintf"); | 133 | errExit("asprintf"); |
@@ -249,7 +249,7 @@ void net_dns_print(pid_t pid) { | |||
249 | } | 249 | } |
250 | free(comm); | 250 | free(comm); |
251 | } | 251 | } |
252 | 252 | ||
253 | char *fname; | 253 | char *fname; |
254 | EUID_ROOT(); | 254 | EUID_ROOT(); |
255 | if (asprintf(&fname, "/proc/%d/root/etc/resolv.conf", pid) == -1) | 255 | if (asprintf(&fname, "/proc/%d/root/etc/resolv.conf", pid) == -1) |
@@ -261,7 +261,7 @@ void net_dns_print(pid_t pid) { | |||
261 | fprintf(stderr, "Error: cannot access /etc/resolv.conf\n"); | 261 | fprintf(stderr, "Error: cannot access /etc/resolv.conf\n"); |
262 | exit(1); | 262 | exit(1); |
263 | } | 263 | } |
264 | 264 | ||
265 | char buf[MAXBUF]; | 265 | char buf[MAXBUF]; |
266 | while (fgets(buf, MAXBUF, fp)) | 266 | while (fgets(buf, MAXBUF, fp)) |
267 | printf("%s", buf); | 267 | printf("%s", buf); |
@@ -284,21 +284,21 @@ void network_main(pid_t child) { | |||
284 | else | 284 | else |
285 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 6, PATH_FNET, "create", "macvlan", cfg.bridge0.devsandbox, cfg.bridge0.dev, cstr); | 285 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 6, PATH_FNET, "create", "macvlan", cfg.bridge0.devsandbox, cfg.bridge0.dev, cstr); |
286 | } | 286 | } |
287 | 287 | ||
288 | if (cfg.bridge1.configured) { | 288 | if (cfg.bridge1.configured) { |
289 | if (cfg.bridge1.macvlan == 0) | 289 | if (cfg.bridge1.macvlan == 0) |
290 | net_configure_veth_pair(&cfg.bridge1, "eth1", child); | 290 | net_configure_veth_pair(&cfg.bridge1, "eth1", child); |
291 | else | 291 | else |
292 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 6, PATH_FNET, "create", "macvlan", cfg.bridge1.devsandbox, cfg.bridge1.dev, cstr); | 292 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 6, PATH_FNET, "create", "macvlan", cfg.bridge1.devsandbox, cfg.bridge1.dev, cstr); |
293 | } | 293 | } |
294 | 294 | ||
295 | if (cfg.bridge2.configured) { | 295 | if (cfg.bridge2.configured) { |
296 | if (cfg.bridge2.macvlan == 0) | 296 | if (cfg.bridge2.macvlan == 0) |
297 | net_configure_veth_pair(&cfg.bridge2, "eth2", child); | 297 | net_configure_veth_pair(&cfg.bridge2, "eth2", child); |
298 | else | 298 | else |
299 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 6, PATH_FNET, "create", "macvlan", cfg.bridge2.devsandbox, cfg.bridge2.dev, cstr); | 299 | sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 6, PATH_FNET, "create", "macvlan", cfg.bridge2.devsandbox, cfg.bridge2.dev, cstr); |
300 | } | 300 | } |
301 | 301 | ||
302 | if (cfg.bridge3.configured) { | 302 | if (cfg.bridge3.configured) { |
303 | if (cfg.bridge3.macvlan == 0) | 303 | if (cfg.bridge3.macvlan == 0) |
304 | net_configure_veth_pair(&cfg.bridge3, "eth3", child); | 304 | net_configure_veth_pair(&cfg.bridge3, "eth3", child); |