[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18636 - gnunet/src/nat
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18636 - gnunet/src/nat |
Date: |
Fri, 16 Dec 2011 19:44:53 +0100 |
Author: grothoff
Date: 2011-12-16 19:44:53 +0100 (Fri, 16 Dec 2011)
New Revision: 18636
Modified:
gnunet/src/nat/gnunet-helper-nat-server.c
Log:
-cast returns from close to void to indicate that we intentionally ignore them,
close socket on new error paths
Modified: gnunet/src/nat/gnunet-helper-nat-server.c
===================================================================
--- gnunet/src/nat/gnunet-helper-nat-server.c 2011-12-16 17:15:23 UTC (rev
18635)
+++ gnunet/src/nat/gnunet-helper-nat-server.c 2011-12-16 18:44:53 UTC (rev
18636)
@@ -434,7 +434,7 @@
{
fprintf (stderr, "Socket number too large (%d > %u)\n", ret,
(unsigned int) FD_SETSIZE);
- close (ret);
+ (void) close (ret);
return -1;
}
return ret;
@@ -462,14 +462,14 @@
setsockopt (ret, SOL_SOCKET, SO_BROADCAST, (char *) &one, sizeof (one)))
{
fprintf (stderr, "setsockopt failed: %s\n", strerror (errno));
- close (ret);
+ (void) close (ret);
return -1;
}
if (-1 ==
setsockopt (ret, IPPROTO_IP, IP_HDRINCL, (char *) &one, sizeof (one)))
{
fprintf (stderr, "setsockopt failed: %s\n", strerror (errno));
- close (ret);
+ (void) close (ret);
return -1;
}
return ret;
@@ -506,7 +506,7 @@
{
fprintf (stderr, "Error binding UDP socket to port %u: %s\n",
NAT_TRAV_PORT,
strerror (errno));
- close (ret);
+ (void) close (ret);
return -1;
}
return ret;
@@ -544,7 +544,7 @@
}
if (-1 == (rawsock = make_raw_socket ()))
{
- close (icmpsock);
+ (void) close (icmpsock);
return 4;
}
uid = getuid ();
@@ -552,19 +552,23 @@
if (0 != setresuid (uid, uid, uid))
{
fprintf (stderr, "Failed to setresuid: %s\n", strerror (errno));
+ (void) close (icmpsock);
+ (void) close (rawsock);
return 5;
}
#else
if (0 != (setuid (uid) | seteuid (uid)))
{
fprintf (stderr, "Failed to setuid: %s\n", strerror (errno));
+ (void) close (icmpsock);
+ (void) close (rawsock);
return 6;
}
#endif
if (-1 == (udpsock = make_udp_socket (&external)))
{
- close (icmpsock);
- close (rawsock);
+ (void) close (icmpsock);
+ (void) close (rawsock);
return 7;
}
alt = 0;
@@ -591,9 +595,9 @@
send_udp ();
}
/* select failed (internal error or OS out of resources) */
- close (icmpsock);
- close (rawsock);
- close (udpsock);
+ (void) close (icmpsock);
+ (void) close (rawsock);
+ (void) close (udpsock);
return 8;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18636 - gnunet/src/nat,
gnunet <=