[xiph-commits] r9328 - icecast/branches/kh/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-05-30 14:01:49 -0700 (Mon, 30 May 2005)
New Revision: 9328

Modified:
   icecast/branches/kh/icecast/src/source.c
Log:
oops, moving clients broke, they became flagged for disconnection


Modified: icecast/branches/kh/icecast/src/source.c
===================================================================
--- icecast/branches/kh/icecast/src/source.c	2005-05-30 16:49:41 UTC (rev 9327)
+++ icecast/branches/kh/icecast/src/source.c	2005-05-30 21:01:49 UTC (rev 9328)
@@ -617,6 +617,7 @@
     {
         INFO2 ("Client %lu (%s) has fallen too far behind, removing",
                 client->con->id, client->con->ip);
+        stats_event_inc (source->mount, "slow_listeners");
         client->con->error = 1;
         ret = 1;
     }
@@ -699,8 +700,8 @@
         /*  trap from when clients have been moved */
         if (to_go->write_to_client == NULL)
         {
-            ERROR0 ("client was no write function");
-            client->con->error = 1;
+            to_go->write_to_client = source->format->write_buf_to_client;
+            to_go->check_buffer = format_advance_queue;
         }
 
         to_go->next = source->active_clients;
@@ -749,6 +750,7 @@
     source->listeners = 0;
     stats_event_inc (NULL, "sources");
     stats_event_inc (NULL, "source_total_connections");
+    stats_event (source->mount, "slow_listeners", "0");
 
     if (source->client->con)
         sock_set_blocking (source->client->con->sock, SOCK_NONBLOCK);