third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-06-18 08:02:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

turn ssl setting from configuration file to tls (ssl no longer exists)

Browse Source
This commit is contained in:
yrutschle 2018-09-30 20:20:06 +02:00
parent f480eb6c7d
commit 2ee0088c5f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sslh-main.c
View File

@ -147,6 +147,15 @@ static void printsettings(void)
} }
void ssl_to_tls(char* setting)
{
if (!strcmp(setting, "ssl")) {
strcpy(setting, "tls"); /* legacy configuration */
log_message(LOG_INFO, "Usage of 'ssl' setting is deprecated and will be removed in v1.21. Please use 'tls' instead\n");
}
}
/* Extract configuration on addresses and ports on which to listen. /* Extract configuration on addresses and ports on which to listen.
* out: newly allocated list of addrinfo to listen to * out: newly allocated list of addrinfo to listen to
*/ */
@ -305,7 +314,8 @@ static void setup_sni_alpn(struct proto *p, config_setting_t* prot)
static int config_protocols(config_t *config, struct proto **prots) static int config_protocols(config_t *config, struct proto **prots)
{ {
config_setting_t *setting, *prot, *patterns; config_setting_t *setting, *prot, *patterns;
const char *hostname, *port, *name; const char *hostname, *port, *cfg_name;
char* name;
int i, num_prots; int i, num_prots;
struct proto *p, *prev = NULL; struct proto *p, *prev = NULL;
@ -320,10 +330,12 @@ static int config_protocols(config_t *config, struct proto **prots)
prev = p; prev = p;
prot = config_setting_get_elem(setting, i); prot = config_setting_get_elem(setting, i);
if ((config_setting_lookup_string(prot, "name", &name) && if ((config_setting_lookup_string(prot, "name", &cfg_name) &&
config_setting_lookup_string(prot, "host", &hostname) && config_setting_lookup_string(prot, "host", &hostname) &&
config_setting_lookup_string(prot, "port", &port) config_setting_lookup_string(prot, "port", &port)
)) { )) {
name = strdup(cfg_name);
ssl_to_tls(name);
p->description = name; p->description = name;
config_setting_lookup_string(prot, "service", &(p->service)); config_setting_lookup_string(prot, "service", &(p->service));
config_setting_lookup_bool(prot, "keepalive", &p->keepalive); config_setting_lookup_bool(prot, "keepalive", &p->keepalive);