Test CompressedBlob (de)serialization

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1593b5981e7f1617781b14499ff7204ab47a9e1d..36a66d7d422794ee0d5fa433b5f040878ab84d81 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ set(CMAKE_BUILD_TYPE Debug)
 
 link_libraries(
        pthread
+       z
 )
 
 set(DEPS_DIR "${CMAKE_SOURCE_DIR}/deps/")

diff --git a/cs_example.c b/cs_example.c
index ff0ea8bc0a18f2378c24655e0ead8294bee6a910..8ca09c88f8b5e4a649583917ca62c3eaa0cdc9fb 100644 (file)
--- a/cs_example.c
+++ b/cs_example.c
@@ -17,10 +17,13 @@ static void connect_func(DragonnetPeer *p)
 
 static void handle_pingpacket(DragonnetPeer *p, PingPacket *ping)
 {
-       printf("PingPacket number: 0x%08x\n", ping->number);
+       printf("PingPacket siz: 0x%08x\n", ping->compr_blob->siz);
+       printf("PingPacket compr_siz: 0x%08x\n", ping->compr_blob->compr_siz);
+       printf("PingPacket data: 0x%02x%02x\n", ping->compr_blob->data[0], ping->compr_blob->data[1]);
+       free(ping->compr_blob->data);
 
        dragonnet_peer_send_PongPacket(p, &(PongPacket) {
-               .number = ping->number
+               .number = 0xdba
        });
 
        dragonnet_listener_close(l);
@@ -61,8 +64,11 @@ static void *clt_func(__attribute((unused)) void *unused)
                        (void (*)(DragonnetPeer *, void *)) &handle_pongpacket);
        dragonnet_peer_run(p);
 
+       CompressedBlob blob = malloc(sizeof *blob);
+       blob->siz = 2;
+       blob->data = (u8 *) "\x0d\xba";
        dragonnet_peer_send_PingPacket(p, &(PingPacket) {
-               .number = 0xdba
+               .compr_blob = blob
        });
 
        return NULL;

diff --git a/deps/dragonnet b/deps/dragonnet
index a5143708dcc4e88a6d1b8c3ca946b97c72ba970d..3288f013246315002bfabdf362a58549eed147a6 160000 (submodule)
--- a/deps/dragonnet
+++ b/deps/dragonnet
@@ -1 +1 @@
-Subproject commit a5143708dcc4e88a6d1b8c3ca946b97c72ba970d
+Subproject commit 3288f013246315002bfabdf362a58549eed147a6

diff --git a/types.dnet b/types.dnet
index 0988e68b51d94084d3d0660be72f3d09764e9aff..edde8055f684dfff66ea5ba3a98126eaa3f87b80 100644 (file)
--- a/types.dnet
+++ b/types.dnet
@@ -1,5 +1,5 @@
 PingPacket
-       s32 number
+       CompressedBlob compr_blob
 
 PongPacket
        s32 number