diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-08-10 21:38:08 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-08-10 21:38:21 +0200 |
commit | 6c76e94d03436fcd7b3ddd8fd0b512fc8e8c5aae (patch) | |
tree | 0f2d9f06031332aca37503b50754ff8f28e9b391 | |
parent | 7598cf6b7969d74c3219cb0abac523144ad4d2a2 (diff) | |
download | gnunet-6c76e94d03436fcd7b3ddd8fd0b512fc8e8c5aae.tar.gz gnunet-6c76e94d03436fcd7b3ddd8fd0b512fc8e8c5aae.zip |
-vpn helper does not even link against libgnunetutil, avoid GNUNET_assert/break
-rw-r--r-- | src/vpn/gnunet-helper-vpn.c | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index a75298183..7686d51d5 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c | |||
@@ -107,7 +107,7 @@ init_tun (char *dev) | |||
107 | fprintf (stderr, | 107 | fprintf (stderr, |
108 | "File descriptor to large: %d", | 108 | "File descriptor to large: %d", |
109 | fd); | 109 | fd); |
110 | GNUNET_break (0 == close (fd)); | 110 | (void) close (fd); |
111 | return -1; | 111 | return -1; |
112 | } | 112 | } |
113 | 113 | ||
@@ -127,7 +127,7 @@ init_tun (char *dev) | |||
127 | "Error with ioctl on `%s': %s\n", | 127 | "Error with ioctl on `%s': %s\n", |
128 | "/dev/net/tun", | 128 | "/dev/net/tun", |
129 | strerror (errno)); | 129 | strerror (errno)); |
130 | GNUNET_break (0 == close (fd)); | 130 | (void) close (fd); |
131 | return -1; | 131 | return -1; |
132 | } | 132 | } |
133 | strcpy (dev, ifr.ifr_name); | 133 | strcpy (dev, ifr.ifr_name); |
@@ -188,7 +188,7 @@ set_address6 (const char *dev, | |||
188 | "ioctl failed at %d: %s\n", | 188 | "ioctl failed at %d: %s\n", |
189 | __LINE__, | 189 | __LINE__, |
190 | strerror (errno)); | 190 | strerror (errno)); |
191 | GNUNET_break (0 == close (fd)); | 191 | (void) close (fd); |
192 | exit (1); | 192 | exit (1); |
193 | } | 193 | } |
194 | 194 | ||
@@ -208,7 +208,7 @@ set_address6 (const char *dev, | |||
208 | "ioctl failed at line %d: %s\n", | 208 | "ioctl failed at line %d: %s\n", |
209 | __LINE__, | 209 | __LINE__, |
210 | strerror (errno)); | 210 | strerror (errno)); |
211 | GNUNET_break (0 == close (fd)); | 211 | (void) close (fd); |
212 | exit (1); | 212 | exit (1); |
213 | } | 213 | } |
214 | 214 | ||
@@ -223,7 +223,7 @@ set_address6 (const char *dev, | |||
223 | "ioctl failed at line %d: %s\n", | 223 | "ioctl failed at line %d: %s\n", |
224 | __LINE__, | 224 | __LINE__, |
225 | strerror (errno)); | 225 | strerror (errno)); |
226 | GNUNET_break (0 == close (fd)); | 226 | (void) close (fd); |
227 | exit (1); | 227 | exit (1); |
228 | } | 228 | } |
229 | 229 | ||
@@ -239,11 +239,18 @@ set_address6 (const char *dev, | |||
239 | "ioctl failed at line %d: %s\n", | 239 | "ioctl failed at line %d: %s\n", |
240 | __LINE__, | 240 | __LINE__, |
241 | strerror (errno)); | 241 | strerror (errno)); |
242 | GNUNET_break (0 == close (fd)); | 242 | (void) close (fd); |
243 | exit (1); | 243 | exit (1); |
244 | } | 244 | } |
245 | 245 | ||
246 | GNUNET_assert (0 == close (fd)); | 246 | if (0 != close (fd)) |
247 | { | ||
248 | fprintf (stderr, | ||
249 | "close failed at line %d: %s\n", | ||
250 | __LINE__, | ||
251 | strerror (errno)); | ||
252 | exit (1); | ||
253 | } | ||
247 | } | 254 | } |
248 | 255 | ||
249 | 256 | ||
@@ -299,7 +306,7 @@ set_address4 (const char *dev, | |||
299 | "ioctl failed at %d: %s\n", | 306 | "ioctl failed at %d: %s\n", |
300 | __LINE__, | 307 | __LINE__, |
301 | strerror (errno)); | 308 | strerror (errno)); |
302 | GNUNET_break (0 == close (fd)); | 309 | (void) close (fd); |
303 | exit (1); | 310 | exit (1); |
304 | } | 311 | } |
305 | 312 | ||
@@ -314,7 +321,7 @@ set_address4 (const char *dev, | |||
314 | fprintf (stderr, | 321 | fprintf (stderr, |
315 | "Failed to parse IPv4 address mask `%s'\n", | 322 | "Failed to parse IPv4 address mask `%s'\n", |
316 | mask); | 323 | mask); |
317 | GNUNET_break (0 == close (fd)); | 324 | (void) close (fd); |
318 | exit (1); | 325 | exit (1); |
319 | } | 326 | } |
320 | 327 | ||
@@ -327,7 +334,7 @@ set_address4 (const char *dev, | |||
327 | "ioctl failed at line %d: %s\n", | 334 | "ioctl failed at line %d: %s\n", |
328 | __LINE__, | 335 | __LINE__, |
329 | strerror (errno)); | 336 | strerror (errno)); |
330 | GNUNET_break (0 == close (fd)); | 337 | (void) close (fd); |
331 | exit (1); | 338 | exit (1); |
332 | } | 339 | } |
333 | 340 | ||
@@ -340,7 +347,7 @@ set_address4 (const char *dev, | |||
340 | "ioctl failed at line %d: %s\n", | 347 | "ioctl failed at line %d: %s\n", |
341 | __LINE__, | 348 | __LINE__, |
342 | strerror (errno)); | 349 | strerror (errno)); |
343 | GNUNET_break (0 == close (fd)); | 350 | (void) close (fd); |
344 | exit (1); | 351 | exit (1); |
345 | } | 352 | } |
346 | 353 | ||
@@ -354,11 +361,18 @@ set_address4 (const char *dev, | |||
354 | "ioctl failed at line %d: %s\n", | 361 | "ioctl failed at line %d: %s\n", |
355 | __LINE__, | 362 | __LINE__, |
356 | strerror (errno)); | 363 | strerror (errno)); |
357 | GNUNET_break (0 == close (fd)); | 364 | (void) close (fd); |
358 | exit (1); | 365 | exit (1); |
359 | } | 366 | } |
360 | 367 | ||
361 | GNUNET_assert (0 == close (fd)); | 368 | if (0 != close (fd)) |
369 | { | ||
370 | fprintf (stderr, | ||
371 | "close failed at line %d: %s\n", | ||
372 | __LINE__, | ||
373 | strerror (errno)); | ||
374 | exit (1); | ||
375 | } | ||
362 | } | 376 | } |
363 | 377 | ||
364 | 378 | ||
@@ -640,7 +654,7 @@ main (int argc, char **argv) | |||
640 | { | 654 | { |
641 | fprintf (stderr, | 655 | fprintf (stderr, |
642 | "Fatal: prefix_len out of range\n"); | 656 | "Fatal: prefix_len out of range\n"); |
643 | GNUNET_break (0 == close (fd_tun)); | 657 | (void) close (fd_tun); |
644 | return 1; | 658 | return 1; |
645 | } | 659 | } |
646 | 660 | ||
@@ -688,6 +702,6 @@ main (int argc, char **argv) | |||
688 | run (fd_tun); | 702 | run (fd_tun); |
689 | global_ret = 0; | 703 | global_ret = 0; |
690 | cleanup: | 704 | cleanup: |
691 | GNUNET_break (0 == close (fd_tun)); | 705 | (void) close (fd_tun); |
692 | return global_ret; | 706 | return global_ret; |
693 | } | 707 | } |