diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-04-24 14:47:24 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-04-24 14:47:24 +0000 |
commit | b9a3fbdc52b32aa6bd27941aba76da528f4e0669 (patch) | |
tree | ba48df589a0a669fda1720d8ac036e0245c28490 /src/vpn | |
parent | cbcd55809c1896352f506ebc7252b1044aba476d (diff) | |
download | gnunet-b9a3fbdc52b32aa6bd27941aba76da528f4e0669.tar.gz gnunet-b9a3fbdc52b32aa6bd27941aba76da528f4e0669.zip |
-trying to resolve alignment issue on sparc
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-service-vpn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index bd0aa4a74..5cd636900 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -460,7 +460,7 @@ send_client_reply (struct GNUNET_SERVER_Client *client, | |||
460 | int result_af, | 460 | int result_af, |
461 | const void *addr) | 461 | const void *addr) |
462 | { | 462 | { |
463 | char buf[sizeof (struct RedirectToIpResponseMessage) + sizeof (struct in6_addr)]; | 463 | char buf[sizeof (struct RedirectToIpResponseMessage) + sizeof (struct in6_addr)] GNUNET_ALIGN; |
464 | struct RedirectToIpResponseMessage *res; | 464 | struct RedirectToIpResponseMessage *res; |
465 | size_t rlen; | 465 | size_t rlen; |
466 | 466 | ||
@@ -1742,7 +1742,7 @@ receive_icmp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel, | |||
1742 | { | 1742 | { |
1743 | /* reserve some extra space in case we have an ICMP type here where | 1743 | /* reserve some extra space in case we have an ICMP type here where |
1744 | we will need to make up the payload ourselves */ | 1744 | we will need to make up the payload ourselves */ |
1745 | char buf[size + sizeof (struct GNUNET_TUN_IPv4Header) + 8]; | 1745 | char buf[size + sizeof (struct GNUNET_TUN_IPv4Header) + 8] GNUNET_ALIGN; |
1746 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; | 1746 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; |
1747 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; | 1747 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; |
1748 | struct GNUNET_TUN_IPv4Header *ipv4 = (struct GNUNET_TUN_IPv4Header *) &tun[1]; | 1748 | struct GNUNET_TUN_IPv4Header *ipv4 = (struct GNUNET_TUN_IPv4Header *) &tun[1]; |
@@ -1879,7 +1879,7 @@ receive_icmp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel, | |||
1879 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + | 1879 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + |
1880 | mlen; | 1880 | mlen; |
1881 | { | 1881 | { |
1882 | char buf[size + sizeof (struct GNUNET_TUN_IPv6Header) + 8]; | 1882 | char buf[size + sizeof (struct GNUNET_TUN_IPv6Header) + 8] GNUNET_ALIGN; |
1883 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; | 1883 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; |
1884 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; | 1884 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; |
1885 | struct GNUNET_TUN_IPv6Header *ipv6 = (struct GNUNET_TUN_IPv6Header *) &tun[1]; | 1885 | struct GNUNET_TUN_IPv6Header *ipv6 = (struct GNUNET_TUN_IPv6Header *) &tun[1]; |
@@ -2083,7 +2083,7 @@ receive_udp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel, | |||
2083 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + | 2083 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + |
2084 | mlen; | 2084 | mlen; |
2085 | { | 2085 | { |
2086 | char buf[size]; | 2086 | char buf[size] GNUNET_ALIGN; |
2087 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; | 2087 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; |
2088 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; | 2088 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; |
2089 | struct GNUNET_TUN_IPv4Header *ipv4 = (struct GNUNET_TUN_IPv4Header *) &tun[1]; | 2089 | struct GNUNET_TUN_IPv4Header *ipv4 = (struct GNUNET_TUN_IPv4Header *) &tun[1]; |
@@ -2128,7 +2128,7 @@ receive_udp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel, | |||
2128 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + | 2128 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + |
2129 | mlen; | 2129 | mlen; |
2130 | { | 2130 | { |
2131 | char buf[size]; | 2131 | char buf[size] GNUNET_ALIGN; |
2132 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; | 2132 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; |
2133 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; | 2133 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; |
2134 | struct GNUNET_TUN_IPv6Header *ipv6 = (struct GNUNET_TUN_IPv6Header *) &tun[1]; | 2134 | struct GNUNET_TUN_IPv6Header *ipv6 = (struct GNUNET_TUN_IPv6Header *) &tun[1]; |
@@ -2241,7 +2241,7 @@ receive_tcp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel, | |||
2241 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + | 2241 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + |
2242 | mlen; | 2242 | mlen; |
2243 | { | 2243 | { |
2244 | char buf[size]; | 2244 | char buf[size] GNUNET_ALIGN; |
2245 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; | 2245 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; |
2246 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; | 2246 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; |
2247 | struct GNUNET_TUN_IPv4Header *ipv4 = (struct GNUNET_TUN_IPv4Header *) &tun[1]; | 2247 | struct GNUNET_TUN_IPv4Header *ipv4 = (struct GNUNET_TUN_IPv4Header *) &tun[1]; |
@@ -2280,7 +2280,7 @@ receive_tcp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel, | |||
2280 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + | 2280 | sizeof (struct GNUNET_TUN_Layer2PacketHeader) + |
2281 | mlen; | 2281 | mlen; |
2282 | { | 2282 | { |
2283 | char buf[size]; | 2283 | char buf[size] GNUNET_ALIGN; |
2284 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; | 2284 | struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf; |
2285 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; | 2285 | struct GNUNET_TUN_Layer2PacketHeader *tun = (struct GNUNET_TUN_Layer2PacketHeader*) &msg[1]; |
2286 | struct GNUNET_TUN_IPv6Header *ipv6 = (struct GNUNET_TUN_IPv6Header *) &tun[1]; | 2286 | struct GNUNET_TUN_IPv6Header *ipv6 = (struct GNUNET_TUN_IPv6Header *) &tun[1]; |