From: Christian Grothoff Date: Sun, 12 Feb 2012 19:27:27 +0000 (+0000) Subject: -add missing packed X-Git-Tag: initial-import-from-subversion-38251~14890 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2fb8352a2f66feacd65a8ec26b73d9bf54da9332;p=oweals%2Fgnunet.git -add missing packed --- diff --git a/src/exit/exit.h b/src/exit/exit.h index f7366df20..dcc50f1b3 100644 --- a/src/exit/exit.h +++ b/src/exit/exit.h @@ -28,6 +28,8 @@ #include "gnunet_util_lib.h" +GNUNET_NETWORK_STRUCT_BEGIN + /** * Message send via mesh to an exit daemon to initiate forwarding of * TCP data to a local service. @@ -42,12 +44,12 @@ struct GNUNET_EXIT_TcpServiceStartMessage /** * Always 0. */ - uint32_t reserved; + uint32_t reserved GNUNET_PACKED; /** * Identification for the desired service. */ - GNUNET_HashCode service_descriptor; + GNUNET_HashCode service_descriptor GNUNET_PACKED; /** * Skeleton of the TCP header to send. Port numbers are to @@ -73,7 +75,7 @@ struct GNUNET_EXIT_TcpInternetStartMessage /** * Address family, AF_INET or AF_INET6, in network byte order. */ - int32_t af; + int32_t af GNUNET_PACKED; /** * Skeleton of the TCP header to send. Port numbers are to @@ -104,7 +106,7 @@ struct GNUNET_EXIT_TcpDataMessage /** * Always 0. */ - uint32_t reserved; + uint32_t reserved GNUNET_PACKED; /** * Skeleton of the TCP header to send. Port numbers are to @@ -130,17 +132,17 @@ struct GNUNET_EXIT_UdpServiceMessage /** * Source port to use for the UDP request (0 to use a random port). In NBO. */ - uint16_t source_port; + uint16_t source_port GNUNET_PACKED; /** * Destination port to use for the UDP request. In NBO. */ - uint16_t destination_port; + uint16_t destination_port GNUNET_PACKED; /** * Identification for the desired service. */ - GNUNET_HashCode service_descriptor; + GNUNET_HashCode service_descriptor GNUNET_PACKED; /* followed by UDP payload */ }; @@ -160,17 +162,17 @@ struct GNUNET_EXIT_UdpInternetMessage /** * Address family, AF_INET or AF_INET6, in network byte order. */ - int32_t af; + int32_t af GNUNET_PACKED; /** * Source port to use for the UDP request (0 to use a random port). In NBO. */ - uint16_t source_port; + uint16_t source_port GNUNET_PACKED; /** * Destination port to use for the UDP request. In NBO. */ - uint16_t destination_port; + uint16_t destination_port GNUNET_PACKED; /* followed by IP address of the destination; either 'struct in_addr' or 'struct in6_addr', depending on af */ @@ -194,13 +196,13 @@ struct GNUNET_EXIT_UdpReplyMessage * Source port to use for the UDP reply (0 to use the same * port as for the original request). In NBO. */ - uint16_t source_port; + uint16_t source_port GNUNET_PACKED; /** * Destination port to use for the UDP reply (0 to use the same * port as for the original request). In NBO. */ - uint16_t destination_port; + uint16_t destination_port GNUNET_PACKED; /* followed by UDP payload */ }; @@ -223,12 +225,12 @@ struct GNUNET_EXIT_IcmpServiceMessage * The receiver (exit) may still have to translate (PT) to the services' * ICMP version (if possible). */ - int32_t af; + int32_t af GNUNET_PACKED; /** * Identification for the desired service. */ - GNUNET_HashCode service_descriptor; + GNUNET_HashCode service_descriptor GNUNET_PACKED; /** * ICMP header to use. @@ -259,7 +261,7 @@ struct GNUNET_EXIT_IcmpInternetMessage * the IP address format that is used for the target IP. If * PT is necessary, the sender has already done it. */ - int32_t af; + int32_t af GNUNET_PACKED; /** * ICMP header to use. Must match the target 'af' given @@ -292,7 +294,7 @@ struct GNUNET_EXIT_IcmpToVPNMessage * Address family, AF_INET or AF_INET6, in network byte order. * Useful to determine if this is an ICMPv4 or ICMPv6 header. */ - int32_t af; + int32_t af GNUNET_PACKED; /** * ICMP header to use. ICMPv4 or ICMPv6, depending on 'af'. @@ -306,4 +308,6 @@ struct GNUNET_EXIT_IcmpToVPNMessage }; +GNUNET_NETWORK_STRUCT_END + #endif diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h index 4a80e1812..e937f5ef5 100644 --- a/src/vpn/vpn.h +++ b/src/vpn/vpn.h @@ -28,6 +28,8 @@ #include "gnunet_util_lib.h" +GNUNET_NETWORK_STRUCT_BEGIN + /** * Message send by the VPN client to the VPN service requesting * the setup of a redirection from some IP via an exit node to @@ -44,7 +46,7 @@ struct RedirectToIpRequestMessage * GNUNET_YES to notify only after completion of the mesh-level connection, * GNUNET_NO to notify as soon as an address was allocated (in nbo). */ - int32_t nac; + int32_t nac GNUNET_PACKED; /** * How long should the redirection be maintained at most? @@ -54,18 +56,18 @@ struct RedirectToIpRequestMessage /** * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo) */ - int32_t result_af; + int32_t result_af GNUNET_PACKED; /** * Address family used for the destination address (AF_INET or AF_INET6, in nbo) */ - int32_t addr_af; + int32_t addr_af GNUNET_PACKED; /** * Unique ID to match a future response to this request. * Picked by the client. */ - uint64_t request_id; + uint64_t request_id GNUNET_PACKED; /* followed by destination address ('struct in_addr' or 'struct in6_addr') */ @@ -88,7 +90,7 @@ struct RedirectToServiceRequestMessage * GNUNET_YES to notify only after completion of the mesh-level connection, * GNUNET_NO to notify as soon as an address was allocated (in nbo). */ - int32_t nac; + int32_t nac GNUNET_PACKED; /** * How long should the redirection be maintained at most? @@ -98,12 +100,12 @@ struct RedirectToServiceRequestMessage /** * Desired protocol (IPPROTO_UDP or IPPROTO_TCP) */ - int32_t protocol; + int32_t protocol GNUNET_PACKED; /** * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo) */ - int32_t result_af; + int32_t result_af GNUNET_PACKED; /** * Target peer offering the service. @@ -113,13 +115,13 @@ struct RedirectToServiceRequestMessage /** * Service descriptor identifying the service. */ - GNUNET_HashCode service_descriptor; + GNUNET_HashCode service_descriptor GNUNET_PACKED; /** * Unique ID to match a future response to this request. * Picked by the client. */ - uint64_t request_id; + uint64_t request_id GNUNET_PACKED; }; @@ -140,16 +142,18 @@ struct RedirectToIpResponseMessage * Address family of the allocated address that follows; will match * "result_af" from the request, of be "AF_UNSPEC" on errors. */ - int32_t result_af; + int32_t result_af GNUNET_PACKED; /** * Unique ID to match the response to a request. */ - uint64_t request_id; + uint64_t request_id GNUNET_PACKED; /* followed by destination address ('struct in_addr' or 'struct in6_addr') */ }; +GNUNET_NETWORK_STRUCT_END + #endif