[GNUnet-SVN] r12656 - gnunet/src/transport

[gnunet]

Author: nevans
Date: 2010-08-18 22:20:09 +0200 (Wed, 18 Aug 2010)
New Revision: 12656

Modified:
   gnunet/src/transport/gnunet-nat-server-windows.c
Log:
yes, windows still sucks

Modified: gnunet/src/transport/gnunet-nat-server-windows.c
===================================================================
--- gnunet/src/transport/gnunet-nat-server-windows.c    2010-08-18 20:18:16 UTC 
(rev 12655)
+++ gnunet/src/transport/gnunet-nat-server-windows.c    2010-08-18 20:20:09 UTC 
(rev 12656)
@@ -404,7 +404,6 @@
 make_raw_socket ()
 {
   const int one = 1;
-  Socket ret;
 
 #ifdef WIN32
   BOOL bOptVal = TRUE;
@@ -413,7 +412,7 @@
   int iOptLen = sizeof(int);
 #endif
 
-  ret = socket (AF_INET, SOCK_RAW, IPPROTO_RAW);
+  rawsock = socket (AF_INET, SOCK_RAW, IPPROTO_RAW);
   if (-1 == ret)
     {
       fprintf (stderr,
@@ -422,11 +421,11 @@
       return -1;
     }
 #ifdef WIN32
-  if (setsockopt(ret, SOL_SOCKET, SO_BROADCAST, (char*)&bOptVal, bOptLen) != 
SOCKET_ERROR)
+  if (setsockopt(rawsock, SOL_SOCKET, SO_BROADCAST, (char*)&bOptVal, bOptLen) 
!= SOCKET_ERROR)
   {
     fprintf(stderr, "Set SO_BROADCAST: ON\n");
   }
-  if (setsockopt(ret, IPPROTO_IP, IP_HDRINCL, (char*)&bOptVal, bOptLen) != 
SOCKET_ERROR)
+  if (setsockopt(rawsock, IPPROTO_IP, IP_HDRINCL, (char*)&bOptVal, bOptLen) != 
SOCKET_ERROR)
   {
     fprintf(stderr, "Set IP_HDRINCL: ON\n");
   }
@@ -435,18 +434,18 @@
     fprintf(stderr, "Error setting IP_HDRINCL: ON\n");
   }
 #else
-  if (setsockopt(ret, SOL_SOCKET, SO_BROADCAST,
+  if (setsockopt(rawsock, SOL_SOCKET, SO_BROADCAST,
                 (char *)&one, sizeof(one)) == -1)
     fprintf(stderr,
            "setsockopt failed: %s\n",
            strerror (errno));
-  if (setsockopt(ret, IPPROTO_IP, IP_HDRINCL,
+  if (setsockopt(rawsock, IPPROTO_IP, IP_HDRINCL,
                 (char *)&one, sizeof(one)) == -1)
     fprintf(stderr,
            "setsockopt failed: %s\n",
            strerror (errno));
 #endif
-  return ret;
+  return rawsock;
 }
 
 
@@ -472,7 +471,7 @@
 
   if (-1 == (icmpsock = make_icmp_socket()))
     return 1; 
-  if (-1 == (rawsock = make_raw_socket()))
+  if (-1 == (make_raw_socket()))
     {
       close (icmpsock);
       return 1;