[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18730 - in gnunet/src: arm ats ats-test chat core datastor
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18730 - in gnunet/src: arm ats ats-test chat core datastore dht dv fragmentation fs hello hostlist include mesh nat nse peerinfo statistics testing transport util vpn |
|
Date: |
Wed, 21 Dec 2011 10:40:16 +0100 |
Author: grothoff
Date: 2011-12-21 10:40:15 +0100 (Wed, 21 Dec 2011)
New Revision: 18730
Modified:
gnunet/src/arm/arm.h
gnunet/src/ats-test/test_transport_ats_multiple_peers.c
gnunet/src/ats/ats.h
gnunet/src/chat/chat.h
gnunet/src/core/core.h
gnunet/src/core/gnunet-service-core_kx.c
gnunet/src/datastore/datastore.h
gnunet/src/dht/dht.h
gnunet/src/dht/gnunet-service-dht_neighbours.c
gnunet/src/dv/dv.h
gnunet/src/dv/test_transport_api_dv.c
gnunet/src/fragmentation/fragmentation.h
gnunet/src/fs/fs.h
gnunet/src/fs/gnunet-service-fs.h
gnunet/src/hello/hello.c
gnunet/src/hostlist/gnunet-daemon-hostlist.c
gnunet/src/include/block_dns.h
gnunet/src/include/block_fs.h
gnunet/src/include/gnunet_ats_service.h
gnunet/src/include/gnunet_bandwidth_lib.h
gnunet/src/include/gnunet_common.h
gnunet/src/include/gnunet_crypto_lib.h
gnunet/src/include/gnunet_time_lib.h
gnunet/src/mesh/mesh.h
gnunet/src/mesh/mesh_protocol.h
gnunet/src/nat/nat.h
gnunet/src/nse/gnunet-service-nse.c
gnunet/src/nse/nse.h
gnunet/src/peerinfo/peerinfo.h
gnunet/src/statistics/statistics.h
gnunet/src/testing/test_testing_large_topology.c
gnunet/src/testing/test_testing_topology.c
gnunet/src/testing/test_testing_topology_blacklist.c
gnunet/src/testing/test_testing_topology_churn.c
gnunet/src/transport/gnunet-helper-transport-wlan.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/gnunet-service-transport_validation.c
gnunet/src/transport/gnunet-transport-wlan-sender.c
gnunet/src/transport/plugin_transport_http.h
gnunet/src/transport/plugin_transport_smtp.c
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/transport/plugin_transport_udp.c
gnunet/src/transport/plugin_transport_udp_new.c
gnunet/src/transport/plugin_transport_unix.c
gnunet/src/transport/plugin_transport_wlan.c
gnunet/src/transport/plugin_transport_wlan.h
gnunet/src/transport/test_quota_compliance.c
gnunet/src/transport/test_transport_api_reliability.c
gnunet/src/transport/test_transport_api_unreliability.c
gnunet/src/transport/test_transport_api_unreliability_constant.c
gnunet/src/transport/transport.h
gnunet/src/util/crypto_ksk.c
gnunet/src/util/crypto_rsa.c
gnunet/src/util/resolver.h
gnunet/src/vpn/gnunet-service-dns-p.h
gnunet/src/vpn/gnunet-service-dns.c
gnunet/src/vpn/gnunet-vpn-packet.h
Log:
fixing 2012: network structure alignment now forced to be correct even on W32
using #pragma pack from gcc 4.x
Modified: gnunet/src/arm/arm.h
===================================================================
--- gnunet/src/arm/arm.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/arm/arm.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -33,6 +33,7 @@
*/
#define DEBUG_ARM GNUNET_EXTRA_LOGGING
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* Reply from ARM to client.
@@ -50,6 +51,6 @@
*/
uint32_t status;
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
Modified: gnunet/src/ats/ats.h
===================================================================
--- gnunet/src/ats/ats.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/ats/ats.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -39,6 +39,7 @@
START_FLAG_PERFORMANCE_NO_PIC = 2
};
+GNUNET_NETWORK_STRUCT_BEGIN
struct ClientStartMessage
{
@@ -214,7 +215,6 @@
struct GNUNET_TIME_RelativeNBO res_delay;
};
-
struct PreferenceInformation
{
@@ -236,6 +236,7 @@
/* followed by 'num_preferences'
* struct PreferenceInformation values */
};
+GNUNET_NETWORK_STRUCT_END
Modified: gnunet/src/ats-test/test_transport_ats_multiple_peers.c
===================================================================
--- gnunet/src/ats-test/test_transport_ats_multiple_peers.c 2011-12-21
08:58:15 UTC (rev 18729)
+++ gnunet/src/ats-test/test_transport_ats_multiple_peers.c 2011-12-21
09:40:15 UTC (rev 18730)
@@ -68,11 +68,14 @@
uint64_t state;
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct TestMessage
{
struct GNUNET_MessageHeader header;
uint32_t num;
};
+GNUNET_NETWORK_STRUCT_END
static int count;
Modified: gnunet/src/chat/chat.h
===================================================================
--- gnunet/src/chat/chat.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/chat/chat.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -41,6 +41,8 @@
* Client-service messages
*/
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Notification sent by service to client indicating that we've received a chat
* message. After this struct, the remaining bytes are the actual text
message.
@@ -476,6 +478,7 @@
GNUNET_HashCode content;
};
+GNUNET_NETWORK_STRUCT_END
#endif
Modified: gnunet/src/core/core.h
===================================================================
--- gnunet/src/core/core.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/core/core.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -50,6 +50,8 @@
#define GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND 64
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message transmitted core clients to gnunet-service-core
* to start the interaction. This header is followed by
@@ -373,6 +375,6 @@
struct GNUNET_PeerIdentity peer;
};
-
+GNUNET_NETWORK_STRUCT_END
#endif
/* end of core.h */
Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/core/gnunet-service-core_kx.c 2011-12-21 09:40:15 UTC (rev
18730)
@@ -62,6 +62,8 @@
#define MAX_SET_KEY_DELAY GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10)
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* We're sending an (encrypted) PING to the other peer to check if he
* can decrypt. The other peer should respond with a PONG with the
@@ -213,7 +215,7 @@
struct GNUNET_TIME_AbsoluteNBO timestamp;
};
-
+GNUNET_NETWORK_STRUCT_END
/**
* Number of bytes (at the beginning) of "struct EncryptedMessage"
* that are NOT encrypted.
Modified: gnunet/src/datastore/datastore.h
===================================================================
--- gnunet/src/datastore/datastore.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/datastore/datastore.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -31,6 +31,8 @@
#include "gnunet_util_lib.h"
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message from datastore service informing client about
* the current size of the datastore.
@@ -254,8 +256,8 @@
GNUNET_HashCode key GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
Modified: gnunet/src/dht/dht.h
===================================================================
--- gnunet/src/dht/dht.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/dht/dht.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -34,6 +34,8 @@
#define DHT_BLOOM_SIZE 128
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message which indicates the DHT should cancel outstanding
* requests and discard any state.
@@ -191,6 +193,6 @@
/* DATA copied to end of this message */
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
Modified: gnunet/src/dht/gnunet-service-dht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_neighbours.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/dht/gnunet-service-dht_neighbours.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -90,6 +90,8 @@
#define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* P2P PUT message
*/
@@ -246,8 +248,8 @@
/* result bloomfilter */
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Linked list of messages to send to a particular other peer.
*/
Modified: gnunet/src/dv/dv.h
===================================================================
--- gnunet/src/dv/dv.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/dv/dv.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -44,6 +44,8 @@
char *sender_address,
size_t sender_address_len);
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* DV Message, contains a message that was received
* via DV for this peer! Internal.
@@ -255,8 +257,8 @@
uint32_t peer_id GNUNET_PACKED;
} p2p_dv_MESSAGE_Disconnect;
+GNUNET_NETWORK_STRUCT_END
-
struct GNUNET_DV_Handle *
GNUNET_DV_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
GNUNET_DV_MessageReceivedHandler receive_handler,
Modified: gnunet/src/dv/test_transport_api_dv.c
===================================================================
--- gnunet/src/dv/test_transport_api_dv.c 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/dv/test_transport_api_dv.c 2011-12-21 09:40:15 UTC (rev
18730)
@@ -108,6 +108,8 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct GNUNET_TestMessage
{
/**
@@ -120,6 +122,7 @@
*/
uint32_t uid;
};
+GNUNET_NETWORK_STRUCT_END
struct PeerContext
{
Modified: gnunet/src/fragmentation/fragmentation.h
===================================================================
--- gnunet/src/fragmentation/fragmentation.h 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/fragmentation/fragmentation.h 2011-12-21 09:40:15 UTC (rev
18730)
@@ -27,6 +27,8 @@
#include "platform.h"
#include "gnunet_fragmentation_lib.h"
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Header for a message fragment. Followed by the
* original message.
@@ -82,6 +84,6 @@
uint64_t bits;
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
Modified: gnunet/src/fs/fs.h
===================================================================
--- gnunet/src/fs/fs.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/fs/fs.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -64,6 +64,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message sent from a GNUnet (fs) publishing activity to the
* gnunet-fs-service to initiate indexing of a file. The service is
@@ -288,9 +290,9 @@
/* this is followed by the actual encrypted content */
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
/* end of fs.h */
Modified: gnunet/src/fs/gnunet-service-fs.h
===================================================================
--- gnunet/src/fs/gnunet-service-fs.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/fs/gnunet-service-fs.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -82,6 +82,8 @@
#define GET_MESSAGE_BIT_TRANSMIT_TO 4
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message sent between peers asking for FS-content.
*/
@@ -161,8 +163,8 @@
struct GNUNET_TIME_RelativeNBO duration;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* A connected peer.
*/
Modified: gnunet/src/hello/hello.c
===================================================================
--- gnunet/src/hello/hello.c 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/hello/hello.c 2011-12-21 09:40:15 UTC (rev 18730)
@@ -28,6 +28,8 @@
#include "gnunet_protocols.h"
#include "gnunet_util_lib.h"
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* A HELLO message is used to exchange information about
* transports with other peers. This struct is always
@@ -59,8 +61,8 @@
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded publicKey;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Copy the given address information into
* the given buffer using the format of HELLOs.
Modified: gnunet/src/hostlist/gnunet-daemon-hostlist.c
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -99,6 +99,8 @@
*/
static GNUNET_CORE_DisconnectEventHandler client_dh;
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* A HOSTLIST_ADV message is used to exchange information about
* hostlist advertisements. This struct is always
@@ -123,8 +125,8 @@
*/
uint32_t reserved GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
static struct GNUNET_PeerIdentity me;
static void
Modified: gnunet/src/include/block_dns.h
===================================================================
--- gnunet/src/include/block_dns.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/include/block_dns.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -13,6 +13,7 @@
GNUNET_DNS_SERVICE_TYPE_TCP = 2
};
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* This is the structure describing an dns-record such as www.gnunet.
@@ -57,5 +58,6 @@
*/
uint32_t service_type GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
#endif
Modified: gnunet/src/include/block_fs.h
===================================================================
--- gnunet/src/include/block_fs.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/include/block_fs.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -139,6 +139,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* @brief index block (indexing a DBlock that
* can be obtained directly from reading
@@ -160,6 +162,6 @@
uint64_t offset GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
Modified: gnunet/src/include/gnunet_ats_service.h
===================================================================
--- gnunet/src/include/gnunet_ats_service.h 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/include/gnunet_ats_service.h 2011-12-21 09:40:15 UTC (rev
18730)
@@ -403,6 +403,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* struct used to communicate the transport's properties like cost and
* quality of service as well as high-level constraints on resource
@@ -433,9 +435,9 @@
*/
uint32_t value GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/* ******************************** Scheduling API
***************************** */
/**
Modified: gnunet/src/include/gnunet_bandwidth_lib.h
===================================================================
--- gnunet/src/include/gnunet_bandwidth_lib.h 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/include/gnunet_bandwidth_lib.h 2011-12-21 09:40:15 UTC (rev
18730)
@@ -38,6 +38,8 @@
#include "gnunet_common.h"
#include "gnunet_time_lib.h"
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* 32-bit bandwidth used for network exchange by GNUnet, in bytes per second.
*/
@@ -48,8 +50,8 @@
*/
uint32_t value__ GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Struct to track available bandwidth. Combines a time stamp with a
* number of bytes transmitted, a quota and a maximum amount that
Modified: gnunet/src/include/gnunet_common.h
===================================================================
--- gnunet/src/include/gnunet_common.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/include/gnunet_common.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -116,9 +116,37 @@
*/
#define GNUNET_UNUSED __attribute__((unused))
+#if __GNUC__ > 3
+/**
+ * gcc 4.x-ism to pack structures even on W32 (to be used before structs)
+ */
+#define GNUNET_NETWORK_STRUCT_BEGIN \
+ _Pragma("pack(push)") \
+ _Pragma("pack(1)")
+/**
+ * gcc 4.x-ism to pack structures even on W32 (to be used after structs)
+ */
+#define GNUNET_NETWORK_STRUCT_END _Pragma("pack(pop)")
+#else
+#ifdef MINGW
+#error gcc 4.x or higher required on W32 systems
+#endif
+/**
+ * Good luck, GNUNET_PACKED should suffice, but this won't work on W32
+ */
+#define GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Good luck, GNUNET_PACKED should suffice, but this won't work on W32
+ */
+#define GNUNET_NETWORK_STRUCT_END
+#endif
+
/* ************************ super-general types *********************** */
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Header for all communications.
*/
@@ -137,8 +165,8 @@
uint16_t type GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* @brief 512-bit hashcode
*/
@@ -149,6 +177,8 @@
GNUNET_HashCode;
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* The identity of the host (basically the SHA-512 hashcode of
* it's public key).
@@ -157,8 +187,8 @@
{
GNUNET_HashCode hashPubKey GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Function called with a filename.
*
Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/include/gnunet_crypto_lib.h 2011-12-21 09:40:15 UTC (rev
18730)
@@ -121,6 +121,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* @brief header of what an RSA signature signs
* this must be followed by "size - 8" bytes of
@@ -197,8 +199,8 @@
*/
uint32_t crc32 GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* @brief IV for sym cipher
*
Modified: gnunet/src/include/gnunet_time_lib.h
===================================================================
--- gnunet/src/include/gnunet_time_lib.h 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/include/gnunet_time_lib.h 2011-12-21 09:40:15 UTC (rev
18730)
@@ -61,6 +61,7 @@
uint64_t rel_value;
};
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* Time for relative time used by GNUnet, in milliseconds and in network byte
order.
@@ -84,8 +85,8 @@
*/
uint64_t abs_value__ GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Relative time zero.
*/
Modified: gnunet/src/mesh/mesh.h
===================================================================
--- gnunet/src/mesh/mesh.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/mesh/mesh.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -85,6 +85,8 @@
/************************** MESSAGES
******************************/
/******************************************************************************/
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message for a client to register to the service
*/
@@ -209,8 +211,8 @@
*/
GNUNET_MESH_ApplicationType type GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/******************************************************************************/
/************************ ENUMERATIONS
****************************/
/******************************************************************************/
Modified: gnunet/src/mesh/mesh_protocol.h
===================================================================
--- gnunet/src/mesh/mesh_protocol.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/mesh/mesh_protocol.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -39,6 +39,8 @@
/******************** MESH NETWORK MESSAGES
**************************/
/******************************************************************************/
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message for mesh path management
*/
@@ -276,6 +278,7 @@
uint32_t speed_min;
};
+GNUNET_NETWORK_STRUCT_END
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: gnunet/src/nat/nat.h
===================================================================
--- gnunet/src/nat/nat.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/nat/nat.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -30,6 +30,8 @@
#define DEBUG_NAT GNUNET_EXTRA_LOGGING
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Request to test NAT traversal.
*/
@@ -61,5 +63,6 @@
int32_t is_tcp;
};
+GNUNET_NETWORK_STRUCT_END
#endif
Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/nse/gnunet-service-nse.c 2011-12-21 09:40:15 UTC (rev 18730)
@@ -128,6 +128,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Network size estimate reply; sent when "this"
* peer's timer has run out before receiving a
@@ -178,8 +180,8 @@
*/
struct GNUNET_CRYPTO_RsaSignature signature;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Handle to our current configuration.
*/
Modified: gnunet/src/nse/nse.h
===================================================================
--- gnunet/src/nse/nse.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/nse/nse.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -35,6 +35,8 @@
*/
#define DEBUG_NSE GNUNET_EXTRA_LOGGING
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Network size estimate sent from the service
* to clients. Contains the current size estimate
@@ -71,6 +73,6 @@
*/
double std_deviation GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
Modified: gnunet/src/peerinfo/peerinfo.h
===================================================================
--- gnunet/src/peerinfo/peerinfo.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/peerinfo/peerinfo.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -29,6 +29,8 @@
#define DEBUG_PEERINFO GNUNET_EXTRA_LOGGING
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message requesting a listing of all known peers,
* possibly restricted to the specified peer identity.
@@ -81,6 +83,6 @@
struct GNUNET_PeerIdentity peer;
};
+GNUNET_NETWORK_STRUCT_END
-
/* end of peerinfo.h */
Modified: gnunet/src/statistics/statistics.h
===================================================================
--- gnunet/src/statistics/statistics.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/statistics/statistics.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -29,6 +29,8 @@
#define DEBUG_STATISTICS GNUNET_EXTRA_LOGGING
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Statistics message. Contains how long the system is up
* and one value.
@@ -128,6 +130,6 @@
uint64_t value GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
#endif
Modified: gnunet/src/testing/test_testing_large_topology.c
===================================================================
--- gnunet/src/testing/test_testing_large_topology.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/testing/test_testing_large_topology.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -107,6 +107,8 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct GNUNET_TestMessage
{
/**
@@ -119,6 +121,7 @@
*/
uint32_t uid;
};
+GNUNET_NETWORK_STRUCT_END
struct TestMessageContext
{
Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/testing/test_testing_topology.c 2011-12-21 09:40:15 UTC (rev
18730)
@@ -115,6 +115,8 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct GNUNET_TestMessage
{
/**
@@ -127,6 +129,7 @@
*/
uint32_t uid;
};
+GNUNET_NETWORK_STRUCT_END
struct TestMessageContext
{
Modified: gnunet/src/testing/test_testing_topology_blacklist.c
===================================================================
--- gnunet/src/testing/test_testing_topology_blacklist.c 2011-12-21
08:58:15 UTC (rev 18729)
+++ gnunet/src/testing/test_testing_topology_blacklist.c 2011-12-21
09:40:15 UTC (rev 18730)
@@ -85,6 +85,8 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct GNUNET_TestMessage
{
/**
@@ -97,8 +99,8 @@
*/
uint32_t uid;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Check whether peers successfully shut down.
*/
Modified: gnunet/src/testing/test_testing_topology_churn.c
===================================================================
--- gnunet/src/testing/test_testing_topology_churn.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/testing/test_testing_topology_churn.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -59,6 +59,8 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct GNUNET_TestMessage
{
/**
@@ -71,6 +73,7 @@
*/
uint32_t uid;
};
+GNUNET_NETWORK_STRUCT_END
/**
* Check whether peers successfully shut down.
Modified: gnunet/src/transport/gnunet-helper-transport-wlan.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-wlan.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/gnunet-helper-transport-wlan.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -328,6 +328,7 @@
char buf[MAXLINE * 2];
};
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* generic definitions for IEEE 802.11 frames
@@ -343,8 +344,8 @@
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
} GNUNET_PACKED;
+GNUNET_NETWORK_STRUCT_END
-
/**
* struct for storing the information of the hardware
*/
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-12-21
08:58:15 UTC (rev 18729)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2011-12-21
09:40:15 UTC (rev 18730)
@@ -69,6 +69,8 @@
*/
struct NeighbourMapEntry;
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message a peer sends to another to indicate its
* preference for communicating via a particular
@@ -133,8 +135,8 @@
struct GNUNET_CRYPTO_RsaSignature signature;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* For each neighbour we keep a list of messages
* that we still want to transmit to the neighbour.
Modified: gnunet/src/transport/gnunet-service-transport_validation.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.c 2011-12-21
08:58:15 UTC (rev 18729)
+++ gnunet/src/transport/gnunet-service-transport_validation.c 2011-12-21
09:40:15 UTC (rev 18730)
@@ -92,6 +92,8 @@
#define PONG_PRIORITY 4
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message used to ask a peer to validate receipt (to check an address
* from a HELLO). Followed by the address we are trying to validate,
@@ -166,8 +168,8 @@
uint32_t addrlen GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Information about an address under validation
*/
Modified: gnunet/src/transport/gnunet-transport-wlan-sender.c
===================================================================
--- gnunet/src/transport/gnunet-transport-wlan-sender.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/gnunet-transport-wlan-sender.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -46,6 +46,7 @@
#define IEEE80211_FC0_TYPE_CTL 0x04
#define IEEE80211_FC0_TYPE_DATA 0x08
+GNUNET_NETWORK_STRUCT_BEGIN
/*
* generic definitions for IEEE 802.11 frames
@@ -60,8 +61,8 @@
u_int8_t i_seq[2];
u_int8_t llc[4];
} GNUNET_PACKED;
+GNUNET_NETWORK_STRUCT_END
-
/**
* function to fill the radiotap header
* @param header pointer to the radiotap header
Modified: gnunet/src/transport/plugin_transport_http.h
===================================================================
--- gnunet/src/transport/plugin_transport_http.h 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/plugin_transport_http.h 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -260,6 +260,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* IPv4 addresses
*/
@@ -291,8 +293,8 @@
*/
uint16_t u6_port GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Session handle for connections.
*/
Modified: gnunet/src/transport/plugin_transport_smtp.c
===================================================================
--- gnunet/src/transport/plugin_transport_smtp.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/plugin_transport_smtp.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -72,6 +72,8 @@
} EmailAddress;
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Encapsulation of a GNUnet message in the SMTP mail body (before
* base64 encoding).
@@ -86,6 +88,7 @@
GNUNET_PeerIdentity sender;
} SMTPMessage;
+GNUNET_NETWORK_STRUCT_END
/* *********** globals ************* */
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/transport/plugin_transport_tcp.c 2011-12-21 09:40:15 UTC (rev
18730)
@@ -43,6 +43,8 @@
#define DEBUG_TCP_NAT GNUNET_EXTRA_LOGGING
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Initial handshake message for a session.
*/
@@ -78,8 +80,8 @@
struct GNUNET_PeerIdentity clientIdentity;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Context for sending a NAT probe via TCP.
*/
@@ -118,6 +120,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Network format for IPv4 addresses.
*/
@@ -152,8 +156,8 @@
uint16_t t6_port GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Encapsulation of all of the state of the plugin.
*/
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/transport/plugin_transport_udp.c 2011-12-21 09:40:15 UTC (rev
18730)
@@ -70,6 +70,8 @@
#define UDP_MAX_SENDER_ADDRESSES_WITH_DEFRAG 128
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* UDP Message-Packet header (after defragmentation).
*/
@@ -92,7 +94,6 @@
};
-
/**
* UDP ACK Message-Packet header (after defragmentation).
*/
@@ -162,8 +163,8 @@
*/
uint16_t u6_port GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/* Forward definition */
struct Plugin;
Modified: gnunet/src/transport/plugin_transport_udp_new.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp_new.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/plugin_transport_udp_new.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -70,6 +70,8 @@
#define UDP_MAX_SENDER_ADDRESSES_WITH_DEFRAG 128
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* UDP Message-Packet header (after defragmentation).
*/
@@ -148,8 +150,8 @@
*/
uint16_t u6_port GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
-
/* Forward definition */
struct Plugin;
Modified: gnunet/src/transport/plugin_transport_unix.c
===================================================================
--- gnunet/src/transport/plugin_transport_unix.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/plugin_transport_unix.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -64,6 +64,8 @@
*/
#define UNIX_NAT_DEFAULT_PORT 22086
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* UNIX Message-Packet header.
*/
@@ -131,6 +133,7 @@
*/
uint16_t u6_port GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
/* Forward definition */
struct Plugin;
Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/plugin_transport_wlan.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -120,6 +120,8 @@
#define IEEE80211_FC0_TYPE_CTL 0x04
#define IEEE80211_FC0_TYPE_DATA 0x08
+GNUNET_NETWORK_STRUCT_BEGIN
+
/*
* generic definitions for IEEE 802.11 frames
*/
@@ -133,6 +135,7 @@
u_int8_t i_seq[2];
u_int8_t llc[4];
} GNUNET_PACKED;
+GNUNET_NETWORK_STRUCT_END
/**
* Encapsulation of all of the state of the plugin.
@@ -361,6 +364,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Header for messages which need fragmentation
*/
@@ -388,8 +393,8 @@
// followed by payload
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Information kept for each message that is yet to
* be transmitted.
Modified: gnunet/src/transport/plugin_transport_wlan.h
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.h 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/plugin_transport_wlan.h 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -43,6 +43,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Format of a WLAN Control Message.
*/
@@ -58,8 +60,8 @@
*/
struct MacAddress mac;
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* GNUnet bssid
*/
Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c 2011-12-21 08:58:15 UTC
(rev 18729)
+++ gnunet/src/transport/test_quota_compliance.c 2011-12-21 09:40:15 UTC
(rev 18730)
@@ -104,11 +104,14 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct TestMessage
{
struct GNUNET_MessageHeader header;
uint32_t num;
};
+GNUNET_NETWORK_STRUCT_END
static int msg_scheduled;
static int msg_sent;
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2011-12-21
08:58:15 UTC (rev 18729)
+++ gnunet/src/transport/test_transport_api_reliability.c 2011-12-21
09:40:15 UTC (rev 18730)
@@ -97,11 +97,14 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct TestMessage
{
struct GNUNET_MessageHeader header;
uint32_t num;
};
+GNUNET_NETWORK_STRUCT_END
static int msg_scheduled;
static int msg_sent;
Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c 2011-12-21
08:58:15 UTC (rev 18729)
+++ gnunet/src/transport/test_transport_api_unreliability.c 2011-12-21
09:40:15 UTC (rev 18730)
@@ -93,11 +93,14 @@
#define MTYPE 12345
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct TestMessage
{
struct GNUNET_MessageHeader header;
uint32_t num;
};
+GNUNET_NETWORK_STRUCT_END
static char *test_name;
Modified: gnunet/src/transport/test_transport_api_unreliability_constant.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_constant.c
2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/transport/test_transport_api_unreliability_constant.c
2011-12-21 09:40:15 UTC (rev 18730)
@@ -97,11 +97,14 @@
#define MSG_SIZE 10000
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct TestMessage
{
struct GNUNET_MessageHeader header;
uint32_t num;
};
+GNUNET_NETWORK_STRUCT_END
static char *test_name;
Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/transport/transport.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -61,6 +61,8 @@
*/
#define CONNECTED_LATENCY_EVALUATION_MAX_DELAY GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MINUTES, 1)
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Message from the transport service to the library
* asking to check if both processes agree about this
@@ -430,7 +432,7 @@
struct GNUNET_PeerIdentity peer;
};
+GNUNET_NETWORK_STRUCT_END
-
/* end of transport.h */
#endif
Modified: gnunet/src/util/crypto_ksk.c
===================================================================
--- gnunet/src/util/crypto_ksk.c 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/util/crypto_ksk.c 2011-12-21 09:40:15 UTC (rev 18730)
@@ -463,6 +463,7 @@
gcry_mpi_release (g);
}
+GNUNET_NETWORK_STRUCT_BEGIN
/**
* Internal representation of the private key.
@@ -482,8 +483,8 @@
uint16_t sizedmq1 GNUNET_PACKED; /* in big-endian! */
/* followed by the actual values */
};
+GNUNET_NETWORK_STRUCT_END
-
/**
* Deterministically (!) create a hostkey using only the
* given HashCode as input to the PRNG.
Modified: gnunet/src/util/crypto_rsa.c
===================================================================
--- gnunet/src/util/crypto_rsa.c 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/util/crypto_rsa.c 2011-12-21 09:40:15 UTC (rev 18730)
@@ -53,6 +53,8 @@
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* GNUnet mandates a certain format for the encoding
* of private RSA key information that is provided
@@ -75,8 +77,8 @@
uint16_t sizedmq1 GNUNET_PACKED; /* in big-endian! */
/* followed by the actual values */
};
+GNUNET_NETWORK_STRUCT_END
-
#define HOSTKEY_LEN 2048
#define EXTRA_CHECKS ALLOW_EXTRA_CHECKS
Modified: gnunet/src/util/resolver.h
===================================================================
--- gnunet/src/util/resolver.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/util/resolver.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -29,6 +29,8 @@
#define DEBUG_RESOLVER GNUNET_EXTRA_LOGGING
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* Request for the resolver. Followed by either
* the "struct sockaddr" or the 0-terminated hostname.
@@ -59,5 +61,6 @@
int32_t domain GNUNET_PACKED;
};
+GNUNET_NETWORK_STRUCT_END
#endif
Modified: gnunet/src/vpn/gnunet-service-dns-p.h
===================================================================
--- gnunet/src/vpn/gnunet-service-dns-p.h 2011-12-21 08:58:15 UTC (rev
18729)
+++ gnunet/src/vpn/gnunet-service-dns-p.h 2011-12-21 09:40:15 UTC (rev
18730)
@@ -3,6 +3,8 @@
#include "gnunet_common.h"
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct query_packet
{
struct GNUNET_MessageHeader hdr;
@@ -109,5 +111,6 @@
struct GNUNET_SERVER_Client *client;
struct answer_packet pkt;
};
+GNUNET_NETWORK_STRUCT_END
#endif
Modified: gnunet/src/vpn/gnunet-service-dns.c
===================================================================
--- gnunet/src/vpn/gnunet-service-dns.c 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/vpn/gnunet-service-dns.c 2011-12-21 09:40:15 UTC (rev 18730)
@@ -287,12 +287,15 @@
return len;
}
+GNUNET_NETWORK_STRUCT_BEGIN
+
struct tunnel_cls
{
struct GNUNET_MESH_Tunnel *tunnel GNUNET_PACKED;
struct GNUNET_MessageHeader hdr;
struct dns_pkt dns;
};
+GNUNET_NETWORK_STRUCT_END
struct tunnel_cls *remote_pending[UINT16_MAX];
Modified: gnunet/src/vpn/gnunet-vpn-packet.h
===================================================================
--- gnunet/src/vpn/gnunet-vpn-packet.h 2011-12-21 08:58:15 UTC (rev 18729)
+++ gnunet/src/vpn/gnunet-vpn-packet.h 2011-12-21 09:40:15 UTC (rev 18730)
@@ -4,6 +4,8 @@
#include "platform.h"
#include "gnunet_common.h"
+GNUNET_NETWORK_STRUCT_BEGIN
+
// Headers
struct pkt_tun
{
@@ -100,6 +102,7 @@
uint16_t nscount GNUNET_PACKED; // number of authority-records
uint16_t arcount GNUNET_PACKED; // number of additional records
};
+GNUNET_NETWORK_STRUCT_END
struct dns_pkt
{
@@ -156,6 +159,8 @@
struct dns_pkt data;
};
+GNUNET_NETWORK_STRUCT_BEGIN
+
// Complete Packets
struct tun_pkt
{
@@ -246,5 +251,6 @@
struct ip_hdr ip_hdr;
struct icmp_hdr icmp_hdr;
};
+GNUNET_NETWORK_STRUCT_END
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18730 - in gnunet/src: arm ats ats-test chat core datastore dht dv fragmentation fs hello hostlist include mesh nat nse peerinfo statistics testing transport util vpn,
gnunet <=