[xiph-cvs] cvs commit: icecast/src config.c connection.c source.c

[Michael Smith]

msmith      03/03/02 05:36:24

  Modified:    src      config.c connection.c source.c
  Log:
  Fix various minor bugs in per-mountpoint configs.

Revision  Changes    Path
1.28      +2 -0      icecast/src/config.c

Index: config.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/config.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- config.c	24 Feb 2003 13:37:15 -0000	1.27
+++ config.c	2 Mar 2003 10:36:24 -0000	1.28
@@ -361,6 +361,8 @@
     else
         _configuration.mounts = mount;
 
+    mount->max_listeners = -1;
+
         do {
                 if (node == NULL) break;
                 if (xmlIsBlankNode(node)) continue;

<p><p>1.56      +4 -3      icecast/src/connection.c

Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- connection.c	2 Mar 2003 10:13:59 -0000	1.55
+++ connection.c	2 Mar 2003 10:36:24 -0000	1.56
@@ -434,8 +434,10 @@
     mount_proxy *mountinfo = config_get_config()->mounts;
     while(mountinfo) {
         if(!strcmp(mountinfo->mountname, mount)) {
-            pass = mountinfo->password;
-            user = mountinfo->username;
+            if(mountinfo->password)
+                pass = mountinfo->password;
+            if(mountinfo->username)
+                user = mountinfo->username;
             break;
         }
         mountinfo = mountinfo->next;
@@ -803,7 +805,6 @@
             return;
         }
                 global.clients++;
-        source->listeners++;
                 global_unlock();
                                                 
         client->format_data = source->format->create_client_data(

<p><p>1.40      +1 -0      icecast/src/source.c

Index: source.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- source.c	2 Mar 2003 10:13:59 -0000	1.39
+++ source.c	2 Mar 2003 10:36:24 -0000	1.40
@@ -74,6 +74,7 @@
     src->running = 1;
         src->num_yp_directories = 0;
         src->listeners = 0;
+    src->max_listeners = -1;
     src->send_return = 0;
     src->dumpfilename = NULL;
     src->dumpfile = NULL;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.