Moved network code under /network

src/CMakeLists.txt

@@ -25,11 +25,9 @@ target_sources(${DUSK_TARGET_NAME}
 
 # Subdirs
 add_subdirectory(assert)
-add_subdirectory(client)
 add_subdirectory(console)
 add_subdirectory(display)
 add_subdirectory(error)
 add_subdirectory(game)
-add_subdirectory(packet)
-add_subdirectory(server)
+add_subdirectory(network)
 add_subdirectory(util)

src/main.c

@@ -10,8 +10,8 @@
 #include "display/render.h"
 #include "input.h"
 #include "console/console.h"
-#include "client/client.h"
-#include "server/server.h"
+#include "network/client/client.h"
+#include "network/server/server.h"
 #include "util/random.h"
 
 bool_t exitRequested = false;

src/network/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (c) 2025 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+
+# Subdirs
+add_subdirectory(client)
+add_subdirectory(packet)
+add_subdirectory(server)

src/network/client/client.c

@@ -9,7 +9,7 @@
 #include "assert/assert.h"
 #include "util/memory.h"
 #include "console/console.h"
-#include "server/server.h"
+#include "network/server/server.h"
 
 client_t CLIENT;
 

src/network/client/client.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "client/networked/networkedclient.h"
-#include "packet/packetqueue.h"
+#include "network/client/networked/networkedclient.h"
+#include "network/packet/packetqueue.h"
 
 typedef enum {
   CLIENT_TYPE_NETWORKED,

src/network/client/networked/networkedclient.c

@@ -5,7 +5,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "client/client.h"
+#include "network/client/client.h"
 #include "assert/assert.h"
 #include "console/console.h"
 

src/network/client/networked/networkedclient.h

@@ -8,7 +8,7 @@
 #pragma once
 #include "error/error.h"
 #include <arpa/inet.h>
-#include "packet/packetqueue.h"
+#include "network/packet/packetqueue.h"
 
 typedef struct client_s client_t;
 typedef struct clientconnect_s clientconnect_t;

src/network/packet/packet.c

@@ -8,8 +8,8 @@
 #include "packet.h"
 #include "assert/assert.h"
 #include "util/memory.h"
-#include "client/client.h"
-#include "server/server.h"
+#include "network/client/client.h"
+#include "network/server/server.h"
 
 packethandler_t PACKET_HANDLERS[] = {
   { NULL, NULL },

src/network/packet/packetdisconnect.c

@@ -8,7 +8,7 @@
 #include "packet.h"
 #include "util/memory.h"
 #include "assert/assert.h"
-#include "client/client.h"
+#include "network/client/client.h"
 
 void packetDisconnectCreate(
   packet_t *packet,

src/network/packet/packetping.c

@@ -8,7 +8,7 @@
 #include "packet.h"
 #include "util/memory.h"
 #include "assert/assert.h"
-#include "server/server.h"
+#include "network/server/server.h"
 
 void packetPingCreate(packet_t *packet) {
   packetInit(packet, PACKET_TYPE_PING, sizeof(packetping_t));

src/network/packet/packetqueue.h

@@ -6,8 +6,7 @@
  */
 
 #pragma once
-#include "packet/packet.h"
-#include <pthread.h>
+#include "network/packet/packet.h"
 
 #define PACKET_QUEUE_MAX_SIZE 512
 

src/network/server/networked/networkedserver.c

@@ -5,7 +5,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "server/server.h"
+#include "network/server/server.h"
 #include "assert/assert.h"
 #include "util/memory.h"
 #include "console/console.h"

src/network/server/networked/networkedserverclient.c

@@ -5,7 +5,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "server/server.h"
+#include "network/server/server.h"
 #include "assert/assert.h"
 #include "util/memory.h"
 #include "console/console.h"

src/network/server/server.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "serverclient.h"
-#include "server/networked/networkedserver.h"
+#include "network/server/networked/networkedserver.h"
 
 #define SERVER_MAX_CLIENTS 32
 #define SERVER_DEFAULT_PORT 3030

src/network/server/serverclient.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "packet/packet.h"
-#include "server/networked/networkedserverclient.h"
-#include "packet/packetqueue.h"
+#include "network/packet/packet.h"
+#include "network/server/networked/networkedserverclient.h"
+#include "network/packet/packetqueue.h"
 
 typedef struct server_s server_t;