added initialization debugging

Author: deadlightreal

build/output/libswift_net.a

@@ -32,6 +32,12 @@ void* request_server_information(void* request_server_information_args_void) {
             return NULL;
         }
 
+        SwiftNetDebug(
+            if (check_debug_flag(DEBUG_INITIALIZATION)) {
+                send_debug_message("Requested server information: {\"server_ip_address\": \"%s\"}\n", inet_ntoa(request_server_information_args->server_addr.sin_addr));
+            }
+        )
+
         sendto(request_server_information_args->sockfd, request_server_information_args->data, request_server_information_args->size, 0, (struct sockaddr *)&request_server_information_args->server_addr, request_server_information_args->server_addr_len);
 
         usleep(1000000);
@@ -125,16 +131,33 @@ SwiftNetClientConnection* swiftnet_create_client(const char* const restrict ip_a
     while(1) {
         const int bytes_received = recvfrom(empty_connection->sockfd, server_information_buffer, sizeof(server_information_buffer), 0x00, NULL, NULL);
         if(bytes_received != PACKET_HEADER_SIZE + sizeof(SwiftNetServerInformation)) {
+            SwiftNetDebug(
+                if (check_debug_flag(DEBUG_INITIALIZATION)) {
+                    send_debug_message("Invalid packet received from server. Expected server information: {\"bytes_received\": %d, \"expected_bytes\": %d}\n", bytes_received, PACKET_HEADER_SIZE + sizeof(SwiftNetServerInformation));
+                }
+            )
             continue;
         }
 
-        const SwiftNetPacketInfo* const restrict packetInfo = (SwiftNetPacketInfo *)&server_information_buffer[sizeof(struct ip)];
+        const struct ip* const restrict ip_header = (struct ip*)&server_information_buffer;
+
+        const SwiftNetPacketInfo* const restrict packet_info = (SwiftNetPacketInfo *)&server_information_buffer[sizeof(struct ip)];
 
-        if(packetInfo->port_info.destination_port != empty_connection->port_info.source_port || packetInfo->port_info.source_port != empty_connection->port_info.destination_port) {
+        if(packet_info->port_info.destination_port != empty_connection->port_info.source_port || packet_info->port_info.source_port != empty_connection->port_info.destination_port) {
+            SwiftNetDebug(
+                if (check_debug_flag(DEBUG_INITIALIZATION)) {
+                    send_debug_message("Port info does not match: {\"destination_port\": %d, \"source_port\": %d, \"source_ip_address\": \"%s\"}\n", packet_info->port_info.destination_port, packet_info->port_info.source_port, ip_header->ip_src.s_addr);
+                }
+            )
             continue;
         }
 
-        if(packetInfo->packet_type != PACKET_TYPE_REQUEST_INFORMATION) {
+        if(packet_info->packet_type != PACKET_TYPE_REQUEST_INFORMATION) {
+            SwiftNetDebug(
+                if (check_debug_flag(DEBUG_INITIALIZATION)) {
+                    send_debug_message("Invalid packet type: {\"packet_type\": %d}\n", packet_info->packet_type);
+                }
+            )
             continue;
         }
 
@@ -153,5 +176,11 @@ SwiftNetClientConnection* swiftnet_create_client(const char* const restrict ip_a
 
     pthread_create(&empty_connection->handle_packets_thread, NULL, swiftnet_client_handle_packets, empty_connection);
 
+    SwiftNetDebug(
+        if (check_debug_flag(DEBUG_INITIALIZATION)) {
+            send_debug_message("Successfully initialized client\n");
+        }
+    )
+
     return empty_connection;
 }

src/initialize_client_socket.c

@@ -47,7 +47,6 @@ SwiftNetServer* swiftnet_create_server(const uint16_t port) {
 
     const uint8_t opt = 1;
     setsockopt(empty_server->sockfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
-
 
     empty_server->packet_queue = (PacketQueue){
         .first_node = NULL,
@@ -69,5 +68,11 @@ SwiftNetServer* swiftnet_create_server(const uint16_t port) {
     // Create a new thread that will handle all packets received
     pthread_create(&empty_server->handle_packets_thread, NULL, swiftnet_server_handle_packets, empty_server);
 
+    SwiftNetDebug(
+        if (check_debug_flag(DEBUG_INITIALIZATION)) {
+            send_debug_message("Successfully initialized server\n");
+        }
+    )
+
     return empty_server;
 }

src/initialize_server_socket.c

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <_string.h>
+#include <string.h>
 #include <netinet/in.h>
 #include <stdatomic.h>
 #include <stdlib.h>

src/internal/internal.h

@@ -45,7 +45,8 @@ extern uint32_t maximum_transmission_unit;
 
 typedef enum {
     DEBUG_PACKETS_SENDING = 1u << 0,
-    DEBUG_PACKETS_RECEIVING = 1u << 1
+    DEBUG_PACKETS_RECEIVING = 1u << 1,
+    DEBUG_INITIALIZATION = 1u << 2
 } SwiftNetDebugFlags;
 
 typedef struct {

src/swift_net.h

@@ -30,7 +30,7 @@ void server_message_handler(uint8_t* data, SwiftNetPacketServerMetadata* restric
 }
 
 int main() {
-    swiftnet_add_debug_flags(DEBUG_PACKETS_RECEIVING | DEBUG_PACKETS_SENDING);
+    swiftnet_add_debug_flags(DEBUG_PACKETS_RECEIVING | DEBUG_PACKETS_SENDING | DEBUG_INITIALIZATION);
 
     swiftnet_initialize();
 

tests/output/test_basic_client_server_communication

@@ -31,7 +31,7 @@ void server_message_handler(uint8_t* data, SwiftNetPacketServerMetadata* restric
 }
 
 int main() {
-    swiftnet_add_debug_flags(DEBUG_PACKETS_RECEIVING | DEBUG_PACKETS_SENDING);
+    swiftnet_add_debug_flags(DEBUG_PACKETS_RECEIVING | DEBUG_PACKETS_SENDING | DEBUG_INITIALIZATION);
 
     random_generated_data = malloc(DATA_TO_SEND);
     if (random_generated_data == NULL) {