[xiph-commits] r9781 - in icecast/branches/kh/icecast: conf doc src

[karl at svn.xiph.org]

Author: karl
Date: 2005-08-20 10:13:58 -0700 (Sat, 20 Aug 2005)
New Revision: 9781

Modified:
   icecast/branches/kh/icecast/conf/icecast.xml.in
   icecast/branches/kh/icecast/doc/icecast2_config_file.html
   icecast/branches/kh/icecast/src/auth.c
   icecast/branches/kh/icecast/src/cfgfile.c
   icecast/branches/kh/icecast/src/cfgfile.h
Log:
small name change to previous patch


Modified: icecast/branches/kh/icecast/conf/icecast.xml.in
===================================================================
--- icecast/branches/kh/icecast/conf/icecast.xml.in	2005-08-20 08:36:20 UTC (rev 9780)
+++ icecast/branches/kh/icecast/conf/icecast.xml.in	2005-08-20 17:13:58 UTC (rev 9781)
@@ -104,6 +104,7 @@
         <fallback-override>1</fallback-override>
         <fallback-when-full>1</fallback-when-full>
         <intro>/path/to/stream-intro.ogg</intro>
+        <max-listener-duration>3600</max-listener-duration>
         <hidden>1</hidden>
         <authentication type="htpasswd">
                 <option name="filename" value="myauth"/>

Modified: icecast/branches/kh/icecast/doc/icecast2_config_file.html
===================================================================
--- icecast/branches/kh/icecast/doc/icecast2_config_file.html	2005-08-20 08:36:20 UTC (rev 9780)
+++ icecast/branches/kh/icecast/doc/icecast2_config_file.html	2005-08-20 17:13:58 UTC (rev 9781)
@@ -433,7 +433,7 @@
 <div class="indentedbox">
 An optional value which will set the maximum number of listeners that can be attached to this mountpoint.
 </div>
-<h4>listening-duration</h4>
+<h4>max-listener-duration</h4>
 <div class="indentedbox">
     An optional value which will set the length of time a listener will stay connected to the
     stream. An auth component may override this.

Modified: icecast/branches/kh/icecast/src/auth.c
===================================================================
--- icecast/branches/kh/icecast/src/auth.c	2005-08-20 08:36:20 UTC (rev 9780)
+++ icecast/branches/kh/icecast/src/auth.c	2005-08-20 17:13:58 UTC (rev 9781)
@@ -312,8 +312,8 @@
             return -1;
         }
         /* set a per-mount disconnect time if auth hasn't set one already */
-        if (mountinfo->listening_duration && client->con->discon_time == 0)
-            client->con->discon_time = time(NULL) + mountinfo->listening_duration;
+        if (mountinfo->max_listener_duration && client->con->discon_time == 0)
+            client->con->discon_time = time(NULL) + mountinfo->max_listener_duration;
 
         ret = add_client_to_source (source, client);
         avl_tree_unlock (global.source_tree);

Modified: icecast/branches/kh/icecast/src/cfgfile.c
===================================================================
--- icecast/branches/kh/icecast/src/cfgfile.c	2005-08-20 08:36:20 UTC (rev 9780)
+++ icecast/branches/kh/icecast/src/cfgfile.c	2005-08-20 17:13:58 UTC (rev 9781)
@@ -629,9 +629,9 @@
             mount->on_disconnect = (char *)xmlNodeListGetString(
                     doc, node->xmlChildrenNode, 1);
         }
-        else if (strcmp(node->name, "listening-duration") == 0) {
+        else if (strcmp(node->name, "max-listener-duration") == 0) {
             tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
-            mount->listening_duration = atoi(tmp);
+            mount->max_listener_duration = atoi(tmp);
             if(tmp) xmlFree(tmp);
         }
         else if (strcmp(node->name, "queue-size") == 0) {

Modified: icecast/branches/kh/icecast/src/cfgfile.h
===================================================================
--- icecast/branches/kh/icecast/src/cfgfile.h	2005-08-20 08:36:20 UTC (rev 9780)
+++ icecast/branches/kh/icecast/src/cfgfile.h	2005-08-20 17:13:58 UTC (rev 9781)
@@ -72,7 +72,7 @@
     config_options_t *auth_options; /* Options for this type */
     char *on_connect;
     char *on_disconnect;
-    unsigned int listening_duration;
+    unsigned int max_listener_duration;
 
     char *stream_name;
     char *stream_description;