Add handshake info and logging functions

Author: coditva

include/config.h

@@ -6,4 +6,10 @@
 
 #define UDT_VERSION 4
 
+#define MAX_DATA_SIZE 1024
+#define MAX_PACKET_SIZE (4 * sizeof(uint32_t) + MAX_DATA_SIZE)
+
+/* comment the following definition to turn off debuf */
+#define DEBUG 1
+
 #endif /* end of include guard: CONFIG_H_HW87WHOK */

include/core.h

@@ -12,6 +12,7 @@ typedef struct {
     int is_open;
     int is_connected;
     int is_client;
+    int type;
 } conn_t;
 
 conn_t connection;

include/packet.h

@@ -2,10 +2,10 @@
 #define PACKET_H_R7ONXCYA
 
 #include <inttypes.h>
-
+#include "config.h"
 
 #define PACKET_HEADER_SIZE 4
-#define PACKET_DATA_SIZE 200
+#define PACKET_DATA_SIZE MAX_DATA_SIZE
 
 
 #define PACKET_MASK_CTRL 0x80000000

include/util.h

@@ -2,6 +2,7 @@
 #define UTIL_H_RSWIA2KL
 
 #include <pthread.h>
+#include "config.h"
 
 #define linked_list_add(BUFFER, BLOCK) \
 { \
@@ -37,4 +38,17 @@ typedef void * (*thread_worker_t) (void *);
 tid_t thread_start (thread_worker_t, void *); 
 void  thread_stop  (tid_t);
 
+#ifdef DEBUG
+
+#include <stdio.h>
+#define console_log_mod(MODIFIER, LOGDATA)  printf(MODIFIER, LOGDATA)
+#define console_log(LOGDATA)                printf("%s\n", LOGDATA)
+
+#else
+
+#define console_log_mod(MODIFIER, LOGDATA)
+#define console_log(LOGDATA)
+
+#endif  /* end of DEBUG */
+
 #endif /* end of include guard: UTIL_H_RSWIA2KL */

src/api.c

@@ -22,6 +22,7 @@ socket_t udt_socket(af_type af, sock_type type, int protocol)
         errno = 5003;  /* bad params */
         return -1;
     }
+    connection.type = type;
 
     return socket(af, type, 0);
 }

src/packet.c

@@ -6,6 +6,7 @@
 #include "packet.h"
 #include "buffer.h"
 #include "core.h"
+#include "util.h"
 
 extern conn_t connection;
 
@@ -42,10 +43,7 @@ int packet_new_handshake(packet_t *packet)
 {
     char buffer[8 * sizeof(uint32_t)];
     uint32_t *p = NULL;
-    uint32_t type = 0,
-             isn = 0,
-             mss = 0,
-             flight_flag_size = 0,
+    uint32_t flight_flag_size = 0,
              id = 0,
              req_type = 0,
              cookie = 0;
@@ -58,9 +56,9 @@ int packet_new_handshake(packet_t *packet)
 
     p = (uint32_t *) buffer;
     *p++ = UDT_VERSION;
-    *p++ = type;
-    *p++ = isn;
-    *p++ = mss;
+    *p++ = connection.type;
+    *p++ = 123123;          /* TODO: Generate random number */
+    *p++ = MAX_PACKET_SIZE;
     *p++ = flight_flag_size;
     *p++ = req_type;
     *p++ = id;
@@ -76,6 +74,7 @@ void packet_parse(packet_t packet)
         switch (packet_get_type(packet)) {
 
         case PACKET_TYPE_HANDSHAKE:             /* handshake */
+            console_log("packet: handshake");
             if (connection.is_client) {
                 handshake_terminate();
                 break;
@@ -86,37 +85,47 @@ void packet_parse(packet_t packet)
             break;
 
         case PACKET_TYPE_KEEPALIVE:             /* keep-alive */
+            console_log("packet: keep alive");
             break;
 
         case PACKET_TYPE_ACK:                   /* ack */
+            console_log("packet: ack");
             break;
 
         case PACKET_TYPE_NAK:                   /* nak */
+            console_log("packet: nak");
             break;
 
         case PACKET_TYPE_CONGDELAY:             /* congestion-delay warn */
+            console_log("packet: congestion delay");
             break;
 
         case PACKET_TYPE_SHUTDOWN:              /* shutdown */
+            console_log("packet: shutdown");
             connection.is_open = 0;
             connection.is_connected = 0;
             break;
 
         case PACKET_TYPE_ACK2:                  /* ack of ack */
+            console_log("packet: ack of ack");
             break;
 
         case PACKET_TYPE_DROPREQ:               /* message drop request */
+            console_log("packet: drop request");
             break;
 
         case PACKET_TYPE_ERRSIG:                /* error signal */
+            console_log("packet: error signal");
             break;
 
         default:                                /* unsupported packet type */
-            recv_buffer_write("Unknown message", 16);
+            console_log("packet: unknown");
 
         }
     } else {                                            /* data packet */
 
+        console_log("packet: data");
+
         if (packet.header._head1 & 0x80000000 &&
             packet.header._head1 & 0x40000000)      /* solo packet */
             recv_buffer_write(packet.data, PACKET_DATA_SIZE);