removed obsolete support for . Use instead

ChangeLog

@@ -1,4 +1,12 @@
 v1.21: 11JUL2020
+	WARNING:
+	Moved configuration and command-line management to
+	use conf2struct. Changes are:
+	* `--ssl` and using `name: 'ssl'` in config file is no longer supported, use `tls` instead.
+	* command line option <-F|--config> no longer defaults to /etc/sslh.cfg, so you have to
+	specify it explicitly.
+	* command line option <-v|--verbose> takes a mandatory integer parameter
+
 	Added TCP_FASTOPEN support for client sockets (if
 	tfo_ok is specified in their configuration) and for
 	listenint socket, if all client protocols support it.
@@ -8,12 +16,6 @@ v1.21: 11JUL2020
 	than that many bytes have been received (mostly for
 	regex)
 
-	Moved configuration and command-line management to
-	use conf2struct. Changes are:
-	* command line option <-F|--config> no longer defaults to /etc/sslh.cfg, so you have to
-	specify it explicitly.
-	* command line option <-v|--verbose> takes a mandatory integer parameter
-
 	Update Let's Encrypt entry in example.cfg for tls-alpn-01
 	challenges; tls-sni-* challenges are now deprecated.
 

Makefile

@@ -1,6 +1,8 @@
-# Configuration
 
 VERSION=$(shell ./genver.sh -r)
+
+# Configuration -- you probably need to `make clean` if you
+# change any of these
 ENABLE_REGEX=1  # Enable regex probes
 USELIBCONFIG=1	# Use libconfig? (necessary to use configuration files)
 USELIBPCRE=1	# Use libpcre? (needed for regex on musl)

doc/INSTALL.md

@@ -42,7 +42,7 @@ For Fedora, you'll need packages `libconfig` and
 If you want to rebuild `sslh-conf.c` (after a `make
 distclean` for example), you will also need to add
 [conf2struct](https://www.rutschle.net/tech/conf2struct/README.html)
-(v1.3) to your path.
+(v1.4) to your path.
 
 Compilation
 -----------

probe.c

@@ -53,7 +53,6 @@ static struct protocol_probe_desc builtins[] = {
     { "xmpp",       is_xmpp_protocol },
     { "http",       is_http_protocol },
     { "tls",        is_tls_protocol },
-    { "ssl",        is_tls_protocol },
     { "adb",        is_adb_protocol },
     { "socks5",     is_socks5_protocol },
     { "anyprot",    is_true }

sslh-conf.c

@@ -1,5 +1,5 @@
 /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
- * on Sun Jul 19 16:59:51 2020. 
+ * on Wed Jul 29 22:51:16 2020. 
 
 # conf2struct: generate libconf parsers that read to structs
 # Copyright (C) 2018-2019  Yves Rutschle
@@ -30,9 +30,12 @@
 
 #define _GNU_SOURCE
 #include <string.h>
-#include <libconfig.h>
+#ifdef LIBCONFIG
+#    include <libconfig.h>
+#endif
 #include <stdlib.h>
 #include <stddef.h>
+#include <stdio.h>
 #include "sslh-conf.h"
 #include "argtable3.h"
 #ifdef LIBPCRE
@@ -56,18 +59,7 @@ typedef enum {
     CFG_ARRAY,
     CFG_LIST,
 } config_type;
-
-typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
-lookup_fn lookup_fns[] = {
-    (lookup_fn)config_setting_lookup_bool,
-    (lookup_fn)config_setting_lookup_int,
-    (lookup_fn)config_setting_lookup_int64,
-    (lookup_fn)config_setting_lookup_float,
-    (lookup_fn)config_setting_lookup_string,
-    NULL,  /* CFG_GROUP */
-    NULL,  /* CFG_ARRAY */
-    NULL,  /* CFG_LIST */
-};
+/* /config_type */
 
 const char* type2str[] = {
     "boolean",
@@ -80,8 +72,6 @@ const char* type2str[] = {
     "list",
 };
 
-/* /config_type */
-
 typedef union {
     int def_bool;
     int def_int;
@@ -90,6 +80,97 @@ typedef union {
     char* def_string;
 } any_val;
 
+struct config_desc {
+    const char* name;
+    int type;
+    struct config_desc * sub_group; /* Table for compound types (list and group) */
+    void* arg_cl; /* command-line argument for this setting */
+    void* base_addr; /* Base of the structure (filled at runtime). Probably not useable for list elements */
+    size_t offset;  /* Offset of setting in the structure */
+    size_t offset_len; /* Offset of *_len field, for arrays and lists */
+    size_t offset_present; /* offset of *_is_present field, for optional settings */
+    size_t size;   /* Size of element, or size of group for groups and lists */
+    int array_type; /* type of array elements, when type == CFG_ARRAY */
+    int mandatory;
+    int optional;
+    any_val default_val;
+};
+
+#ifndef LIBCONFIG
+/* Stubs in case you don't want libconfig */
+
+typedef void config_setting_t;
+typedef int config_t;
+#define CONFIG_TRUE 1
+#define CONFIG_FALSE 0
+
+#define make_config_setting_lookup(type) \
+    int config_setting_lookup_##type(const config_setting_t* a, const char* b, void* c) { \
+        return 0; \
+    }
+
+#define make_config_setting_get(type, ret_type) \
+    ret_type config_setting_get_##type(const config_setting_t* a) { \
+        return 0; \
+    }
+
+make_config_setting_lookup(bool);
+make_config_setting_lookup(int);
+make_config_setting_lookup(int64);
+make_config_setting_lookup(float);
+make_config_setting_lookup(string);
+
+make_config_setting_get(bool, int);
+make_config_setting_get(int, int);
+make_config_setting_get(int64, int);
+make_config_setting_get(float, double);
+make_config_setting_get(string, char*);
+
+config_setting_t* config_lookup(config_t* c, const char* b) {
+    return NULL;
+}
+
+void config_init(config_t* c) {
+    return;
+}
+
+config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+    return NULL;
+}
+
+int config_setting_length(config_setting_t* a) {
+    return 0;
+}
+
+config_setting_t* config_setting_get_elem(config_setting_t* a, int i) {
+    return NULL;
+}
+
+int config_read_file(config_t* a, const char* b) {
+    return CONFIG_TRUE;
+}
+
+int config_error_line(config_t* c) {
+    return 0;
+}
+
+char* config_error_text(config_t* c) {
+    return NULL;
+}
+#endif
+
+typedef int (*lookup_fn)(const config_setting_t*, const char*, void*);
+lookup_fn lookup_fns[] = {
+    (lookup_fn)config_setting_lookup_bool,
+    (lookup_fn)config_setting_lookup_int,
+    (lookup_fn)config_setting_lookup_int64,
+    (lookup_fn)config_setting_lookup_float,
+    (lookup_fn)config_setting_lookup_string,
+    NULL,  /* CFG_GROUP */
+    NULL,  /* CFG_ARRAY */
+    NULL,  /* CFG_LIST */
+};
+
 /* Copy an any_val to arbitrary memory location */
 /* 0: success
  * <0: error */
@@ -253,22 +334,6 @@ static int stringcpy(config_type type, void* target, char* from)
 }
 
 
-struct config_desc {
-    const char* name;
-    int type;
-    struct config_desc * sub_group; /* Table for compound types (list and group) */
-    void* arg_cl; /* command-line argument for this setting */
-    void* base_addr; /* Base of the structure (filled at runtime). Probably not useable for list elements */
-    size_t offset;  /* Offset of setting in the structure */
-    size_t offset_len; /* Offset of *_len field, for arrays and lists */
-    size_t offset_present; /* offset of *_is_present field, for optional settings */
-    size_t size;   /* Size of element, or size of group for groups and lists */
-    int array_type; /* type of array elements, when type == CFG_ARRAY */
-    int mandatory;
-    int optional;
-    any_val default_val;
-};
-
 /* Element to describe the target of a compound element
 * element: which config entry is being changed
 * match: if >0, index in pmatch to set
@@ -831,7 +896,7 @@ static struct compound_cl_target sslhcfg_xmpp_targets [] = {
 };
 
 static struct compound_cl_target sslhcfg_tinc_targets [] = {
-	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "openvpn" },
+	{ & table_sslhcfg_protocols[0], 0, .value.def_string = "tinc" },
 	{ & table_sslhcfg_protocols[1], 1, .value.def_string = "0" },
 	{ & table_sslhcfg_protocols[2], 2, .value.def_string = "0" },
 	{ & table_sslhcfg_protocols[6], 0, .value.def_int = 1 },
@@ -931,7 +996,7 @@ static struct compound_cl_arg compound_cl_args[] = {
 
             .override_desc =   & table_sslhcfg_protocols [0],
             .override_matchindex = 0,
-            .override_const = "openvpn",
+            .override_const = "tinc",
         },
 
         {   /* arg: xmpp */
@@ -1099,7 +1164,7 @@ static void read_block_init(void* target, config_setting_t* cfg, struct config_d
             if (setting)
                 len = config_setting_length(setting);
         } 
-        block = malloc(desc->size * len);
+        block = calloc(len, desc->size);
 
         *(size_t*)(((char*)target) + desc->offset_len) = len;
         *(void**)(((char*)target) + desc->offset) = block;
@@ -1107,7 +1172,7 @@ static void read_block_init(void* target, config_setting_t* cfg, struct config_d
         break;
 
     case CFG_GROUP:
-        block = malloc(desc->size);
+        block = calloc(1, desc->size);
         *(void**)(((char*)target) + desc->offset) = block;
         TRACE_READ((" sizing for %zu elems ", len));
         break;
@@ -1488,7 +1553,9 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
     char* errmsg;
     config_setting_t* s;
     void* argtable[] = {
-                sslhcfg_conffile = arg_filen("F", "config", "<file>", 0, 1, "Specify configuration file"),
+            #ifdef LIBCONFIG
+        sslhcfg_conffile = arg_filen("F", "config", "<file>", 0, 1, "Specify configuration file"),
+    #endif
          sslhcfg_verbose = arg_intn("v", "verbose", "<n>", 0, 1, ""),
          sslhcfg_foreground = arg_litn("f", "foreground", 0, 1, "Run in foreground instead of as a daemon"),
          sslhcfg_inetd = arg_litn("i", "inetd", 0, 1, "Run in inetd mode: use stdin/stdout instead of network listen"),

sslh-conf.h

@@ -1,5 +1,5 @@
 /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README)
- * on Sun Jul 19 16:59:51 2020. 
+ * on Wed Jul 29 22:51:16 2020. 
 
 # conf2struct: generate libconf parsers that read to structs
 # Copyright (C) 2018-2019  Yves Rutschle
@@ -30,7 +30,9 @@
  
 #ifndef C2S_SSLHCFG_H
 #define C2S_SSLHCFG_H
-#include <libconfig.h>
+#ifdef LIBCONFIG
+#    include <libconfig.h>
+#endif
 
 
 #include "probe.h"

sslh-main.c

@@ -115,36 +115,9 @@ static void printsettings(void)
 }
 
 
-/* To be removed in v1.21 */
-const char* ssl_err_msg = "Usage of 'ssl' setting is deprecated and will be removed in v1.21. Please use 'tls' instead\n";
-void ssl_to_tls(char* setting)
-{
-    if (!strcmp(setting, "ssl")) {
-        strcpy(setting, "tls"); /* legacy configuration */
-        log_message(LOG_INFO, ssl_err_msg);
-    }
-}
-
-
-/* Turn 'ssl' command line option to 'tls'. To be removed in v1.21 */
-void cmd_ssl_to_tls(int argc, char* argv[])
-{
-    int i;
-    for (i = 0; i < argc; i++) {
-        if (!strcmp(argv[i], "--ssl")) {
-            strcpy(argv[i], "--tls");
-            /* foreground option not parsed yet, syslog not open, just print on
-             * stderr and hope for the best */
-            fprintf(stderr, "%s", ssl_err_msg);
-        }
-    }
-}
-
-
 /* Extract configuration on addresses and ports on which to listen.
  * out: newly allocated list of addrinfo to listen to
  */
-#ifdef LIBCONFIG
 static int config_resolve_listen(struct addrinfo **listen)
 {
     int i, res;
@@ -164,12 +137,11 @@ static int config_resolve_listen(struct addrinfo **listen)
     }
     return 0;
 }
-#endif
 
 
 
-#ifdef LIBCONFIG
 static void setup_regex_probe(struct sslhcfg_protocols_item *p)
+#ifdef LIBCONFIG
 {
     int num_patterns, i, res;
     regex_t** pattern_list;
@@ -196,6 +168,10 @@ static void setup_regex_probe(struct sslhcfg_protocols_item *p)
         }
     }
 }
+#else
+{
+    return;
+}
 #endif
 
 /* For each protocol in the configuration, resolve address and set up protocol

sslhconf.cfg

@@ -162,7 +162,7 @@ cl_groups: (
         override: "name";
         argdesc: "<host:port>";
         targets: (
-        { path: "name"; value: "openvpn" },
+        { path: "name"; value: "tinc" },
         { path: "host"; value: "$1" },
         { path: "port"; value: "$2" },
         { path: "log_level"; value: 1 },