aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Update: Improved handling of bad tags in _parse_relay()

Browse Source
This commit is contained in:
Philipp Schafft 2021-06-23 09:28:33 +00:00
parent aa83b3fff0
commit 76e3e6ad6b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cfgfile.c
View File

@ -2073,11 +2073,17 @@ static void _parse_relay(xmlDocPtr doc,
} else if (strcmp(tmp, "default") == 0) { } else if (strcmp(tmp, "default") == 0) {
_parse_relay_upstream(doc, node->xmlChildrenNode, &(relay->upstream_default), configuration); _parse_relay_upstream(doc, node->xmlChildrenNode, &(relay->upstream_default), configuration);
} else { } else {
__found_bad_tag(configuration, node, BTR_INVALID, tmp);
ICECAST_LOG_WARN("<upstream> of unknown type is ignored."); ICECAST_LOG_WARN("<upstream> of unknown type is ignored.");
} }
if (tmp) if (tmp)
xmlFree(tmp); xmlFree(tmp);
} else if (xmlStrcmp(node->name, XMLSTR("server")) == 0 || xmlStrcmp(node->name, XMLSTR("port")) == 0 ||
xmlStrcmp(node->name, XMLSTR("mount")) == 0 || xmlStrcmp(node->name, XMLSTR("relay-shoutcast-metadata")) == 0 ||
xmlStrcmp(node->name, XMLSTR("username")) == 0 || xmlStrcmp(node->name, XMLSTR("password")) == 0 ||
xmlStrcmp(node->name, XMLSTR("bind")) == 0) {
__found_bad_tag(configuration, node, BTR_OBSOLETE, "Use a <upstream type=\"default\"> block.");
} else { } else {
__found_bad_tag(configuration, node, BTR_UNKNOWN, NULL); __found_bad_tag(configuration, node, BTR_UNKNOWN, NULL);
} }