third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-05-30 23:29:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/yrutschle/sslh

Browse Source
This commit is contained in:
yrutschle 2019-11-15 22:20:48 +01:00
commit bae16ab29e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.c
View File

@ -97,12 +97,12 @@ int make_listen_tfo(int s)
/* Don't do it if not supported */ /* Don't do it if not supported */
if (!TCP_FASTOPEN) if (!TCP_FASTOPEN)
return; return 0;
/* Don't do it if any protocol does not specify it */ /* Don't do it if any protocol does not specify it */
for (i = 0; i < cfg.protocols_len; i++) { for (i = 0; i < cfg.protocols_len; i++) {
if (! cfg.protocols[i].tfo_ok) if (! cfg.protocols[i].tfo_ok)
return; return 0;
} }
return setsockopt(s, SOL_SOCKET, TCP_FASTOPEN, (char*)&qlen, sizeof(qlen)); return setsockopt(s, SOL_SOCKET, TCP_FASTOPEN, (char*)&qlen, sizeof(qlen));

2
echosrv.c
View File

@ -106,7 +106,7 @@ void start_echo(int fd)
strcpy(buffer, prefix); strcpy(buffer, prefix);
while (1) { while (1) {
ret = read(fd, buffer + prefix_len, sizeof(buffer)); ret = read(fd, buffer + prefix_len, sizeof(buffer) - prefix_len);
if (ret == -1) { if (ret == -1) {
fprintf(stderr, "%s", strerror(errno)); fprintf(stderr, "%s", strerror(errno));
return; return;

10
sslh-main.c
View File

@ -115,7 +115,7 @@ static void printsettings(void)
} }
/* To removed in v1.21 */ /* 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"; 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) void ssl_to_tls(char* setting)
{ {
@ -126,7 +126,7 @@ void ssl_to_tls(char* setting)
} }
/* Turn 'ssl' command line option to 'tls'. To removed in v1.21 */ /* Turn 'ssl' command line option to 'tls'. To be removed in v1.21 */
void cmd_ssl_to_tls(int argc, char* argv[]) void cmd_ssl_to_tls(int argc, char* argv[])
{ {
int i; int i;
@ -135,7 +135,7 @@ void cmd_ssl_to_tls(int argc, char* argv[])
strcpy(argv[i], "--tls"); strcpy(argv[i], "--tls");
/* foreground option not parsed yet, syslog not open, just print on /* foreground option not parsed yet, syslog not open, just print on
* stderr and hope for the best */ * stderr and hope for the best */
fprintf(stderr, ssl_err_msg); fprintf(stderr, "%s", ssl_err_msg);
} }
} }
} }
@ -224,11 +224,11 @@ static void config_protocols()
cfg.protocols[i].data = (void*)new_tls_data(); cfg.protocols[i].data = (void*)new_tls_data();
if (cfg.protocols[i].sni_hostnames_len) if (cfg.protocols[i].sni_hostnames_len)
tls_data_set_list(cfg.protocols[i].data, 0, tls_data_set_list(cfg.protocols[i].data, 0,
cfg.protocols[i].sni_hostnames, (const char**) cfg.protocols[i].sni_hostnames,
cfg.protocols[i].sni_hostnames_len); cfg.protocols[i].sni_hostnames_len);
if (cfg.protocols[i].alpn_protocols_len) if (cfg.protocols[i].alpn_protocols_len)
tls_data_set_list(cfg.protocols[i].data, 1, tls_data_set_list(cfg.protocols[i].data, 1,
cfg.protocols[i].alpn_protocols, (const char**) cfg.protocols[i].alpn_protocols,
cfg.protocols[i].alpn_protocols_len); cfg.protocols[i].alpn_protocols_len);
} }
} }