projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix whitespace
[oweals/gnunet.git]
/
src
/
nat
/
gnunet-helper-nat-server-windows.c
diff --git
a/src/nat/gnunet-helper-nat-server-windows.c
b/src/nat/gnunet-helper-nat-server-windows.c
index fb564a188efff748fffee5f70528cfc00ab2105c..09bd025386e1e878450a3e91f0cb287109255b3e 100644
(file)
--- a/
src/nat/gnunet-helper-nat-server-windows.c
+++ b/
src/nat/gnunet-helper-nat-server-windows.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-41,6
+41,8
@@
* - Christian Grothoff
*/
#define _GNU_SOURCE
* - Christian Grothoff
*/
#define _GNU_SOURCE
+/* Instead of including gnunet_common.h */
+#define GNUNET_memcpy(dst,src,n) do { if (0 != n) { (void) memcpy (dst,src,n); } } while (0)
#define FD_SETSIZE 1024
#include <winsock2.h>
#define FD_SETSIZE 1024
#include <winsock2.h>
@@
-188,7
+190,7
@@
struct udp_header
};
/**
};
/**
- * Will this binary be run in permissions testing mode?
+ * Will this binary be run in permissions testing mode?
*/
static boolean privilege_testing = FALSE;
*/
static boolean privilege_testing = FALSE;
@@
-284,7
+286,7
@@
send_icmp_echo (const struct in_addr *my_ip)
ip_pkt.dst_ip = dummy.s_addr;
ip_pkt.checksum =
htons (calc_checksum ((uint16_t *) & ip_pkt, sizeof (struct ip_header)));
ip_pkt.dst_ip = dummy.s_addr;
ip_pkt.checksum =
htons (calc_checksum ((uint16_t *) & ip_pkt, sizeof (struct ip_header)));
- memcpy (&packet[off], &ip_pkt, sizeof (struct ip_header));
+
GNUNET_
memcpy (&packet[off], &ip_pkt, sizeof (struct ip_header));
off += sizeof (struct ip_header);
icmp_echo.type = ICMP_ECHO;
off += sizeof (struct ip_header);
icmp_echo.type = ICMP_ECHO;
@@
-294,7
+296,7
@@
send_icmp_echo (const struct in_addr *my_ip)
icmp_echo.checksum =
htons (calc_checksum
((uint16_t *) & icmp_echo, sizeof (struct icmp_echo_header)));
icmp_echo.checksum =
htons (calc_checksum
((uint16_t *) & icmp_echo, sizeof (struct icmp_echo_header)));
- memcpy (&packet[off], &icmp_echo, sizeof (struct icmp_echo_header));
+
GNUNET_
memcpy (&packet[off], &icmp_echo, sizeof (struct icmp_echo_header));
off += sizeof (struct icmp_echo_header);
memset (&dst, 0, sizeof (dst));
off += sizeof (struct icmp_echo_header);
memset (&dst, 0, sizeof (dst));
@@
-377,10
+379,10
@@
process_icmp_response ()
return;
}
off = 0;
return;
}
off = 0;
- memcpy (&ip_pkt, &buf[off], sizeof (struct ip_header));
+
GNUNET_
memcpy (&ip_pkt, &buf[off], sizeof (struct ip_header));
off += sizeof (struct ip_header);
off += sizeof (struct ip_header);
- memcpy (&source_ip, &ip_pkt.src_ip, sizeof (source_ip));
- memcpy (&icmp_ttl, &buf[off], sizeof (struct icmp_ttl_exceeded_header));
+
GNUNET_
memcpy (&source_ip, &ip_pkt.src_ip, sizeof (source_ip));
+
GNUNET_
memcpy (&icmp_ttl, &buf[off], sizeof (struct icmp_ttl_exceeded_header));
off += sizeof (struct icmp_ttl_exceeded_header);
if ((ICMP_TIME_EXCEEDED != icmp_ttl.type) || (0 != icmp_ttl.code))
{
off += sizeof (struct icmp_ttl_exceeded_header);
if ((ICMP_TIME_EXCEEDED != icmp_ttl.type) || (0 != icmp_ttl.code))
{
@@
-388,7
+390,7
@@
process_icmp_response ()
return;
}
/* skip 2nd IP header */
return;
}
/* skip 2nd IP header */
- memcpy (&ip_pkt, &buf[off], sizeof (struct ip_header));
+
GNUNET_
memcpy (&ip_pkt, &buf[off], sizeof (struct ip_header));
off += sizeof (struct ip_header);
switch (ip_pkt.proto)
off += sizeof (struct ip_header);
switch (ip_pkt.proto)
@@
-403,7
+405,7
@@
process_icmp_response ()
return;
}
/* grab ICMP ECHO content */
return;
}
/* grab ICMP ECHO content */
- memcpy (&icmp_echo, &buf[off], sizeof (struct icmp_echo_header));
+
GNUNET_
memcpy (&icmp_echo, &buf[off], sizeof (struct icmp_echo_header));
port = (uint16_t) ntohl (icmp_echo.reserved);
break;
case IPPROTO_UDP:
port = (uint16_t) ntohl (icmp_echo.reserved);
break;
case IPPROTO_UDP:
@@
-415,7
+417,7
@@
process_icmp_response ()
return;
}
/* grab UDP content */
return;
}
/* grab UDP content */
- memcpy (&udp_pkt, &buf[off], sizeof (struct udp_header));
+
GNUNET_
memcpy (&udp_pkt, &buf[off], sizeof (struct udp_header));
port = ntohs (udp_pkt.length);
break;
default:
port = ntohs (udp_pkt.length);
break;
default:
@@
-533,13
+535,16
@@
main (int argc, char *const *argv)
WSADATA wsaData;
unsigned int alt = 0;
WSADATA wsaData;
unsigned int alt = 0;
- if (argc > 1 && 0 != strcmp (argv[1], "-d")){
- privilege_testing = TRUE;
- fprintf (stderr, "DEBUG: Running binary in privilege testing mode.", argv[0]);
- argv++;
- argc--;
- }
-
+ if ( (argc > 1) && (0 != strcmp (argv[1], "-d")))
+ {
+ privilege_testing = TRUE;
+ fprintf (stderr,
+ "%s",
+ "DEBUG: Running binary in privilege testing mode.");
+ argv++;
+ argc--;
+ }
+
if (2 != argc)
{
fprintf (stderr,
if (2 != argc)
{
fprintf (stderr,