[xiph-commits] r9293 - in icecast/branches/kh/icecast: . src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-05-19 08:00:02 -0700 (Thu, 19 May 2005)
New Revision: 9293

Modified:
   icecast/branches/kh/icecast/NEWS
   icecast/branches/kh/icecast/configure.in
   icecast/branches/kh/icecast/src/auth.c
   icecast/branches/kh/icecast/src/slave.c
   icecast/branches/kh/icecast/src/source.c
   icecast/branches/kh/icecast/src/util.c
Log:
a small update and bump version


Modified: icecast/branches/kh/icecast/NEWS
===================================================================
--- icecast/branches/kh/icecast/NEWS	2005-05-19 00:20:28 UTC (rev 9292)
+++ icecast/branches/kh/icecast/NEWS	2005-05-19 15:00:02 UTC (rev 9293)
@@ -3,9 +3,7 @@
 . program invocation at stream start and end, per mount based.
 . on-demand relays, activated on first listener, disconnected when listeners 
   falls to 0. Available for master relays as well.
-. multiple Ogg codec streaming. Current codecs handled are Theora, Vorbis,
-  Speex (Writ to be added back in later).
-. Added URL and command based listener authentication
+. Added URL and command based listener authentication, applies to files as well
 . server xml reload, and reopen logging available via admin url
 . on xml reload, active sources are updated as well
 . When max-listeners reached, a HTTP 302 code can be sent to redirect
@@ -13,7 +11,6 @@
 . authenticated relays, those that match the relay user/pass, bypass the 
   max-listener check
 . per-mount format-specific settings can be stated in mount
-. mp3 metadata interval can be stated/disabled per mount
 . added file intro to streams
 . fallback to file
 
@@ -23,6 +20,17 @@
 . get feedback from people on listener auth via url, Stephen Nixon has done
   some auth scripts that people can use at http://imux.net/icecast/
 
+2.2-kh6
+. sync up with trunk merges
+. various internal updates
+  - better handling of per-mount stream settings
+  - better updating of stats
+  - removed unnecessary code
+. relay username is 'relay' by default
+. shoutcast clients can use per-mount password
+. split client write into client write and advance buffer
+. source IP stat added for relays/source clients
+
 2.2-kh5
 . Added total read and sent stats for each mount.
 . Added start time for server and each mount

Modified: icecast/branches/kh/icecast/configure.in
===================================================================
--- icecast/branches/kh/icecast/configure.in	2005-05-19 00:20:28 UTC (rev 9292)
+++ icecast/branches/kh/icecast/configure.in	2005-05-19 15:00:02 UTC (rev 9293)
@@ -1,4 +1,4 @@
-AC_INIT([Icecast], [2.2-kh5], [karl at xiph.org])
+AC_INIT([Icecast], [2.2-kh6], [karl at xiph.org])
 
 AC_PREREQ(2.54)
 AC_CONFIG_SRCDIR(src/main.c)

Modified: icecast/branches/kh/icecast/src/auth.c
===================================================================
--- icecast/branches/kh/icecast/src/auth.c	2005-05-19 00:20:28 UTC (rev 9292)
+++ icecast/branches/kh/icecast/src/auth.c	2005-05-19 15:00:02 UTC (rev 9293)
@@ -258,7 +258,6 @@
         /* enable on-demand relay to start, wake up the slave thread */
         DEBUG0("kicking off on-demand relay");
         source->on_demand_req = 1;
-        // slave_rebuild_mounts();
         slave_rescan ();
     }
     DEBUG1 ("Added client to pending on %s", source->mount);

Modified: icecast/branches/kh/icecast/src/slave.c
===================================================================
--- icecast/branches/kh/icecast/src/slave.c	2005-05-19 00:20:28 UTC (rev 9292)
+++ icecast/branches/kh/icecast/src/slave.c	2005-05-19 15:00:02 UTC (rev 9293)
@@ -311,6 +311,7 @@
         }
         stats_event_inc(NULL, "source_relay_connections");
         stats_event (relay->localmount, "listeners", "0");
+        stats_event (relay->localmount, "source_ip", relay->server);
 
         source_main (relay->source);
 
@@ -318,6 +319,7 @@
         {
             /* only keep refreshing YP entries for inactive on-demand relays */
             yp_remove (relay->localmount);
+            relay->source->yp_public = -1;
         }
         /* initiate an immediate relay cleanup run */
         relay->cleanup = 1;

Modified: icecast/branches/kh/icecast/src/source.c
===================================================================
--- icecast/branches/kh/icecast/src/source.c	2005-05-19 00:20:28 UTC (rev 9292)
+++ icecast/branches/kh/icecast/src/source.c	2005-05-19 15:00:02 UTC (rev 9293)
@@ -1280,6 +1280,7 @@
     }
     stats_event_inc(NULL, "source_client_connections");
     stats_event (source->mount, "listeners", "0");
+    stats_event (source->mount, "source_ip", source->client->con->ip);
     source_main (source);
     source_free_source (source);
 

Modified: icecast/branches/kh/icecast/src/util.c
===================================================================
--- icecast/branches/kh/icecast/src/util.c	2005-05-19 00:20:28 UTC (rev 9292)
+++ icecast/branches/kh/icecast/src/util.c	2005-05-19 15:00:02 UTC (rev 9293)
@@ -654,15 +654,15 @@
 struct rate_calc *rate_setup (unsigned int seconds)
 {
     struct rate_calc *calc = calloc (1, sizeof (struct rate_calc));
-    struct rate_calc_node *start;
-    int i;
+    struct rate_calc_node *start = NULL;
+    unsigned int i;
 
     if (calc == NULL || seconds == 0)
     {
         free (calc);
         return NULL;
     }
-    for (i=0 ; i <seconds; i++)
+    for (i=0 ; i<seconds; i++)
     {
         struct rate_calc_node *node = calloc (1, sizeof (*node));
         if (calc->current)