aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/vpn/gnunet-helper-vpn.c43
1 files changed, 15 insertions, 28 deletions
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 7eeb07379..a75298183 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 (void) close (fd); 110 GNUNET_break (0 == 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 (void) close (fd); 130 GNUNET_break (0 == 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 (void) close (fd); 191 GNUNET_break (0 == 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 (void) close (fd); 211 GNUNET_break (0 == 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 (void) close (fd); 226 GNUNET_break (0 == close (fd));
227 exit (1); 227 exit (1);
228 } 228 }
229 229
@@ -239,17 +239,11 @@ 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 (void) close (fd); 242 GNUNET_break (0 == close (fd));
243 exit (1); 243 exit (1);
244 } 244 }
245 245
246 if (0 != close (fd)) 246 GNUNET_assert (0 == close (fd));
247 {
248 fprintf (stderr,
249 "close failed: %s\n",
250 strerror (errno));
251 exit (1);
252 }
253} 247}
254 248
255 249
@@ -305,7 +299,7 @@ set_address4 (const char *dev,
305 "ioctl failed at %d: %s\n", 299 "ioctl failed at %d: %s\n",
306 __LINE__, 300 __LINE__,
307 strerror (errno)); 301 strerror (errno));
308 (void) close (fd); 302 GNUNET_break (0 == close (fd));
309 exit (1); 303 exit (1);
310 } 304 }
311 305
@@ -320,7 +314,7 @@ set_address4 (const char *dev,
320 fprintf (stderr, 314 fprintf (stderr,
321 "Failed to parse IPv4 address mask `%s'\n", 315 "Failed to parse IPv4 address mask `%s'\n",
322 mask); 316 mask);
323 (void) close (fd); 317 GNUNET_break (0 == close (fd));
324 exit (1); 318 exit (1);
325 } 319 }
326 320
@@ -333,7 +327,7 @@ set_address4 (const char *dev,
333 "ioctl failed at line %d: %s\n", 327 "ioctl failed at line %d: %s\n",
334 __LINE__, 328 __LINE__,
335 strerror (errno)); 329 strerror (errno));
336 (void) close (fd); 330 GNUNET_break (0 == close (fd));
337 exit (1); 331 exit (1);
338 } 332 }
339 333
@@ -346,7 +340,7 @@ set_address4 (const char *dev,
346 "ioctl failed at line %d: %s\n", 340 "ioctl failed at line %d: %s\n",
347 __LINE__, 341 __LINE__,
348 strerror (errno)); 342 strerror (errno));
349 (void) close (fd); 343 GNUNET_break (0 == close (fd));
350 exit (1); 344 exit (1);
351 } 345 }
352 346
@@ -360,18 +354,11 @@ set_address4 (const char *dev,
360 "ioctl failed at line %d: %s\n", 354 "ioctl failed at line %d: %s\n",
361 __LINE__, 355 __LINE__,
362 strerror (errno)); 356 strerror (errno));
363 (void) close (fd); 357 GNUNET_break (0 == close (fd));
364 exit (1); 358 exit (1);
365 } 359 }
366 360
367 if (0 != close (fd)) 361 GNUNET_assert (0 == close (fd));
368 {
369 fprintf (stderr,
370 "close failed: %s\n",
371 strerror (errno));
372 (void) close (fd);
373 exit (1);
374 }
375} 362}
376 363
377 364
@@ -653,7 +640,7 @@ main (int argc, char **argv)
653 { 640 {
654 fprintf (stderr, 641 fprintf (stderr,
655 "Fatal: prefix_len out of range\n"); 642 "Fatal: prefix_len out of range\n");
656 close (fd_tun); 643 GNUNET_break (0 == close (fd_tun));
657 return 1; 644 return 1;
658 } 645 }
659 646
@@ -701,6 +688,6 @@ main (int argc, char **argv)
701 run (fd_tun); 688 run (fd_tun);
702 global_ret = 0; 689 global_ret = 0;
703cleanup: 690cleanup:
704 close (fd_tun); 691 GNUNET_break (0 == close (fd_tun));
705 return global_ret; 692 return global_ret;
706} 693}