[xiph-commits] r14318 - icecast/trunk/icecast/src

[karl at svn.xiph.org]

Author: karl
Date: 2007-12-20 08:36:37 -0800 (Thu, 20 Dec 2007)
New Revision: 14318

Modified:
   icecast/trunk/icecast/src/cfgfile.c
Log:
make sure we report the correct port for m3u and YP when not using the default port


Modified: icecast/trunk/icecast/src/cfgfile.c
===================================================================
--- icecast/trunk/icecast/src/cfgfile.c	2007-12-19 22:45:48 UTC (rev 14317)
+++ icecast/trunk/icecast/src/cfgfile.c	2007-12-20 16:36:37 UTC (rev 14318)
@@ -358,7 +358,6 @@
     configuration->dir_list = NULL;
     configuration->hostname = (char *)xmlCharStrdup (CONFIG_DEFAULT_HOSTNAME);
     configuration->mimetypes_fn = (char *)xmlCharStrdup (MIMETYPESFILE);
-    configuration->port = 8000;
     configuration->master_server = NULL;
     configuration->master_server_port = 0;
     configuration->master_update_interval = CONFIG_MASTER_UPDATE_INTERVAL;
@@ -491,6 +490,8 @@
         configuration->listen_sock = config_clear_listener (configuration->listen_sock);
         configuration->listen_sock_count--;
     }
+    if (configuration->port == 0)
+        configuration->port = 8000;
 }
 
 static void _parse_limits(xmlDocPtr doc, xmlNodePtr node,