From ea1d2b364be5a985c5033d93af722efa1ca3251c Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Fri, 26 Jul 2024 08:00:00 +0800 Subject: config.md: Fix missing # for preprocessor conditions --- ci/config.c | 22 +++++++++++----------- config.md | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ci/config.c b/ci/config.c index d268f50..ec888f1 100644 --- a/ci/config.c +++ b/ci/config.c @@ -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. */ -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#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] = { -if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) [NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 7003, #endif #endif -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) [NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 7013, #endif #endif -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) * listening. This is passed into the backlog argument of listen(2). */ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = { -if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) [NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 16, #endif #endif -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) [NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 16, #endif #endif -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) * incoming connections at all, for each (network, protocol) combination. */ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = { -if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) [NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 1, #endif #endif -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) [NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 1, #endif #endif -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) #ifdef USE_INSPIRCD2_PROTOCOL [NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 1, #endif diff --git a/config.md b/config.md index 50ecdc2..0cd7a04 100644 --- a/config.md +++ b/config.md @@ -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. */ -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#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] = { -if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) [NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 7003, #endif #endif -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) [NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 7013, #endif #endif -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) * listening. This is passed into the backlog argument of listen(2). */ size_t SERVER_LISTEN[NUM_NET_TYPES][NUM_PROTOCOLS] = { -if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) [NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 16, #endif #endif -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) [NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 16, #endif #endif -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) * incoming connections at all, for each (network, protocol) combination. */ char SERVER_INCOMING[NUM_NET_TYPES][NUM_PROTOCOLS] = { -if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_PLAINTEXT_NETWORK) || defined(USE_PLAINTEXT_BUFFERED_NETWORK)) [NET_TYPE_PLAINTEXT][INSPIRCD4_PROTOCOL] = 1, #endif #endif -if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) +#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 @@ if (defined(USE_GNUTLS_NETWORK) || defined(USE_GNUTLS_BUFFERED_NETWORK)) [NET_TYPE_GNUTLS][INSPIRCD4_PROTOCOL] = 1, #endif #endif -if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) +#if (defined(USE_OPENSSL_NETWORK) || defined(USE_OPENSSL_BUFFERED_NETWORK)) #ifdef USE_INSPIRCD2_PROTOCOL [NET_TYPE_OPENSSL][INSPIRCD2_PROTOCOL] = 1, #endif -- cgit v1.2.3