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

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-06-04 06:48:30 -0700 (Sat, 04 Jun 2005)
New Revision: 9348

Modified:
   icecast/branches/kh/icecast/src/auth.c
   icecast/branches/kh/icecast/src/format_mp3.c
   icecast/branches/kh/icecast/src/global.c
   icecast/branches/kh/icecast/src/stats.c
Log:
oops, missed a ; from previous patchr. fix wrong time at start, and add
stat for server-wide accumulated listeners


Modified: icecast/branches/kh/icecast/src/auth.c
===================================================================
--- icecast/branches/kh/icecast/src/auth.c	2005-06-04 13:22:47 UTC (rev 9347)
+++ icecast/branches/kh/icecast/src/auth.c	2005-06-04 13:48:30 UTC (rev 9348)
@@ -236,6 +236,7 @@
     client->next = source->active_clients;
     source->active_clients = client;
     source->listeners++;
+    stats_event_inc (NULL, "listener_connections");
 
     client->write_to_client = format_generic_write_to_client;
     client->check_buffer = format_check_http_buffer;

Modified: icecast/branches/kh/icecast/src/format_mp3.c
===================================================================
--- icecast/branches/kh/icecast/src/format_mp3.c	2005-06-04 13:22:47 UTC (rev 9347)
+++ icecast/branches/kh/icecast/src/format_mp3.c	2005-06-04 13:48:30 UTC (rev 9348)
@@ -102,8 +102,7 @@
     /* initial metadata needs to be blank for sending to clients and for
        comparing with new metadata */
     meta = refbuf_new (17);
-    memcpy (meta->data, "\001StreamTitle=''", 17);
-    meta->len = 17;
+    memcpy (meta->data, "\001StreamTitle='';", 17);
     state->metadata = meta;
     state->interval = -1;
 

Modified: icecast/branches/kh/icecast/src/global.c
===================================================================
--- icecast/branches/kh/icecast/src/global.c	2005-06-04 13:22:47 UTC (rev 9347)
+++ icecast/branches/kh/icecast/src/global.c	2005-06-04 13:48:30 UTC (rev 9348)
@@ -42,6 +42,7 @@
     global.running = 0;
     global.clients = 0;
     global.sources = 0;
+    global.time = time(NULL);
     global.source_tree = avl_tree_new(source_compare_sources, NULL);
     thread_mutex_create("global", &_global_mutex);
 }

Modified: icecast/branches/kh/icecast/src/stats.c
===================================================================
--- icecast/branches/kh/icecast/src/stats.c	2005-06-04 13:22:47 UTC (rev 9347)
+++ icecast/branches/kh/icecast/src/stats.c	2005-06-04 13:48:30 UTC (rev 9348)
@@ -559,6 +559,7 @@
     stats_event (NULL, "source_relay_connections", "0");
     stats_event (NULL, "source_total_connections", "0");
     stats_event (NULL, "stats_connections", "0");
+    stats_event (NULL, "listener_connections", "0");
 
     INFO0 ("stats thread started");
     while (_stats_running) {