aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-06-23 06:25:24 +00:00
Code

Cleanup: Removed tls_ok from ice_config_t and converted it to a bool

Browse Source
This commit is contained in:
Philipp Schafft 2022-03-01 08:43:47 +00:00
parent 22a8a2e1d6
commit 7ab028b6a7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cfgfile.h
View File

@ -270,9 +270,6 @@ struct ice_config_tag {
ice_config_http_header_t *http_headers; ice_config_http_header_t *http_headers;
/* is TLS supported by the server? */
int tls_ok;
size_t relay_length; size_t relay_length;
relay_config_t **relay; relay_config_t **relay;

9
src/connection.c
View File

@ -19,6 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#ifdef HAVE_POLL #ifdef HAVE_POLL
@ -98,7 +99,7 @@ static int _initialized = 0;
static volatile client_queue_t *_req_queue = NULL, **_req_queue_tail = &_req_queue; static volatile client_queue_t *_req_queue = NULL, **_req_queue_tail = &_req_queue;
static volatile client_queue_t *_con_queue = NULL, **_con_queue_tail = &_con_queue; static volatile client_queue_t *_con_queue = NULL, **_con_queue_tail = &_con_queue;
static volatile client_queue_t *_body_queue = NULL, **_body_queue_tail = &_body_queue; static volatile client_queue_t *_body_queue = NULL, **_body_queue_tail = &_body_queue;
static int tls_ok; static bool tls_ok = false;
static tls_ctx_t *tls_ctx; static tls_ctx_t *tls_ctx;
/* filtering client connection based on IP */ /* filtering client connection based on IP */
@ -169,7 +170,7 @@ static void get_tls_certificate(ice_config_t *config)
{ {
const char *keyfile; const char *keyfile;
config->tls_ok = tls_ok = 0; tls_ok = false;
keyfile = config->tls_context.key_file; keyfile = config->tls_context.key_file;
if (!keyfile) if (!keyfile)
@ -182,7 +183,7 @@ static void get_tls_certificate(ice_config_t *config)
return; return;
} }
config->tls_ok = tls_ok = 1; tls_ok = true;
} }
@ -218,7 +219,7 @@ static int connection_send_tls(connection_t *con, const void *buf, size_t len)
/* TLS not compiled in, so at least log it */ /* TLS not compiled in, so at least log it */
static void get_tls_certificate(ice_config_t *config) static void get_tls_certificate(ice_config_t *config)
{ {
tls_ok = 0; tls_ok = false;
ICECAST_LOG_INFO("No TLS capability. " ICECAST_LOG_INFO("No TLS capability. "
"Rebuild Icecast with OpenSSL support to enable this."); "Rebuild Icecast with OpenSSL support to enable this.");
} }