Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master

Conflicts:
	core/ping.c
	core/util.c

1 files changed, 37 insertions, 0 deletions

diff --git a/core/packets.h b/core/packets.h
new file mode 100644
index 00000000..222b1425
--- /dev/null
+++ b/core/packets.h
@@ -0,0 +1,37 @@
+/*
+ * packet.h -- Packet structure
+ *
+ * This file is donated to the Tox Project.
+ * Copyright 2013  plutooo
+ */
+
+typedef struct {
+    uint8_t id[CLIENT_ID_SIZE];
+
+} __attribute__((packed)) clientid_t;
+
+typedef enum {
+    PACKET_PING_REQ = 0,
+    PACKET_PING_RES = 1
+
+} packetid_t;
+
+// Ping packet
+typedef struct {
+    uint8_t    magic;
+    clientid_t client_id;
+    uint8_t    nonce[crypto_box_NONCEBYTES];
+    uint64_t   ping_id;
+    uint8_t    padding[ENCRYPTION_PADDING];
+
+} __attribute__((packed)) pingreq_t;
+
+// Pong packet
+typedef struct {
+    uint8_t    magic;
+    clientid_t client_id;
+    uint8_t    nonce[crypto_box_NONCEBYTES];
+    uint64_t   ping_id;
+    uint8_t    padding[ENCRYPTION_PADDING];
+
+} __attribute__((packed)) pingres_t;