aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-06-23 06:25:24 +00:00
Code
601 Commits 49 Branches 25 Tags 8.4 MiB
15016583ab
Commit Graph

87 Commits

Author SHA1 Message Date
Karl Heyes
9c44a7d184 merged singleq branch 7177:7591 
svn path=/icecast/trunk/icecast/; revision=7592
 2004-08-20 15:13:59 +00:00
Karl Heyes
94d24f406e cleanup patch, push per client write error trap lower down 
svn path=/icecast/trunk/icecast/; revision=7165
 2004-07-16 15:47:12 +00:00
giles
d6d634ac02 Recommit of changes lost in the server migration 
Original commit (r6810) 2004-06-04 03:15:36 -0400 (Fri, 04 Jun 2004) by msmith.

Fix #526. Fallbacks weren't being found when the primary was disconnected (for
newly-connecting clients).

svn path=/icecast/trunk/icecast/; revision=6810
 2004-06-06 03:08:19 +00:00
Karl Heyes
55ba59f3f7 Update of the YP code. This should resolve several YP issues that 
have been reported, the main one being icecast instability when
there is a YP server outage.


svn path=/icecast/trunk/icecast/; revision=6646
 2004-05-10 16:17:56 +00:00
oddsock
d642846c80 added web based interface to htpasswd client authentication 
svn path=/icecast/trunk/icecast/; revision=6610
 2004-04-30 14:36:07 +00:00
oddsock
32718b5b4e new feature in icecast : burst-on-connect - allows an initial burst of data to connecting listeners, thus reducing the startup time of a stream. 
svn path=/icecast/trunk/icecast/; revision=6606
 2004-04-29 15:23:13 +00:00
oddsock
89f9f38d78 added HAVE_LOCALTIME_R to project file 
added #define for snprintf (win32 requires _snprintf)

svn path=/icecast/trunk/icecast/; revision=6594
 2004-04-25 23:28:36 +00:00
Michael Smith
5323b27c95 Couple of minor contributed patches. 
- Solaris/autoconf nanosleep checking
- use time_t as appropriate for yp

svn path=/trunk/icecast/; revision=5921
 2004-03-09 02:36:01 +00:00
Karl Heyes
a255c92b5f update move clients code, small cleanups in other places 
svn path=/trunk/icecast/; revision=5869
 2004-02-27 15:15:40 +00:00
Karl Heyes
9916341436 separate source initialisation, and collect the YP setup code into one area 
svn path=/trunk/icecast/; revision=5868
 2004-02-26 16:51:43 +00:00
Karl Heyes
aff756a4c7 Add per mount queue size and source timeout, which can override the 
general settings.

svn path=/trunk/icecast/; revision=5867
 2004-02-26 11:56:48 +00:00
Karl Heyes
7371d0ab21 move the source client '200 OK' response to the source client specific part 
of the source thread, and rearrange stats around that

svn path=/trunk/icecast/; revision=5862
 2004-02-25 16:24:30 +00:00
Karl Heyes
176804e436 Add accumulative stats back for source connections and don't hold locks 
while writing responses back to the client.

svn path=/trunk/icecast/; revision=5853
 2004-02-20 17:42:57 +00:00
Karl Heyes
466a5cb60c Make source client connections reserve the source mountpoint and get rid 
of the unused source setup code.

svn path=/trunk/icecast/; revision=5846
 2004-02-19 21:16:59 +00:00
Karl Heyes
ae825afd3e Make the slave thread reserve relay mountpoints, and prevent reconnection 
when a relay is currently active.

svn path=/trunk/icecast/; revision=5845
 2004-02-19 20:28:21 +00:00
Karl Heyes
a83553ad8f functions to allow for reserving a source_t with a mountpoint 
svn path=/trunk/icecast/; revision=5844
 2004-02-19 16:32:26 +00:00
Karl Heyes
ebf6603c07 small YP memory cleanup 
svn path=/trunk/icecast/; revision=5842
 2004-02-19 14:48:31 +00:00
Karl Heyes
66082000b4 minor cleanup 
svn path=/trunk/icecast/; revision=5834
 2004-02-17 15:46:05 +00:00
Karl Heyes
2accfe55e5 fix possible bad pointer reference when finding fallback mount 
svn path=/trunk/icecast/; revision=5830
 2004-02-17 00:09:14 +00:00
Karl Heyes
012b3f4246 YP related cleanup, avoid bad pointer reference on HUP 
svn path=/trunk/icecast/; revision=5829
 2004-02-16 21:59:08 +00:00
Karl Heyes
c90fb2ea55 cleanup duplicate work, fix rare but potential deadlock, and 
fix silly bug introduced ealrier

svn path=/trunk/icecast/; revision=5794
 2004-01-29 16:46:54 +00:00
Michael Smith
0aad6d849c Add Copyright notice to each source file, as requested by debian. 
svn path=/trunk/httpp/; revision=5792
 2004-01-29 01:02:12 +00:00
oddsock
610a2c022a fixed small bug where if using fallbacks and the main mount was not connected, icecast was not connecting client to the fallback mount. 
svn path=/trunk/icecast/; revision=5780
 2004-01-21 15:19:48 +00:00
oddsock
8a78baa149 - properly initialize the authorizer structure, otherwise by default it is enabled 
- add new element (listenurl) to the stats for use in things like java player applets

svn path=/trunk/icecast/; revision=5763
 2004-01-15 15:37:25 +00:00
Michael Smith
57dd5f71a5 Client authentication added. 
Melanie's multilevel fallbacks added (after major changes).

svn path=/trunk/icecast/; revision=5760
 2004-01-15 01:01:09 +00:00
Karl Heyes
1e7316b4b2 failure case, keep the source count in sync with the number of sources 
running, locking for shutdown was also affected.

svn path=/trunk/icecast/; revision=5700
 2003-12-17 22:54:43 +00:00
Karl Heyes
25dcbd976d fix segv when fallback or dumpfilename are not specified 
svn path=/trunk/icecast/; revision=5675
 2003-12-02 01:11:12 +00:00
Karl Heyes
b795bb58dc cleanup bad pointer access after config re-read 
svn path=/trunk/icecast/; revision=5673
 2003-12-01 17:18:37 +00:00
Karl Heyes
69de4ea61e minor fixes. autoconf/make init clenaup, missing includes added and 
compiler warnings removed

svn path=/trunk/icecast/; revision=5173
 2003-07-24 16:21:22 +00:00
Karl Heyes
43953202a2 refer to cfgfile.h instead of config.h for icecast.xml, and use config.h 
for autoconf

svn path=/trunk/icecast/; revision=5156
 2003-07-21 01:58:54 +00:00
Karl Heyes
508d25641d avoid header namespace clashes 
svn path=/trunk/icecast/; revision=5146
 2003-07-16 19:41:59 +00:00
Karl Heyes
142c1b0609 don't terminate stream when debugging 
svn path=/trunk/icecast/; revision=5127
 2003-07-11 19:03:30 +00:00
oddsock
78e3977e2d unused variable 
svn path=/trunk/icecast/; revision=5104
 2003-07-08 14:11:32 +00:00
oddsock
303c11197f - moved add_yp_info into yp.c 
- most of the yp processing now moved into the yp add/touch thread
- use ice/icy-public rather than ice/icy-private to coorespond to libshout and general convention
- memory leak fixed with audio-info

svn path=/trunk/icecast/; revision=5009
 2003-06-26 13:32:04 +00:00
brendan
494f8fc2b6 Fix curl version test. 
YP is enabled by default but automatically turned off if the curl test fails
(unless --enable-yp is explicitly passed to configure, in which case configure
will fail if the curl test fails).

svn path=/trunk/icecast/; revision=4831
 2003-05-28 15:04:53 +00:00
oddsock
27c0af2b1d infrastructure for new web-based admin interface 
new config option <adminroot>

restructured code a bit in admin.c for a bit better extendability

svn path=/trunk/icecast/; revision=4708
 2003-05-15 21:03:32 +00:00
oddsock
0a1ba85795 printf to stdout not valid with our win32 binary, so lets now use something that will work on win32. note that these should only be used up to the point at which logging is started, then everything should go there. 
also added a new stat to represent what is currently being sent to the yp server as "what's playing"

svn path=/trunk/icecast/; revision=4613
 2003-04-17 03:23:18 +00:00
oddsock
2c2576ed4e - fixed alot of yp logic. timeouts now work properly so the tolerance of 
the unavailability of yp servers is much much better now.

- new icecast config option <yp-url-timeout> to specify the timeout

- url encoding is now fixed so that the yp data is formatted much nicer (and is correct :))

- added url encoding for some fields that were not url-encoded

- modified util_dict_urlencode() to not url-encode the key (still does the value)

- new curl option (CURLOPT_NOSIGNAL) which prevents curl from using signals when
  timeouts are hit.  This new option needs curl 7.10 at least.

svn path=/trunk/icecast/; revision=4603
 2003-04-11 03:00:24 +00:00
Michael Smith
81cd2d50f5 Implement killsource admin command, to kill sources. Doesn't always do much, 
ices (as an example) will auto-reconnect.

svn path=/trunk/icecast/; revision=4571
 2003-03-31 12:54:44 +00:00
Michael Smith
ed019c0cd6 Remove locking from refbuf: we used a single global lock for all of them, which 
caused significant lock contention with many sources. Further, a single refbuf
is never used by more than one source (and hence one thread), so the locking
was unneeded.

Fix a nasty bug in source.c:_compare_clients() - was casting a void pointer
to the wrong type, and hence all the tree-maintaince comparisons were totally
wrong (but due to the exact nature of the bug this wasn't causing any active
problems until...)

Add another admin command to kill a client - remove it using an id. Note that
many clients will do auto-reconnect, so this may not be sufficient on its own,
we might need a ban (possibly temporary) function.

svn path=/trunk/icecast/; revision=4569
 2003-03-30 13:52:27 +00:00
brendan
8651aabcbb First crack at making YP/curl optional. 
svn path=/trunk/icecast/; revision=4552
 2003-03-27 17:10:14 +00:00
Michael Smith
ca6a611be4 Fix ordering of some calls in source shutdown, silly bug. 
Remove wrong comment.

svn path=/trunk/icecast/; revision=4513
 2003-03-19 07:59:32 +00:00
Michael Smith
35e22a005a Fix lack of null terminator in audio info/stats stuff. 
svn path=/trunk/icecast/; revision=4512
 2003-03-19 07:55:42 +00:00
Michael Smith
3b2df1d0d9 Brendan was getting pissed off about inconsistent indentation styles. 
Convert all tabs to 4 spaces. All code must now use 4 space indents.

svn path=/trunk/avl/; revision=4492
 2003-03-15 02:10:19 +00:00
Michael Smith
bd9c2383c5 Bugfix: source shutdown did things in the wrong order, could lead to clients 
ending up connecting to a source which didn't exist.

Add 'moveclients' admin command to move all clients from one source to
another (without shutting the old source down)

svn path=/trunk/icecast/; revision=4489
 2003-03-14 07:59:58 +00:00
Michael Smith
a79f0b6cae Split admin stuff out into a seperate file, add various utility functions there. 
rename util_url_escape to util_url_unescape, and write a util_escape function
that actually DOES escape things. Fix all the callers of the function to call
the correct one of these two.

svn path=/trunk/icecast/; revision=4414
 2003-03-06 14:17:33 +00:00
Michael Smith
d13ebde7a3 Allow rereading config files. 
Lots of new locking happening so that it's safe to have the config file
disappear under the rest of the program

Does NOT affect currently-running sources at the moment

svn path=/trunk/icecast/; revision=4406
 2003-03-05 13:03:35 +00:00
Michael Smith
5252a14068 Fix various minor bugs in per-mountpoint configs. 
svn path=/trunk/icecast/; revision=4385
 2003-03-02 10:36:24 +00:00
Michael Smith
c359faf1de More features: 
-- per mountpoint listener maxima
  -- static configuration of mountpoint fallbacks
  -- stream dumping (write incoming stream to disk)

Fixed some warnings that other people introduced.

svn path=/trunk/icecast/; revision=4383
 2003-03-02 10:13:59 +00:00
oddsock
ce167cc6bb whoops...stats can't have spaces in them, since XML can't have spaces in the tags 
also, handle case where a client sends a bad ice-audio-info string (variable but no value)

svn path=/trunk/icecast/; revision=4380
 2003-02-27 03:01:12 +00:00