config.md: _NETWORK fixes in config.c

2 files changed, 36 insertions, 36 deletions

diff --git a/ci/config.c b/ci/config.c
index 26a6ea9..d268f50 100644
--- a/ci/config.c
+++ b/ci/config.c
@@ -92,12 +92,12 @@ size_t SERVER_CONFIG_LEN = sizeof(SERVER_CONFIG) / sizeof(*SERVER_CONFIG);
  * uppercase. Server IDs are not translted between protocols
  * so a uniform format is generally required.
  */
-struct string SID = STRING("2TX");
+struct string SID = STRING("5HX");
 
 /*
  * Our server name. Well-formed DNS, doesn't have to resolve.
  */
-struct string SERVER_NAME = STRING("h.learn.tuxiversity.org");
+struct string SERVER_NAME = STRING("haxircd.int");
 
 /*
  * Our server description.
@@ -117,12 +117,12 @@ time_t PING_INTERVAL = 60;
  * NOTE: We do not check the validity of TLS certificates yet. CertFP
  * authentication will be added later.
  */
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 char GNUTLS_USE_SYSTEM_TRUST = 1;
 char *GNUTLS_CERT_PATH = "/path/to/fullchain.pem";
 char *GNUTLS_KEY_PATH = "/path/to/privkey.pem";
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 char OPENSSL_USE_SYSTEM_TRUST = 1;
 char *OPENSSL_CERT_PATH = "/path/to/fullchain.pem";
 char *OPENSSL_KEY_PATH = "/path/to/privkey.pem";
@@ -134,7 +134,7 @@ char *OPENSSL_KEY_PATH = "/path/to/privkey.pem";
  */
 #ifdef USE_SERVER
 unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
-#ifdef USE_PLAINTEXT
+if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_PLAINTEXT][INSPIRCD2_PROTOCOL] = 7001,
 #endif
@@ -145,7 +145,7 @@ unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 7003,
 #endif
 #endif
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_GNUTLS][INSPIRCD2_PROTOCOL] = 7011,
 #endif
@@ -156,7 +156,7 @@ unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 7013,
 #endif
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 7021,
 #endif
@@ -174,7 +174,7 @@ unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
  * listening. This is passed into the backlog argument of listen(2).
  */
 size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
-#ifdef USE_PLAINTEXT
+if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_PLAINTEXT][INSPIRCD2_PROTOCOL] = 16,
 #endif
@@ -185,7 +185,7 @@ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 16,
 #endif
 #endif
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_GNUTLS][INSPIRCD2_PROTOCOL] = 16,
 #endif
@@ -196,7 +196,7 @@ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 16,
 #endif
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 16,
 #endif
@@ -214,7 +214,7 @@ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
  * incoming connections at all, for each (network, protocol) combination.
  */
 char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
-#ifdef USE_PLAINTEXT
+if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_PLAINTEXT][INSPIRCD2_PROTOCOL] = 1,
 #endif
@@ -225,7 +225,7 @@ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 1,
 #endif
 #endif
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_GNUTLS][INSPIRCD2_PROTOCOL] = 1,
 #endif
@@ -236,7 +236,7 @@ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 1,
 #endif
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 1,
 #endif
@@ -255,7 +255,7 @@ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
  * pseudoclient, HaxServ.
  */
 #ifdef USE_HAXSERV_PSEUDOCLIENT
-struct string HAXSERV_UID = STRING("2TX000000");
+struct string HAXSERV_UID = STRING("5HX000000");
 struct string HAXSERV_NICK = STRING("HaxServ");
 struct string HAXSERV_FULLNAME = STRING("HaxServ");
 struct string HAXSERV_IDENT = STRING("HaxServ");
@@ -279,13 +279,13 @@ struct string HAXSERV_LOG_CHANNEL = STRING("#services");
  * network backend here. They must be larger than any full message;
  * otherwise, undefined behavior occurs.
  */
-#ifdef USE_PLAINTEXT_BUFFERED
+#ifdef USE_PLAINTEXT_BUFFERED_NETWORK
 size_t PLAINTEXT_BUFFERED_LEN = 1048576;
 #endif
-#ifdef USE_GNUTLS_BUFFERED
+#ifdef USE_GNUTLS_BUFFERED_NETWORK
 size_t GNUTLS_BUFFERED_LEN = 1048576;
 #endif
-#ifdef USE_OPENSSL_BUFFERED
+#ifdef USE_OPENSSL_BUFFERED_NETWORK
 size_t OPENSSL_BUFFERED_LEN = 1048576;
 #endif
 
@@ -294,7 +294,7 @@ size_t OPENSSL_BUFFERED_LEN = 1048576;
  * services, such as NickServ.
  */
 #ifdef USE_SERVICES_PSEUDOCLIENT
-struct string NICKSERV_UID = STRING("2TX0000NS");
+struct string NICKSERV_UID = STRING("5HX0000NS");
 struct string NICKSERV_NICK = STRING("NickServ");
 struct string NICKSERV_FULLNAME = STRING("Nickname Services");
 struct string NICKSERV_IDENT = STRING("NickServ");
diff --git a/config.md b/config.md
index d171a31..50ecdc2 100644
--- a/config.md
+++ b/config.md
@@ -107,12 +107,12 @@ size_t SERVER_CONFIG_LEN = sizeof(SERVER_CONFIG) / sizeof(*SERVER_CONFIG);
  * uppercase. Server IDs are not translted between protocols
  * so a uniform format is generally required.
  */
-struct string SID = STRING("2TX");
+struct string SID = STRING("5HX");
 
 /*
  * Our server name. Well-formed DNS, doesn't have to resolve.
  */
-struct string SERVER_NAME = STRING("h.learn.tuxiversity.org");
+struct string SERVER_NAME = STRING("haxircd.int");
 
 /*
  * Our server description.
@@ -132,12 +132,12 @@ time_t PING_INTERVAL = 60;
  * NOTE: We do not check the validity of TLS certificates yet. CertFP
  * authentication will be added later.
  */
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 char GNUTLS_USE_SYSTEM_TRUST = 1;
 char *GNUTLS_CERT_PATH = "/path/to/fullchain.pem";
 char *GNUTLS_KEY_PATH = "/path/to/privkey.pem";
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 char OPENSSL_USE_SYSTEM_TRUST = 1;
 char *OPENSSL_CERT_PATH = "/path/to/fullchain.pem";
 char *OPENSSL_KEY_PATH = "/path/to/privkey.pem";
@@ -149,7 +149,7 @@ char *OPENSSL_KEY_PATH = "/path/to/privkey.pem";
  */
 #ifdef USE_SERVER
 unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
-#ifdef USE_PLAINTEXT
+if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_PLAINTEXT][INSPIRCD2_PROTOCOL] = 7001,
 #endif
@@ -160,7 +160,7 @@ unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 7003,
 #endif
 #endif
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_GNUTLS][INSPIRCD2_PROTOCOL] = 7011,
 #endif
@@ -171,7 +171,7 @@ unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 7013,
 #endif
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 7021,
 #endif
@@ -189,7 +189,7 @@ unsigned short SERVER_PORTS[NUM_NET_TYPES][NUM_PROTOCOLS] = {
  * listening. This is passed into the backlog argument of listen(2).
  */
 size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
-#ifdef USE_PLAINTEXT
+if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_PLAINTEXT][INSPIRCD2_PROTOCOL] = 16,
 #endif
@@ -200,7 +200,7 @@ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 16,
 #endif
 #endif
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_GNUTLS][INSPIRCD2_PROTOCOL] = 16,
 #endif
@@ -211,7 +211,7 @@ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 16,
 #endif
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 16,
 #endif
@@ -229,7 +229,7 @@ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = {
  * incoming connections at all, for each (network, protocol) combination.
  */
 char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
-#ifdef USE_PLAINTEXT
+if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_PLAINTEXT][INSPIRCD2_PROTOCOL] = 1,
 #endif
@@ -240,7 +240,7 @@ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 1,
 #endif
 #endif
-#ifdef USE_GNUTLS
+if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_GNUTLS][INSPIRCD2_PROTOCOL] = 1,
 #endif
@@ -251,7 +251,7 @@ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
 	[NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 1,
 #endif
 #endif
-#ifdef USE_OPENSSL
+if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK))
 #ifdef USE_INSPIRCD2_PROTOCOL
 	[NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 1,
 #endif
@@ -270,7 +270,7 @@ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = {
  * pseudoclient, HaxServ.
  */
 #ifdef USE_HAXSERV_PSEUDOCLIENT
-struct string HAXSERV_UID = STRING("2TX000000");
+struct string HAXSERV_UID = STRING("5HX000000");
 struct string HAXSERV_NICK = STRING("HaxServ");
 struct string HAXSERV_FULLNAME = STRING("HaxServ");
 struct string HAXSERV_IDENT = STRING("HaxServ");
@@ -294,13 +294,13 @@ struct string HAXSERV_LOG_CHANNEL = STRING("#services");
  * network backend here. They must be larger than any full message;
  * otherwise, undefined behavior occurs.
  */
-#ifdef USE_PLAINTEXT_BUFFERED
+#ifdef USE_PLAINTEXT_BUFFERED_NETWORK
 size_t PLAINTEXT_BUFFERED_LEN = 1048576;
 #endif
-#ifdef USE_GNUTLS_BUFFERED
+#ifdef USE_GNUTLS_BUFFERED_NETWORK
 size_t GNUTLS_BUFFERED_LEN = 1048576;
 #endif
-#ifdef USE_OPENSSL_BUFFERED
+#ifdef USE_OPENSSL_BUFFERED_NETWORK
 size_t OPENSSL_BUFFERED_LEN = 1048576;
 #endif
 
@@ -309,7 +309,7 @@ size_t OPENSSL_BUFFERED_LEN = 1048576;
  * services, such as NickServ.
  */
 #ifdef USE_SERVICES_PSEUDOCLIENT
-struct string NICKSERV_UID = STRING("2TX0000NS");
+struct string NICKSERV_UID = STRING("5HX0000NS");
 struct string NICKSERV_NICK = STRING("NickServ");
 struct string NICKSERV_FULLNAME = STRING("Nickname Services");
 struct string NICKSERV_IDENT = STRING("NickServ");