1
0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-11-03 04:17:17 -05:00

make sure we report the correct port for m3u and YP when not using the default port

svn path=/icecast/trunk/icecast/; revision=14318
This commit is contained in:
Karl Heyes 2007-12-20 16:36:37 +00:00
parent eba4314724
commit 6bcbb416b9

View File

@ -358,7 +358,6 @@ static void _set_defaults(ice_config_t *configuration)
configuration->dir_list = NULL; configuration->dir_list = NULL;
configuration->hostname = (char *)xmlCharStrdup (CONFIG_DEFAULT_HOSTNAME); configuration->hostname = (char *)xmlCharStrdup (CONFIG_DEFAULT_HOSTNAME);
configuration->mimetypes_fn = (char *)xmlCharStrdup (MIMETYPESFILE); configuration->mimetypes_fn = (char *)xmlCharStrdup (MIMETYPESFILE);
configuration->port = 8000;
configuration->master_server = NULL; configuration->master_server = NULL;
configuration->master_server_port = 0; configuration->master_server_port = 0;
configuration->master_update_interval = CONFIG_MASTER_UPDATE_INTERVAL; configuration->master_update_interval = CONFIG_MASTER_UPDATE_INTERVAL;
@ -491,6 +490,8 @@ static void _parse_root(xmlDocPtr doc, xmlNodePtr node,
configuration->listen_sock = config_clear_listener (configuration->listen_sock); configuration->listen_sock = config_clear_listener (configuration->listen_sock);
configuration->listen_sock_count--; configuration->listen_sock_count--;
} }
if (configuration->port == 0)
configuration->port = 8000;
} }
static void _parse_limits(xmlDocPtr doc, xmlNodePtr node, static void _parse_limits(xmlDocPtr doc, xmlNodePtr node,