From 05523c1cf98db95fc7cefb8bb44ff942013b2b68 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 23 Apr 2025 08:07:17 -0500 Subject: [PATCH] Moved network code under /network --- src/CMakeLists.txt | 4 +--- src/main.c | 4 ++-- src/network/CMakeLists.txt | 11 +++++++++++ src/{ => network}/client/CMakeLists.txt | 0 src/{ => network}/client/client.c | 2 +- src/{ => network}/client/client.h | 4 ++-- src/{ => network}/client/networked/CMakeLists.txt | 0 src/{ => network}/client/networked/networkedclient.c | 2 +- src/{ => network}/client/networked/networkedclient.h | 2 +- src/{ => network}/packet/CMakeLists.txt | 0 src/{ => network}/packet/packet.c | 4 ++-- src/{ => network}/packet/packet.h | 0 src/{ => network}/packet/packetbase.h | 0 src/{ => network}/packet/packetdisconnect.c | 2 +- src/{ => network}/packet/packetdisconnect.h | 0 src/{ => network}/packet/packetping.c | 2 +- src/{ => network}/packet/packetping.h | 0 src/{ => network}/packet/packetqueue.c | 0 src/{ => network}/packet/packetqueue.h | 3 +-- src/{ => network}/packet/packetwelcome.c | 0 src/{ => network}/packet/packetwelcome.h | 0 src/{ => network}/server/CMakeLists.txt | 0 src/{ => network}/server/networked/CMakeLists.txt | 0 src/{ => network}/server/networked/networkedserver.c | 2 +- src/{ => network}/server/networked/networkedserver.h | 0 .../server/networked/networkedserverclient.c | 2 +- .../server/networked/networkedserverclient.h | 0 src/{ => network}/server/server.c | 0 src/{ => network}/server/server.h | 2 +- src/{ => network}/server/serverclient.c | 0 src/{ => network}/server/serverclient.h | 6 +++--- src/{ => network}/server/singleplayer/CMakeLists.txt | 0 32 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 src/network/CMakeLists.txt rename src/{ => network}/client/CMakeLists.txt (100%) rename src/{ => network}/client/client.c (98%) rename src/{ => network}/client/client.h (92%) rename src/{ => network}/client/networked/CMakeLists.txt (100%) rename src/{ => network}/client/networked/networkedclient.c (99%) rename src/{ => network}/client/networked/networkedclient.h (98%) rename src/{ => network}/packet/CMakeLists.txt (100%) rename src/{ => network}/packet/packet.c (96%) rename src/{ => network}/packet/packet.h (100%) rename src/{ => network}/packet/packetbase.h (100%) rename src/{ => network}/packet/packetdisconnect.c (97%) rename src/{ => network}/packet/packetdisconnect.h (100%) rename src/{ => network}/packet/packetping.c (96%) rename src/{ => network}/packet/packetping.h (100%) rename src/{ => network}/packet/packetqueue.c (100%) rename src/{ => network}/packet/packetqueue.h (97%) rename src/{ => network}/packet/packetwelcome.c (100%) rename src/{ => network}/packet/packetwelcome.h (100%) rename src/{ => network}/server/CMakeLists.txt (100%) rename src/{ => network}/server/networked/CMakeLists.txt (100%) rename src/{ => network}/server/networked/networkedserver.c (99%) rename src/{ => network}/server/networked/networkedserver.h (100%) rename src/{ => network}/server/networked/networkedserverclient.c (99%) rename src/{ => network}/server/networked/networkedserverclient.h (100%) rename src/{ => network}/server/server.c (100%) rename src/{ => network}/server/server.h (97%) rename src/{ => network}/server/serverclient.c (100%) rename src/{ => network}/server/serverclient.h (91%) rename src/{ => network}/server/singleplayer/CMakeLists.txt (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ad3ec7d..3827960 100644 --- a/src/CMakeLists.txt +++ b/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) \ No newline at end of file diff --git a/src/main.c b/src/main.c index 4984819..7a18a90 100644 --- a/src/main.c +++ b/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; diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt new file mode 100644 index 0000000..713c29b --- /dev/null +++ b/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) \ No newline at end of file diff --git a/src/client/CMakeLists.txt b/src/network/client/CMakeLists.txt similarity index 100% rename from src/client/CMakeLists.txt rename to src/network/client/CMakeLists.txt diff --git a/src/client/client.c b/src/network/client/client.c similarity index 98% rename from src/client/client.c rename to src/network/client/client.c index 14ffdd4..b2384ba 100644 --- a/src/client/client.c +++ b/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; diff --git a/src/client/client.h b/src/network/client/client.h similarity index 92% rename from src/client/client.h rename to src/network/client/client.h index 164dcc0..fb6a269 100644 --- a/src/client/client.h +++ b/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, diff --git a/src/client/networked/CMakeLists.txt b/src/network/client/networked/CMakeLists.txt similarity index 100% rename from src/client/networked/CMakeLists.txt rename to src/network/client/networked/CMakeLists.txt diff --git a/src/client/networked/networkedclient.c b/src/network/client/networked/networkedclient.c similarity index 99% rename from src/client/networked/networkedclient.c rename to src/network/client/networked/networkedclient.c index 5b024d8..cf47bf3 100644 --- a/src/client/networked/networkedclient.c +++ b/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" diff --git a/src/client/networked/networkedclient.h b/src/network/client/networked/networkedclient.h similarity index 98% rename from src/client/networked/networkedclient.h rename to src/network/client/networked/networkedclient.h index cb41f04..d1001ab 100644 --- a/src/client/networked/networkedclient.h +++ b/src/network/client/networked/networkedclient.h @@ -8,7 +8,7 @@ #pragma once #include "error/error.h" #include -#include "packet/packetqueue.h" +#include "network/packet/packetqueue.h" typedef struct client_s client_t; typedef struct clientconnect_s clientconnect_t; diff --git a/src/packet/CMakeLists.txt b/src/network/packet/CMakeLists.txt similarity index 100% rename from src/packet/CMakeLists.txt rename to src/network/packet/CMakeLists.txt diff --git a/src/packet/packet.c b/src/network/packet/packet.c similarity index 96% rename from src/packet/packet.c rename to src/network/packet/packet.c index 981c56b..181dd82 100644 --- a/src/packet/packet.c +++ b/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 }, diff --git a/src/packet/packet.h b/src/network/packet/packet.h similarity index 100% rename from src/packet/packet.h rename to src/network/packet/packet.h diff --git a/src/packet/packetbase.h b/src/network/packet/packetbase.h similarity index 100% rename from src/packet/packetbase.h rename to src/network/packet/packetbase.h diff --git a/src/packet/packetdisconnect.c b/src/network/packet/packetdisconnect.c similarity index 97% rename from src/packet/packetdisconnect.c rename to src/network/packet/packetdisconnect.c index 50be7cb..f015634 100644 --- a/src/packet/packetdisconnect.c +++ b/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, diff --git a/src/packet/packetdisconnect.h b/src/network/packet/packetdisconnect.h similarity index 100% rename from src/packet/packetdisconnect.h rename to src/network/packet/packetdisconnect.h diff --git a/src/packet/packetping.c b/src/network/packet/packetping.c similarity index 96% rename from src/packet/packetping.c rename to src/network/packet/packetping.c index 09b17be..00260f7 100644 --- a/src/packet/packetping.c +++ b/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)); diff --git a/src/packet/packetping.h b/src/network/packet/packetping.h similarity index 100% rename from src/packet/packetping.h rename to src/network/packet/packetping.h diff --git a/src/packet/packetqueue.c b/src/network/packet/packetqueue.c similarity index 100% rename from src/packet/packetqueue.c rename to src/network/packet/packetqueue.c diff --git a/src/packet/packetqueue.h b/src/network/packet/packetqueue.h similarity index 97% rename from src/packet/packetqueue.h rename to src/network/packet/packetqueue.h index 1e92b5d..b445305 100644 --- a/src/packet/packetqueue.h +++ b/src/network/packet/packetqueue.h @@ -6,8 +6,7 @@ */ #pragma once -#include "packet/packet.h" -#include +#include "network/packet/packet.h" #define PACKET_QUEUE_MAX_SIZE 512 diff --git a/src/packet/packetwelcome.c b/src/network/packet/packetwelcome.c similarity index 100% rename from src/packet/packetwelcome.c rename to src/network/packet/packetwelcome.c diff --git a/src/packet/packetwelcome.h b/src/network/packet/packetwelcome.h similarity index 100% rename from src/packet/packetwelcome.h rename to src/network/packet/packetwelcome.h diff --git a/src/server/CMakeLists.txt b/src/network/server/CMakeLists.txt similarity index 100% rename from src/server/CMakeLists.txt rename to src/network/server/CMakeLists.txt diff --git a/src/server/networked/CMakeLists.txt b/src/network/server/networked/CMakeLists.txt similarity index 100% rename from src/server/networked/CMakeLists.txt rename to src/network/server/networked/CMakeLists.txt diff --git a/src/server/networked/networkedserver.c b/src/network/server/networked/networkedserver.c similarity index 99% rename from src/server/networked/networkedserver.c rename to src/network/server/networked/networkedserver.c index 8ea1bb5..fa0872b 100644 --- a/src/server/networked/networkedserver.c +++ b/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" diff --git a/src/server/networked/networkedserver.h b/src/network/server/networked/networkedserver.h similarity index 100% rename from src/server/networked/networkedserver.h rename to src/network/server/networked/networkedserver.h diff --git a/src/server/networked/networkedserverclient.c b/src/network/server/networked/networkedserverclient.c similarity index 99% rename from src/server/networked/networkedserverclient.c rename to src/network/server/networked/networkedserverclient.c index 6455b04..72ba6b1 100644 --- a/src/server/networked/networkedserverclient.c +++ b/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" diff --git a/src/server/networked/networkedserverclient.h b/src/network/server/networked/networkedserverclient.h similarity index 100% rename from src/server/networked/networkedserverclient.h rename to src/network/server/networked/networkedserverclient.h diff --git a/src/server/server.c b/src/network/server/server.c similarity index 100% rename from src/server/server.c rename to src/network/server/server.c diff --git a/src/server/server.h b/src/network/server/server.h similarity index 97% rename from src/server/server.h rename to src/network/server/server.h index 55a81b2..36ef2e0 100644 --- a/src/server/server.h +++ b/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 diff --git a/src/server/serverclient.c b/src/network/server/serverclient.c similarity index 100% rename from src/server/serverclient.c rename to src/network/server/serverclient.c diff --git a/src/server/serverclient.h b/src/network/server/serverclient.h similarity index 91% rename from src/server/serverclient.h rename to src/network/server/serverclient.h index e4c54a8..8a8e13c 100644 --- a/src/server/serverclient.h +++ b/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; diff --git a/src/server/singleplayer/CMakeLists.txt b/src/network/server/singleplayer/CMakeLists.txt similarity index 100% rename from src/server/singleplayer/CMakeLists.txt rename to src/network/server/singleplayer/CMakeLists.txt