From ac2ea4055b55db21f9e2cc311eab8656126b92b3 Mon Sep 17 00:00:00 2001 From: Test_User Date: Thu, 25 Jul 2024 19:16:38 -0400 Subject: Makefile and some option changes, and some fixes --- Makefile | 239 ++++++++++++++++++++---------------------------------- config.h | 10 +-- general_network.c | 25 +++--- general_network.h | 12 +-- real_main.c | 24 +++--- server_network.c | 24 +++--- 6 files changed, 138 insertions(+), 196 deletions(-) diff --git a/Makefile b/Makefile index 0c8a54f..c2b1967 100644 --- a/Makefile +++ b/Makefile @@ -33,18 +33,15 @@ INCLUDEFLAGS = LDFLAGS = -lpthread .makeopts: - printf '%s\n' 'LAST_PLAINTEXT_CLIENT = $(PLAINTEXT_CLIENT)' > .makeopts - printf '%s\n' 'LAST_PLAINTEXT_SERVER = $(PLAINTEXT_SERVER)' >> .makeopts - printf '%s\n' 'LAST_GNUTLS_CLIENT = $(GNUTLS_CLIENT)' >> .makeopts - 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_GNUTLS_BUFFERED_CLIENT = $(GNUTLS_BUFFERED_CLIENT)' >> .makeopts - printf '%s\n' 'LAST_GNUTLS_BUFFERED_SERVER = $(GNUTLS_BUFFERED_SERVER)' >> .makeopts - printf '%s\n' 'LAST_OPENSSL_BUFFERED_CLIENT = $(OPENSSL_BUFFERED_CLIENT)' >> .makeopts - printf '%s\n' 'LAST_OPENSSL_BUFFERED_SERVER = $(OPENSSL_BUFFERED_SERVER)' >> .makeopts + > .makeopts + printf '%s\n' 'LAST_CLIENT = $(CLIENT)' >> .makeopts + printf '%s\n' 'LAST_SERVER = $(SERVER)' >> .makeopts + printf '%s\n' 'LAST_PLAINTEXT_NETWORK = $(PLAINTEXT_NETWORK)' >> .makeopts + printf '%s\n' 'LAST_GNUTLS_NETWORK = $(GNUTLS_NETWORK)' >> .makeopts + printf '%s\n' 'LAST_OPENSSL_NETWORK = $(OPENSSL_NETWORK)' >> .makeopts + printf '%s\n' 'LAST_PLAINTEXT_BUFFERED_NETWORK = $(PLAINTEXT_BUFFERED_NETWORK)' >> .makeopts + printf '%s\n' 'LAST_GNUTLS_BUFFERED_NETWORK = $(GNUTLS_BUFFERED_NETWORK)' >> .makeopts + printf '%s\n' 'LAST_OPENSSL_BUFFERED_NETWORK = $(OPENSSL_BUFFERED_NETWORK)' >> .makeopts printf '%s\n' 'LAST_INSPIRCD2_PROTOCOL = $(INSPIRCD2_PROTOCOL)' >> .makeopts printf '%s\n' 'LAST_INSPIRCD3_PROTOCOL = $(INSPIRCD3_PROTOCOL)' >> .makeopts printf '%s\n' 'LAST_INSPIRCD4_PROTOCOL = $(INSPIRCD4_PROTOCOL)' >> .makeopts @@ -66,100 +63,68 @@ include .makeopts rebuild = 0 # tabs not allowed :( -ifneq ($(PLAINTEXT_CLIENT),) -ifneq ($(PLAINTEXT_CLIENT),$(LAST_PLAINTEXT_CLIENT)) +ifneq ($(CLIENT),) +ifneq ($(CLIENT),$(LAST_CLIENT)) rebuild = 1 endif else -PLAINTEXT_CLIENT := $(LAST_PLAINTEXT_CLIENT) +CLIENT := $(LAST_CLIENT) endif -ifneq ($(PLAINTEXT_SERVER),) -ifneq ($(PLAINTEXT_SERVER),$(LAST_PLAINTEXT_SERVER)) +ifneq ($(SERVER),) +ifneq ($(SERVER),$(LAST_SERVER)) rebuild = 1 endif else -PLAINTEXT_SERVER := $(LAST_PLAINTEXT_SERVER) +SERVER := $(LAST_SERVER) endif -ifneq ($(GNUTLS_CLIENT),) -ifneq ($(GNUTLS_CLIENT),$(LAST_GNUTLS_CLIENT)) +ifneq ($(PLAINTEXT_NETWORK),) +ifneq ($(PLAINTEXT_NETWORK),$(LAST_PLAINTEXT_NETWORK)) rebuild = 1 endif else -GNUTLS_CLIENT := $(LAST_GNUTLS_CLIENT) +PLAINTEXT_NETWORK := $(LAST_PLAINTEXT_NETWORK) endif -ifneq ($(GNUTLS_SERVER),) -ifneq ($(GNUTLS_SERVER),$(LAST_GNUTLS_SERVER)) +ifneq ($(GNUTLS_NETWORK),) +ifneq ($(GNUTLS_NETWORK),$(LAST_GNUTLS_NETWORK)) rebuild = 1 endif else -GNUTLS_SERVER := $(LAST_GNUTLS_SERVER) +GNUTLS_NETWORK := $(LAST_GNUTLS_NETWORK) endif -ifneq ($(OPENSSL_CLIENT),) -ifneq ($(OPENSSL_CLIENT),$(LAST_OPENSSL_CLIENT)) +ifneq ($(OPENSSL_NETWORK),) +ifneq ($(OPENSSL_NETWORK),$(LAST_OPENSSL_NETWORK)) rebuild = 1 endif else -OPENSSL_CLIENT := $(LAST_OPENSSL_CLIENT) +OPENSSL_NETWORK := $(LAST_OPENSSL_NETWORK) endif -ifneq ($(OPENSSL_SERVER),) -ifneq ($(OPENSSL_SERVER),$(LAST_OPENSSL_SERVER)) +ifneq ($(PLAINTEXT_BUFFERED_NETWORK),) +ifneq ($(PLAINTEXT_BUFFERED_NETWORK),$(LAST_PLAINTEXT_BUFFERED_NETWORK)) rebuild = 1 endif else -OPENSSL_SERVER := $(LAST_OPENSSL_SERVER) +PLAINTEXT_BUFFERED_NETWORK := $(LAST_PLAINTEXT_BUFFERED_NETWORK) endif -ifneq ($(PLAINTEXT_BUFFERED_CLIENT),) -ifneq ($(PLAINTEXT_BUFFERED_CLIENT),$(LAST_PLAINTEXT_BUFFERED_CLIENT)) +ifneq ($(GNUTLS_BUFFERED_NETWORK),) +ifneq ($(GNUTLS_BUFFERED_NETWORK),$(LAST_GNUTLS_BUFFERED_NETWORK)) rebuild = 1 endif else -PLAINTEXT_BUFFERED_CLIENT := $(LAST_PLAINTEXT_BUFFERED_CLIENT) +GNUTLS_BUFFERED_NETWORK := $(LAST_GNUTLS_BUFFERED_NETWORK) endif -ifneq ($(PLAINTEXT_BUFFERED_SERVER),) -ifneq ($(PLAINTEXT_BUFFERED_SERVER),$(LAST_PLAINTEXT_BUFFERED_SERVER)) +ifneq ($(OPENSSL_BUFFERED_NETWORK),) +ifneq ($(OPENSSL_BUFFERED_NETWORK),$(LAST_OPENSSL_BUFFERED_NETWORK)) rebuild = 1 endif else -PLAINTEXT_BUFFERED_SERVER := $(LAST_PLAINTEXT_BUFFERED_SERVER) -endif - -ifneq ($(GNUTLS_BUFFERED_CLIENT),) -ifneq ($(GNUTLS_BUFFERED_CLIENT),$(LAST_GNUTLS_BUFFERED_CLIENT)) -rebuild = 1 -endif -else -GNUTLS_BUFFERED_CLIENT := $(LAST_GNUTLS_BUFFERED_CLIENT) -endif - -ifneq ($(GNUTLS_BUFFERED_SERVER),) -ifneq ($(GNUTLS_BUFFERED_SERVER),$(LAST_GNUTLS_BUFFERED_SERVER)) -rebuild = 1 -endif -else -GNUTLS_BUFFERED_SERVER := $(LAST_GNUTLS_BUFFERED_SERVER) -endif - -ifneq ($(OPENSSL_BUFFERED_CLIENT),) -ifneq ($(OPENSSL_BUFFERED_CLIENT),$(LAST_OPENSSL_BUFFERED_CLIENT)) -rebuild = 1 -endif -else -OPENSSL_BUFFERED_CLIENT := $(LAST_OPENSSL_BUFFERED_CLIENT) -endif - -ifneq ($(OPENSSL_BUFFERED_SERVER),) -ifneq ($(OPENSSL_BUFFERED_SERVER),$(LAST_OPENSSL_BUFFERED_SERVER)) -rebuild = 1 -endif -else -OPENSSL_BUFFERED_SERVER := $(LAST_OPENSSL_BUFFERED_SERVER) +OPENSSL_BUFFERED_NETWORK := $(LAST_OPENSSL_BUFFERED_NETWORK) endif ifneq ($(INSPIRCD2_PROTOCOL),) @@ -281,76 +246,75 @@ USE_SERVER = 0 OFILES = config.o general_network.o haxstring_utils.o real_main.o table.o mutex.o SOFILES = HaxIRCd.so -ifeq ($(PLAINTEXT_CLIENT),1) -CFLAGS += -DUSE_PLAINTEXT_CLIENT -USE_CLIENT = 1 -USE_PLAINTEXT = 1 -endif - -ifeq ($(PLAINTEXT_SERVER),1) -CFLAGS += -DUSE_PLAINTEXT_SERVER -USE_SERVER = 1 -USE_PLAINTEXT = 1 +USE_IRCD := 0 +ifeq ($(CLIENT),1) +OFILES += client_network.o +CFLAGS += -DUSE_CLIENT +USE_IRCD := 1 +USE_CLIENT := 1 endif -ifeq ($(GNUTLS_CLIENT),1) -CFLAGS += -DUSE_GNUTLS_CLIENT -USE_CLIENT = 1 -USE_GNUTLS = 1 +ifeq ($(SERVER),1) +OFILES += server_network.o +CFLAGS += -DUSE_SERVER +USE_IRCD := 1 +USE_SERVER := 1 endif -ifeq ($(GNUTLS_SERVER),1) -CFLAGS += -DUSE_GNUTLS_SERVER -USE_SERVER = 1 -USE_GNUTLS = 1 +ifneq ($(USE_IRCD),1) +$(error Well, you neither want clients nor servers, so... int main(void) {return 0;}, your IRCd is complete.) endif -ifeq ($(OPENSSL_CLIENT),1) -CFLAGS += -DUSE_OPENSSL_CLIENT -USE_CLIENT = 1 -USE_OPENSSL = 1 -endif -ifeq ($(OPENSSL_SERVER),1) -CFLAGS += -DUSE_OPENSSL_SERVER -USE_SERVER = 1 -USE_OPENSSL = 1 +USE_NETWORK := 0 +ifeq ($(PLAINTEXT_NETWORK),1) +OFILES += networks/plaintext.o +CFLAGS += -DUSE_PLAINTEXT_NETWORK +USE_NETWORK := 1 +USE_PLAINTEXT_NETWORK := 1 endif -ifeq ($(PLAINTEXT_BUFFERED_CLIENT),1) -CFLAGS += -DUSE_PLAINTEXT_BUFFERED_CLIENT -USE_CLIENT = 1 -USE_PLAINTEXT_BUFFERED = 1 +ifeq ($(GNUTLS_NETWORK),1) +OFILES += networks/gnutls.o +CFLAGS += -DUSE_GNUTLS_NETWORK $(shell pkg-config gnutls --cflags) +LDFLAGS += $(shell pkg-config gnutls --libs) +USE_NETWORK := 1 +USE_GNUTLS_NETWORK := 1 endif -ifeq ($(PLAINTEXT_BUFFERED_SERVER),1) -CFLAGS += -DUSE_PLAINTEXT_BUFFERED_SERVER -USE_SERVER = 1 -USE_PLAINTEXT_BUFFERED = 1 +ifeq ($(OPENSSL_NETWORK),1) +OFILES += networks/openssl.o +CFLAGS += -DUSE_OPENSSL_NETWORK $(shell pkg-config openssl --cflags) +LDFLAGS += $(shell pkg-config openssl --libs) +USE_NETWORK := 1 +USE_OPENSSL_NETWORK := 1 endif -ifeq ($(GNUTLS_BUFFERED_CLIENT),1) -CFLAGS += -DUSE_GNUTLS_BUFFERED_CLIENT -USE_CLIENT = 1 -USE_GNUTLS_BUFFERED = 1 +ifeq ($(PLAINTEXT_BUFFERED_NETWORK),1) +OFILES += networks/plaintext_buffered.o +CFLAGS += -DUSE_PLAINTEXT_BUFFERED_NETWORK +USE_NETWORK := 1 +USE_PLAINTEXT_BUFFERED_NETWORK := 1 endif -ifeq ($(GNUTLS_BUFFERED_SERVER),1) -CFLAGS += -DUSE_GNUTLS_BUFFERED_SERVER -USE_SERVER = 1 -USE_GNUTLS_BUFFERED = 1 +ifeq ($(GNUTLS_BUFFERED_NETWORK),1) +OFILES += networks/gnutls_buffered.o +CFLAGS += -DUSE_GNUTLS_BUFFERED_NETWORK $(shell pkg-config gnutls --cflags) +LDFLAGS += $(shell pkg-config gnutls --libs) +USE_NETWORK := 1 +USE_GNUTLS_BUFFERED_NETWORK := 1 endif -ifeq ($(OPENSSL_BUFFERED_CLIENT),1) -CFLAGS += -DUSE_OPENSSL_BUFFERED_CLIENT -USE_CLIENT = 1 -USE_OPENSSL_BUFFERED = 1 +ifeq ($(OPENSSL_BUFFERED_NETWORK),1) +OFILES += networks/openssl_buffered.o +CFLAGS += -DUSE_OPENSSL_BUFFERED_NETWORK $(shell pkg-config openssl --cflags) +LDFLAGS += $(shell pkg-config openssl --libs) +USE_NETWORK := 1 +USE_OPENSSL_BUFFERED_NETWORK := 1 endif -ifeq ($(OPENSSL_BUFFERED_SERVER),1) -CFLAGS += -DUSE_OPENSSL_BUFFERED_SERVER -USE_SERVER = 1 -USE_OPENSSL_BUFFERED = 1 +ifneq ($(USE_NETWORK),1) +$(error How would you like to communicate with these clients or servers?) endif @@ -373,6 +337,13 @@ CFLAGS += -DUSE_INSPIRCD4_PROTOCOL USE_PROTOCOLS = 1 endif +ifeq ($(USE_SERVER),1) +ifneq ($(USE_PROTOCOLS),1) +$(error You must use some s2s protocol if you want to link servers) +endif +endif + + ifeq ($(HAXSERV_PSEUDOCLIENT),1) SOFILES += pseudoclients/haxserv.so @@ -389,36 +360,6 @@ endif -ifeq ($(USE_CLIENT),1) -OFILES += client_network.o -CFLAGS += -DUSE_CLIENT -endif - -ifeq ($(USE_SERVER),1) -ifneq ($(USE_PROTOCOLS),1) -$(error You must use some s2s protocol if you want to use a server transport layer) -endif -OFILES += server_network.o -CFLAGS += -DUSE_SERVER -endif - -ifeq ($(USE_PLAINTEXT),1) -OFILES += networks/plaintext.o -CFLAGS += -DUSE_PLAINTEXT -endif - -ifeq ($(USE_GNUTLS),1) -OFILES += networks/gnutls.o -CFLAGS += -DUSE_GNUTLS $(shell pkg-config gnutls --cflags) -LDFLAGS += $(shell pkg-config gnutls --libs) -endif - -ifeq ($(USE_OPENSSL),1) -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 diff --git a/config.h b/config.h index 0ce5f51..90c029e 100644 --- a/config.h +++ b/config.h @@ -69,27 +69,27 @@ extern struct string SERVER_FULLNAME; // = STRING("My random server"); extern time_t PING_INTERVAL; // = 60; -#ifdef USE_GNUTLS +#if defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK) extern char GNUTLS_USE_SYSTEM_TRUST; // = 1; extern char *GNUTLS_CERT_PATH; // = "/etc/keys/crt.pem", or 0 extern char *GNUTLS_KEY_PATH; // = "/etc/keys/key.pem", or 0 #endif -#ifdef USE_OPENSSL +#if defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK) extern char OPENSSL_USE_SYSTEM_TRUST; // = 1; extern char *OPENSSL_CERT_PATH; // = "/etc/keys/crt.pem", or 0 extern char *OPENSSL_KEY_PATH; // = "/etc/keys/key.pem", or 0 #endif -#ifdef USE_PLAINTEXT_BUFFERED +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK extern size_t PLAINTEXT_BUFFERED_LEN; // = 1 M #endif -#ifdef USE_GNUTLS_BUFFERED +#ifdef USE_GNUTLS_BUFFERED_NETWORK extern size_t GNUTLS_BUFFERED_LEN; // = 1 M #endif -#ifdef USE_OPENSSL_BUFFERED +#ifdef USE_OPENSSL_BUFFERED_NETWORK extern size_t OPENSSL_BUFFERED_LEN; // = 1 M #endif diff --git a/general_network.c b/general_network.c index d9e8e75..816e4c0 100644 --- a/general_network.c +++ b/general_network.c @@ -40,22 +40,22 @@ #include "haxstring.h" #include "haxstring_utils.h" -#ifdef USE_PLAINTEXT +#ifdef USE_PLAINTEXT_NETWORK #include "networks/plaintext.h" #endif -#ifdef USE_GNUTLS +#ifdef USE_GNUTLS_NETWORK #include "networks/gnutls.h" #endif -#ifdef USE_OPENSSL +#ifdef USE_OPENSSL_NETWORK #include "networks/openssl.h" #endif -#ifdef USE_PLAINTEXT_BUFFERED +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK #include "networks/plaintext_buffered.h" #endif -#ifdef USE_GNUTLS_BUFFERED +#ifdef USE_GNUTLS_BUFFERED_NETWORK #include "networks/gnutls_buffered.h" #endif -#ifdef USE_OPENSSL_BUFFERED +#ifdef USE_OPENSSL_BUFFERED_NETWORK #include "networks/openssl_buffered.h" #endif @@ -101,7 +101,7 @@ char casemap[UCHAR_MAX+1] = { }; struct network networks[NUM_NET_TYPES] = { -#ifdef USE_PLAINTEXT +#ifdef USE_PLAINTEXT_NETWORK [NET_TYPE_PLAINTEXT] = { .send = plaintext_send, .recv = plaintext_recv, @@ -111,7 +111,7 @@ struct network networks[NUM_NET_TYPES] = { .close = plaintext_close, }, #endif -#ifdef USE_GNUTLS +#ifdef USE_GNUTLS_NETWORK [NET_TYPE_GNUTLS] = { .send = gnutls_send, .recv = gnutls_recv, @@ -121,7 +121,7 @@ struct network networks[NUM_NET_TYPES] = { .close = gnutls_close, }, #endif -#ifdef USE_OPENSSL +#ifdef USE_OPENSSL_NETWORK [NET_TYPE_OPENSSL] = { .send = openssl_send, .recv = openssl_recv, @@ -131,7 +131,7 @@ struct network networks[NUM_NET_TYPES] = { .close = openssl_close, }, #endif -#ifdef USE_PLAINTEXT_BUFFERED +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK [NET_TYPE_PLAINTEXT_BUFFERED] = { .send = plaintext_buffered_send, .recv = plaintext_buffered_recv, @@ -141,7 +141,7 @@ struct network networks[NUM_NET_TYPES] = { .close = plaintext_buffered_close, }, #endif -#ifdef USE_GNUTLS_BUFFERED +#ifdef USE_GNUTLS_BUFFERED_NETWORK [NET_TYPE_GNUTLS_BUFFERED] = { .send = gnutls_buffered_send, .recv = gnutls_buffered_recv, @@ -151,7 +151,7 @@ struct network networks[NUM_NET_TYPES] = { .close = gnutls_buffered_close, }, #endif -#ifdef USE_OPENSSL_BUFFERED +#ifdef USE_OPENSSL_BUFFERED_NETWORK [NET_TYPE_OPENSSL_BUFFERED] = { .send = openssl_buffered_send, .recv = openssl_buffered_recv, @@ -436,6 +436,7 @@ int rename_user(struct string from, struct user_info *user, struct string nick, memcpy(user->nick.data, nick.data, nick.len); user->nick.len = nick.len; + free(user->nick_ts_str.data); user->nick_ts_str = timestamp_str; user->nick_ts = timestamp; } diff --git a/general_network.h b/general_network.h index 8d563db..cfb61fb 100644 --- a/general_network.h +++ b/general_network.h @@ -155,22 +155,22 @@ extern int case_string_eq(struct string x, struct string y); extern char casemap[UCHAR_MAX+1]; #define CASEMAP(x) (casemap[(unsigned char)x]) -#ifdef USE_PLAINTEXT +#ifdef USE_PLAINTEXT_NETWORK #define NET_TYPE_PLAINTEXT 0 #endif -#ifdef USE_GNUTLS +#ifdef USE_GNUTLS_NETWORK #define NET_TYPE_GNUTLS 1 #endif -#ifdef USE_OPENSSL +#ifdef USE_OPENSSL_NETWORK #define NET_TYPE_OPENSSL 2 #endif -#ifdef USE_PLAINTEXT_BUFFERED +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK #define NET_TYPE_PLAINTEXT_BUFFERED 3 #endif -#ifdef USE_GNUTLS_BUFFERED +#ifdef USE_GNUTLS_BUFFERED_NETWORK #define NET_TYPE_GNUTLS_BUFFERED 4 #endif -#ifdef USE_OPENSSL_BUFFERED +#ifdef USE_OPENSSL_BUFFERED_NETWORK #define NET_TYPE_OPENSSL_BUFFERED 5 #endif diff --git a/real_main.c b/real_main.c index 6685740..a167958 100644 --- a/real_main.c +++ b/real_main.c @@ -34,22 +34,22 @@ #include "main.h" #include "mutex.h" -#ifdef USE_PLAINTEXT +#ifdef USE_PLAINTEXT_NETWORK #include "networks/plaintext.h" #endif -#ifdef USE_GNUTLS +#ifdef USE_GNUTLS_NETWORK #include "networks/gnutls.h" #endif -#ifdef USE_OPENSSL +#ifdef USE_OPENSSL_NETWORK #include "networks/openssl.h" #endif -#ifdef USE_PLAINTEXT_BUFFERED +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK #include "networks/plaintext_buffered.h" #endif -#ifdef USE_GNUTLS_BUFFERED +#ifdef USE_GNUTLS_BUFFERED_NETWORK #include "networks/gnutls_buffered.h" #endif -#ifdef USE_OPENSSL_BUFFERED +#ifdef USE_OPENSSL_BUFFERED_NETWORK #include "networks/openssl_buffered.h" #endif @@ -78,32 +78,32 @@ int real_main(void) { if (init_general_network() != 0) return 1; -#ifdef USE_PLAINTEXT +#ifdef USE_PLAINTEXT_NETWORK if (init_plaintext_network() != 0) // there's not really anything to do ahead of time with plain tcp networking, this is just here for consistency return 1; #endif -#ifdef USE_GNUTLS +#ifdef USE_GNUTLS_NETWORK if (init_gnutls_network() != 0) return 1; #endif -#ifdef USE_OPENSSL +#ifdef USE_OPENSSL_NETWORK if (init_openssl_network() != 0) return 1; #endif -#ifdef USE_PLAINTEXT_BUFFERED +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK if (init_plaintext_buffered_network() != 0) return 1; #endif -#ifdef USE_GNUTLS_BUFFERED +#ifdef USE_GNUTLS_BUFFERED_NETWORK if (init_gnutls_buffered_network() != 0) return 1; #endif -#ifdef USE_OPENSSL_BUFFERED +#ifdef USE_OPENSSL_BUFFERED_NETWORK if (init_openssl_buffered_network() != 0) return 1; #endif diff --git a/server_network.c b/server_network.c index 77ebd6f..12fc147 100644 --- a/server_network.c +++ b/server_network.c @@ -40,22 +40,22 @@ #include "protocols.h" #include "server_network.h" -#ifdef USE_PLAINTEXT_SERVER +#ifdef USE_PLAINTEXT_NETWORK #include "networks/plaintext.h" #endif -#ifdef USE_GNUTLS_SERVER +#ifdef USE_GNUTLS_NETWORK #include "networks/gnutls.h" #endif -#ifdef USE_OPENSSL_SERVER +#ifdef USE_OPENSSL_NETWORK #include "networks/openssl.h" #endif -#ifdef USE_PLAINTEXT_BUFFERED_SERVER +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK #include "networks/plaintext_buffered.h" #endif -#ifdef USE_GNUTLS_BUFFERED_SERVER +#ifdef USE_GNUTLS_BUFFERED_NETWORK #include "networks/gnutls_buffered.h" #endif -#ifdef USE_OPENSSL_BUFFERED_SERVER +#ifdef USE_OPENSSL_BUFFERED_NETWORK #include "networks/openssl_buffered.h" #endif @@ -75,30 +75,30 @@ int init_server_network(void) { } int start_server_network(void) { -#ifdef USE_PLAINTEXT_SERVER +#ifdef USE_PLAINTEXT_NETWORK if (start_server_network_threads(NET_TYPE_PLAINTEXT) != 0) return 1; #endif -#ifdef USE_GNUTLS_SERVER +#ifdef USE_GNUTLS_NETWORK if (GNUTLS_CERT_PATH && GNUTLS_KEY_PATH) if (start_server_network_threads(NET_TYPE_GNUTLS) != 0) return 1; #endif -#ifdef USE_OPENSSL_SERVER +#ifdef USE_OPENSSL_NETWORK if (OPENSSL_CERT_PATH && OPENSSL_KEY_PATH) if (start_server_network_threads(NET_TYPE_OPENSSL) != 0) return 1; #endif -#ifdef USE_PLAINTEXT_BUFFERED_SERVER +#ifdef USE_PLAINTEXT_BUFFERED_NETWORK if (start_server_network_threads(NET_TYPE_PLAINTEXT_BUFFERED) != 0) return 1; #endif -#ifdef USE_GNUTLS_BUFFERED_SERVER +#ifdef USE_GNUTLS_BUFFERED_NETWORK if (GNUTLS_CERT_PATH && GNUTLS_KEY_PATH) if (start_server_network_threads(NET_TYPE_GNUTLS_BUFFERED) != 0) return 1; #endif -#ifdef USE_OPENSSL_BUFFERED_SERVER +#ifdef USE_OPENSSL_BUFFERED_NETWORK if (OPENSSL_CERT_PATH && OPENSSL_KEY_PATH) if (start_server_network_threads(NET_TYPE_OPENSSL_BUFFERED) != 0) return 1; -- cgit v1.2.3