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

Cleanup: Handle legacy tags <burst-on-connect> and <threadpool> better

Browse Source
This commit is contained in:
Philipp Schafft 2023-06-22 16:22:02 +00:00
parent 1b26d3aba5
commit eb1169b6ce
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cfgfile.c
View File

@ -412,7 +412,6 @@ static void _set_defaults(ice_config_t *configuration)
configuration->client_limit = CONFIG_DEFAULT_CLIENT_LIMIT;
configuration->source_limit = CONFIG_DEFAULT_SOURCE_LIMIT;
configuration->queue_size_limit = CONFIG_DEFAULT_QUEUE_SIZE_LIMIT;
configuration->threadpool_size = CONFIG_DEFAULT_THREADPOOL_SIZE;
configuration->client_timeout = CONFIG_DEFAULT_CLIENT_TIMEOUT;
configuration->header_timeout = CONFIG_DEFAULT_HEADER_TIMEOUT;
configuration->source_timeout = CONFIG_DEFAULT_SOURCE_TIMEOUT;
@ -607,9 +606,7 @@ static void _parse_limits(xmlDocPtr doc, xmlNodePtr node,
configuration->queue_size_limit = atoi(tmp);
if (tmp) xmlFree(tmp);
} else if (xmlStrcmp (node->name, XMLSTR("threadpool")) == 0) {
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
configuration->threadpool_size = atoi(tmp);
if (tmp) xmlFree(tmp);
ICECAST_LOG_ERROR("Invalid <threadpool> tag is used. Please remove this tag from your config. No additional changes needed.");
} else if (xmlStrcmp (node->name, XMLSTR("client-timeout")) == 0) {
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
configuration->client_timeout = atoi(tmp);
@ -623,6 +620,7 @@ static void _parse_limits(xmlDocPtr doc, xmlNodePtr node,
configuration->source_timeout = atoi(tmp);
if (tmp) xmlFree(tmp);
} else if (xmlStrcmp (node->name, XMLSTR("burst-on-connect")) == 0) {
ICECAST_LOG_WARN("Deprecated <burst-on-connect> is used. Only use <burst-size>.");
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
if (atoi(tmp) == 0)
configuration->burst_size = 0;

1
src/cfgfile.h
View File

@ -147,7 +147,6 @@ typedef struct ice_config_tag {
int client_limit;
int source_limit;
unsigned int queue_size_limit;
int threadpool_size;
unsigned int burst_size;
int client_timeout;
int header_timeout;