From 9f5d2e74e61cbc112d6e71176f4389f0be2c4f9f Mon Sep 17 00:00:00 2001
From: Test_User <hax@andrewyu.org>
Date: Tue, 18 Jun 2024 14:25:16 -0400
Subject: Network relocations, and in-progress buffered networking code

---
 Makefile | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index da6f192..34dd19a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ LDFLAGS = -lpthread
 	printf '%s\n' 'LAST_GNUTLS_SERVER = $(GNUTLS_SERVER)' >> .makeopts
 	printf '%s\n' 'LAST_OPENSSL_CLIENT = $(OPENSSL_CLIENT)' >> .makeopts
 	printf '%s\n' 'LAST_OPENSSL_SERVER = $(OPENSSL_SERVER)' >> .makeopts
+	printf '%s\n' 'LAST_PLAINTEXT_BUFFERED_CLIENT = $(PLAINTEXT_BUFFERED_CLIENT)' >> .makeopts
+	printf '%s\n' 'LAST_PLAINTEXT_BUFFERED_SERVER = $(PLAINTEXT_BUFFERED_SERVER)' >> .makeopts
 	printf '%s\n' 'LAST_INSPIRCD2_PROTOCOL = $(INSPIRCD2_PROTOCOL)' >> .makeopts
 	printf '%s\n' 'LAST_INSPIRCD3_PROTOCOL = $(INSPIRCD3_PROTOCOL)' >> .makeopts
 	printf '%s\n' 'LAST_HAXSERV_PSEUDOCLIENT = $(HAXSERV_PSEUDOCLIENT)' >> .makeopts
@@ -102,6 +104,22 @@ else
 OPENSSL_SERVER = $(LAST_OPENSSL_SERVER)
 endif
 
+ifneq ($(PLAINTEXT_CLIENT),)
+ifneq ($(PLAINTEXT_CLIENT),$(LAST_PLAINTEXT_CLIENT))
+rebuild = 1
+endif
+else
+PLAINTEXT_CLIENT = $(LAST_PLAINTEXT_CLIENT)
+endif
+
+ifneq ($(PLAINTEXT_BUFFERED_SERVER),)
+ifneq ($(PLAINTEXT_BUFFERED_SERVER),$(LAST_PLAINTEXT_BUFFERED_SERVER))
+rebuild = 1
+endif
+else
+PLAINTEXT_BUFFERED_SERVER = $(LAST_PLAINTEXT_BUFFERED_SERVER)
+endif
+
 ifneq ($(INSPIRCD2_PROTOCOL),)
 ifneq ($(INSPIRCD2_PROTOCOL),$(LAST_INSPIRCD2_PROTOCOL))
 rebuild = 1
@@ -209,6 +227,18 @@ USE_SERVER = 1
 USE_OPENSSL = 1
 endif
 
+ifeq ($(PLAINTEXT_BUFFERED_CLIENT),1)
+CFLAGS += -DUSE_PLAINTEXT_BUFFERED_CLIENT
+USE_CLIENT = 1
+USE_PLAINTEXT_BUFFERED = 1
+endif
+
+ifeq ($(PLAINTEXT_BUFFERED_SERVER),1)
+CFLAGS += -DUSE_PLAINTEXT_BUFFERED_SERVER
+USE_SERVER = 1
+USE_PLAINTEXT_BUFFERED = 1
+endif
+
 
 
 ifeq ($(INSPIRCD2_PROTOCOL),1)
@@ -247,22 +277,27 @@ CFLAGS += -DUSE_SERVER
 endif
 
 ifeq ($(USE_PLAINTEXT),1)
-OFILES += plaintext_network.o
+OFILES += networks/plaintext.o
 CFLAGS += -DUSE_PLAINTEXT
 endif
 
 ifeq ($(USE_GNUTLS),1)
-OFILES += gnutls_network.o
+OFILES += networks/gnutls.o
 CFLAGS += -DUSE_GNUTLS $(shell pkg-config gnutls --cflags)
 LDFLAGS += $(shell pkg-config gnutls --libs)
 endif
 
 ifeq ($(USE_OPENSSL),1)
-OFILES += openssl_network.o
+OFILES += networks/openssl.o
 CFLAGS += -DUSE_OPENSSL $(shell pkg-config openssl --cflags)
 LDFLAGS += $(shell pkg-config openssl --libs)
 endif
 
+ifeq ($(USE_PLAINTEXT_BUFFERED),1)
+OFILES += networks/plaintext_buffered.o
+CFLAGS += -DUSE_PLAINTEXT_BUFFERED
+endif
+
 
 
 ifeq ($(USE_PROTOCOLS),1)
@@ -328,15 +363,19 @@ $(call DEPS,protocols,o)
 $(call DEPS,table,o)
 
 ifeq ($(USE_PLAINTEXT),1)
-$(call DEPS,plaintext_network,o)
+$(call DEPS,networks/plaintext,o)
 endif
 
 ifeq ($(USE_GNUTLS),1)
-$(call DEPS,gnutls_network,o)
+$(call DEPS,networks/gnutls,o)
 endif
 
 ifeq ($(USE_OPENSSL),1)
-$(call DEPS,openssl_network,o)
+$(call DEPS,networks/openssl,o)
+endif
+
+ifeq ($(USE_PLAINTEXT_BUFFERED),1)
+$(call DEPS,networks/plaintext_buffered,o)
 endif
 
 ifeq ($(USE_CLIENT),1)
@@ -368,4 +407,6 @@ $(call DEPS,pseudoclients/haxserv,so)
 endif
 
 clean:
-	$(RM) HaxIRCd *.o *.so protocols/*.o protocols/*.so pseudoclients/*.o pseudoclients/*.so
+	$(RM) HaxIRCd
+	for file in `find . -name '*.so'`; do $(RM) $$file; done
+	for file in `find . -name '*.o'`; do $(RM) $$file; done
-- 
cgit v1.2.3