projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
porting xdht to new service API, major code de-duplication effort
[oweals/gnunet.git]
/
src
/
nat
/
gnunet-helper-nat-client-windows.c
diff --git
a/src/nat/gnunet-helper-nat-client-windows.c
b/src/nat/gnunet-helper-nat-client-windows.c
index 37b0fea1487c82748519a2ce3437eadeef626fa1..89dad9e7b1a8b8aa81b5d5839527c87570048efe 100644
(file)
--- a/
src/nat/gnunet-helper-nat-client-windows.c
+++ b/
src/nat/gnunet-helper-nat-client-windows.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- Copyright (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.
*/
/**
*/
/**
@@
-265,14
+265,14
@@
send_icmp_udp (const struct in_addr *my_ip, const struct in_addr *other)
ip_pkt.dst_ip = other->s_addr;
ip_pkt.checksum =
htons (calc_checksum ((uint16_t *) & ip_pkt, sizeof (struct ip_header)));
ip_pkt.dst_ip = other->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_pkt.type = ICMP_TIME_EXCEEDED;
icmp_pkt.code = 0;
icmp_pkt.checksum = 0;
icmp_pkt.unused = 0;
off += sizeof (struct ip_header);
icmp_pkt.type = ICMP_TIME_EXCEEDED;
icmp_pkt.code = 0;
icmp_pkt.checksum = 0;
icmp_pkt.unused = 0;
- memcpy (&packet[off], &icmp_pkt, sizeof (struct icmp_ttl_exceeded_header));
+
GNUNET_
memcpy (&packet[off], &icmp_pkt, sizeof (struct icmp_ttl_exceeded_header));
off += sizeof (struct icmp_ttl_exceeded_header);
/* ip header of the presumably 'lost' udp packet */
off += sizeof (struct icmp_ttl_exceeded_header);
/* ip header of the presumably 'lost' udp packet */
@@
-289,7
+289,7
@@
send_icmp_udp (const struct in_addr *my_ip, const struct in_addr *other)
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);
/* build UDP header */
off += sizeof (struct ip_header);
/* build UDP header */
@@
-297,7
+297,7
@@
send_icmp_udp (const struct in_addr *my_ip, const struct in_addr *other)
udp_pkt.dst_port = htons (NAT_TRAV_PORT);
udp_pkt.length = htons (port);
udp_pkt.crc = 0;
udp_pkt.dst_port = htons (NAT_TRAV_PORT);
udp_pkt.length = htons (port);
udp_pkt.crc = 0;
- memcpy (&packet[off], &udp_pkt, sizeof (struct udp_header));
+
GNUNET_
memcpy (&packet[off], &udp_pkt, sizeof (struct udp_header));
off += sizeof (struct udp_header);
/* no go back to calculate ICMP packet checksum */
off += sizeof (struct udp_header);
/* no go back to calculate ICMP packet checksum */
@@
-306,7
+306,7
@@
send_icmp_udp (const struct in_addr *my_ip, const struct in_addr *other)
((uint16_t *) & packet[off],
sizeof (struct icmp_ttl_exceeded_header) +
sizeof (struct ip_header) + sizeof (struct udp_header)));
((uint16_t *) & packet[off],
sizeof (struct icmp_ttl_exceeded_header) +
sizeof (struct ip_header) + sizeof (struct udp_header)));
- memcpy (&packet[sizeof (struct ip_header)], &icmp_pkt,
+
GNUNET_
memcpy (&packet[sizeof (struct ip_header)], &icmp_pkt,
sizeof (struct icmp_ttl_exceeded_header));
memset (&dst, 0, sizeof (dst));
sizeof (struct icmp_ttl_exceeded_header));
memset (&dst, 0, sizeof (dst));
@@
-359,7
+359,7
@@
send_icmp (const struct in_addr *my_ip, const struct in_addr *other)
ip_pkt.dst_ip = other->s_addr;
ip_pkt.checksum =
htons (calc_checksum ((uint16_t *) & ip_pkt, sizeof (struct ip_header)));
ip_pkt.dst_ip = other->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 (ip_pkt);
/* icmp reply: time exceeded */
off += sizeof (ip_pkt);
/* icmp reply: time exceeded */
@@
-367,7
+367,7
@@
send_icmp (const struct in_addr *my_ip, const struct in_addr *other)
icmp_ttl.code = 0;
icmp_ttl.checksum = 0;
icmp_ttl.unused = 0;
icmp_ttl.code = 0;
icmp_ttl.checksum = 0;
icmp_ttl.unused = 0;
- memcpy (&packet[off], &icmp_ttl, sizeof (struct icmp_ttl_exceeded_header));
+
GNUNET_
memcpy (&packet[off], &icmp_ttl, sizeof (struct icmp_ttl_exceeded_header));
off += sizeof (struct icmp_ttl_exceeded_header);
/* ip header of the presumably 'lost' udp packet */
off += sizeof (struct icmp_ttl_exceeded_header);
/* ip header of the presumably 'lost' udp packet */
@@
-384,7
+384,7
@@
send_icmp (const struct in_addr *my_ip, const struct in_addr *other)
ip_pkt.checksum = 0;
ip_pkt.checksum =
htons (calc_checksum ((uint16_t *) & ip_pkt, sizeof (struct ip_header)));
ip_pkt.checksum = 0;
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;
@@
-394,7
+394,7
@@
send_icmp (const struct in_addr *my_ip, const struct in_addr *other)
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));
/* no go back to calculate ICMP packet checksum */
off = sizeof (struct ip_header);
/* no go back to calculate ICMP packet checksum */
off = sizeof (struct ip_header);
@@
-403,7
+403,7
@@
send_icmp (const struct in_addr *my_ip, const struct in_addr *other)
((uint16_t *) & packet[off],
sizeof (struct icmp_ttl_exceeded_header) +
sizeof (struct ip_header) + sizeof (struct icmp_echo_header)));
((uint16_t *) & packet[off],
sizeof (struct icmp_ttl_exceeded_header) +
sizeof (struct ip_header) + sizeof (struct icmp_echo_header)));
- memcpy (&packet[off], &icmp_ttl, sizeof (struct icmp_ttl_exceeded_header));
+
GNUNET_
memcpy (&packet[off], &icmp_ttl, sizeof (struct icmp_ttl_exceeded_header));
memset (&dst, 0, sizeof (dst));
dst.sin_family = AF_INET;
memset (&dst, 0, sizeof (dst));
dst.sin_family = AF_INET;