Combine buffer into one message if non-continuous

Author: coditva

include/buffer.h

@@ -8,6 +8,7 @@ typedef struct _block block_t;
 struct _block {
     char *data;
     int len;
+    int last;
     block_t *next;
 };
 

src/buffer.c

@@ -23,26 +23,47 @@ int buffer_write(buffer_t *buffer, char *data, int len)
     if (new_block == NULL) return -1;
 
     new_block -> data = new_data;
-    new_block -> len  = len;
+    new_block -> len = len;
+    if (len == -1) {
+        new_block -> last = 0;
+        new_block -> len = PACKET_DATA_SIZE;
+    } else {
+        new_block -> last = 1;
+    }
 
     linked_list_add((*buffer), new_block);
 
-    return len;
+    return new_block -> len;
 }
 
 int buffer_read(buffer_t *buffer, char *data, int len)
 {
     block_t *block;
-
-    linked_list_get((*buffer), block);
-    if (block == NULL) return 0;
-
-    if (len < block -> len) return -1;
-    strcpy(data, block -> data);
-    free(block -> data);
-    free(block);
-
-    return block -> len;
+    int retval = 0;
+    int pos = 0;
+    int last = 0;
+
+    while (last == 0) {
+        linked_list_get((*buffer), block);
+        if (block == NULL) break;
+
+        last = block -> last;
+        if (pos >= len) {
+            free(block -> data);
+            free(block);
+            continue;
+        }
+
+        int n = ((len - pos) < block -> len) ? len - pos : block -> len;
+        strncpy(data + pos, block -> data, n);
+        retval += n;
+        pos += n;
+
+        free(block -> data);
+        free(block);
+    }
+
+    return retval;
 }
 
 int buffer_write_packet(buffer_t *buffer, packet_t *packet)

src/packet.c

@@ -116,7 +116,19 @@ void packet_parse(packet_t packet)
 
         }
     } else {                                            /* data packet */
-        recv_buffer_write(packet.data, sizeof(packet.data));
+
+        if (packet.header._head1 & 0x80000000 &&
+            packet.header._head1 & 0x40000000)      /* solo packet */
+            recv_buffer_write(packet.data, PACKET_DATA_SIZE);
+
+        else if (packet.header._head1 & 0x40000000) /* last packet */
+            recv_buffer_write(packet.data, PACKET_DATA_SIZE);
+
+        else if (packet.header._head1 & 0x80000000) /* first packet */
+            recv_buffer_write(packet.data, -1);
+
+        else                                        /* middle packet */
+            recv_buffer_write(packet.data, -1);
     }
     return;
 }

src/send_buffer.c

@@ -33,14 +33,14 @@ int send_buffer_write(char *data, int len)
     seqnum = 2142894844;  /* TODO: generate random number */
     buffer = data;
     boundary = PACKET_BOUNDARY_START;
-    packet_clear_header (packet);
-    packet_set_data     (packet);
 
     while (len > 0) {
         size = (len > PACKET_DATA_SIZE) ? PACKET_DATA_SIZE : len;
         len -= PACKET_DATA_SIZE;
         boundary |= (len > 0) ? PACKET_BOUNDARY_NONE : PACKET_BOUNDARY_END;
 
+        packet_clear_header (packet);
+        packet_set_data     (packet);
         packet_set_seqnum   (packet, seqnum++);
         packet_set_boundary (packet, boundary);
         packet_set_order    (packet, 1);