Mercurial > hg > batmud > maputils

changeset 2297:f59bb8588686

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 01 Jul 2020 14:34:32 +0300
parents 8811b1fe5dcc
children 59600cb9342f
files mapsearch.c
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mapsearch.c	Wed Jul 01 13:29:02 2020 +0300
+++ b/mapsearch.c	Wed Jul 01 14:34:32 2020 +0300
@@ -1890,36 +1890,38 @@
         switch (ctx->ipvMode)
         {
             case 0:
-                ipvMode = " [IPv4 + IPv6]";
+                ipvMode = "IPv4 + IPv6";
                 break;
 
             case 4:
-                ipvMode = " [IPv4 only]";
+                ipvMode = "IPv4 only";
                 info.options |= LWS_SERVER_OPTION_DISABLE_IPV6;
                 break;
 
             case 6:
-                ipvMode = " [IPv6 only]";
+                ipvMode = "IPv6 only";
                 info.options |= LWS_SERVER_OPTION_IPV6_V6ONLY_MODIFY | LWS_SERVER_OPTION_IPV6_V6ONLY_VALUE;
                 break;
         }
 
         if (ctx->useSSL)
         {
-            mapMSG(1, "Listen to %s:%d (wss) [vhost='%s', cert='%s', key='%s', ca='%s']%s\n",
-                ctx->interface != NULL ? ctx->interface : "*", ctx->port,
+            mapMSG(1, "Listen to %s:%d (wss) [vhost='%s', cert='%s', key='%s', ca='%s'] [%s]\n",
+                ctx->interface != NULL ? ctx->interface : "*",
+                ctx->port,
                 ctx->vhostname,
-                ctx->sslCertFile, ctx->sslKeyFile, ctx->sslCAFile,
+                ctx->sslCertFile, ctx->sslKeyFile,
+                (ctx->sslCAFile != NULL && ctx->sslCAFile[0]) ? ctx->sslCAFile : "NONE",
                 ipvMode);
 
             info.vhost_name = ctx->vhostname;
             info.ssl_cert_filepath = ctx->sslCertFile;
             info.ssl_private_key_filepath = ctx->sslKeyFile;
-            info.ssl_ca_filepath = ctx->sslCAFile[0] ? ctx->sslCAFile : NULL;
+            info.ssl_ca_filepath = (ctx->sslCAFile != NULL && ctx->sslCAFile[0]) ? ctx->sslCAFile : NULL;
         }
         else
         {
-            mapMSG(1, "Listen to %s:%d (ws)%s\n",
+            mapMSG(1, "Listen to %s:%d (ws) [%s]\n",
                 ctx->interface != NULL ? ctx->interface : "*",
                 ctx->port,
                 ipvMode);