aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-09-22 04:15:54 -04:00
Code
2,306 Commits 49 Branches 25 Tags 7.7 MiB
master
Commit Graph

289 Commits

Author SHA1 Message Date
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
6d969934f5 Add checks for whether a source is active 
svn path=/trunk/icecast/; revision=5843
 2004-02-19 15:24:06 +00:00
Karl Heyes
d7dc5d327c minor cleanup 
svn path=/trunk/icecast/; revision=5795
 2004-01-29 23:23:53 +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
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
oddsock
e8a61ce5d3 fixed master-slave relaying... 
* slaves now ask for /admin/streamlist.txt which serves a plaintext version of the source list (this is what it was expecting to get)
* /admin/streamlist still serves XML (which slave.c wasn't expecting)
* fixed a few cases of pointer invalidation due to possible config re-reading.
* slave relay now uses relay password to get the list of streams to relay

svn path=/trunk/icecast/; revision=5695
 2003-12-12 23:06:44 +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
0c6493aa6d place the config reread flag in the global structure 
svn path=/trunk/icecast/; revision=5175
 2003-07-25 14:29:33 +00:00
Karl Heyes
9482db6016 avoid hitting the mutex's in the signal handler, we could block, which is 
not something we want to do. Some mutex implementations are signal based.

svn path=/trunk/icecast/; revision=5174
 2003-07-24 23:45:29 +00:00
Karl Heyes
8654a18f72 minor cleanups 
svn path=/trunk/icecast/; revision=5168
 2003-07-23 00:27:10 +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
brendan
004152cf7a Write a newline after the m3u entry (patch by Paul Bryan). 
svn path=/trunk/icecast/; revision=5067
 2003-07-05 06:36:16 +00:00
Karl Heyes
f2e1bc2419 handle error returned from listening sockets, can cause busy looping 
svn path=/trunk/icecast/; revision=4986
 2003-06-20 18:50:24 +00:00
oddsock
a8d602fe33 fixed check for regular file type in win32-specific code 
svn path=/trunk/icecast/; revision=4879
 2003-06-05 04:15:58 +00:00
oddsock
8f84c0188a some win32-isms 
and a bad free that valgrind yelled at me about

svn path=/trunk/icecast/; revision=4711
 2003-05-15 23:19:57 +00:00
Michael Smith
8527ed7b43 Implementation of aliases contributed by Paul Donohue <icecast@TopQuark.net> 
svn path=/trunk/icecast/; revision=4629
 2003-04-23 12:44:29 +00:00
Michael Smith
5c5155b8d9 Only consider a path a candidate for file-serving if it exists AND is a normal 
file (not a directory, etc.)

svn path=/trunk/icecast/; revision=4616
 2003-04-18 14:59:26 +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
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
brendan
1198cbb982 Typo (no sleeping between select()s waiting for connections) 
svn path=/trunk/icecast/; revision=4478
 2003-03-12 05:40:45 +00:00
Michael Smith
596922217b Fix relay stream listing. Remove seperate relay password, there's no 
need for it.

svn path=/trunk/icecast/; revision=4464
 2003-03-10 22:20:16 +00:00
Michael Smith
eba22526aa Support listening on multiple sockets. 
svn path=/trunk/icecast/; revision=4454
 2003-03-09 11:27:06 +00:00
Michael Smith
a3716577ec Check the right variable for password in icy logins 
svn path=/trunk/icecast/; revision=4447
 2003-03-08 05:38:52 +00:00
Michael Smith
e921a67bd1 create /icy_0 (and incrementing numbers) for incoming icy protocol connections 
if the / mountpoint is taken

svn path=/trunk/icecast/; revision=4445
 2003-03-08 05:02:13 +00:00
Michael Smith
b2b618c62f Added support for shoutcast login protocol (ewww...) 
svn path=/trunk/httpp/; revision=4444
 2003-03-08 04:57:02 +00:00
Michael Smith
f8783aedac Check admin password against the correct username 
svn path=/trunk/icecast/; revision=4416
 2003-03-06 14:46:33 +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
Michael Smith
5019130d27 Max queue length for clients is now 
a) based on total bytes in queue, not total number of buffers in queue
    b) configurable (defaults to 100 kB)

mp3 metadata relaying (inline). Untested.

svn path=/trunk/icecast/; revision=4364
 2003-02-24 13:37:15 +00:00
Michael Smith
8c14c0e0db Oops. Very broken password checking, fix from Karl Heyes. 
svn path=/trunk/icecast/; revision=4358
 2003-02-20 22:18:24 +00:00
Michael Smith
83b41e2beb Fix previous changes to source creation - misunderstood requirements for 
unlocking rwlocks. Move more checks and some other logic into source.c

svn path=/trunk/icecast/; revision=4354
 2003-02-17 13:01:37 +00:00
Michael Smith
76fc62810e Fix a serious bug with source creation in relays when local-mount != mount, 
and fix a series of locking bugs in source creation.

svn path=/trunk/icecast/; revision=4352
 2003-02-17 11:56:12 +00:00
Michael Smith
1644a6f718 Fix incorrect use of enum that was leading to crashes on source connect for 
unknown mimetype.

svn path=/trunk/icecast/; revision=4344
 2003-02-14 10:31:21 +00:00
Michael Smith
b6c18398cd Better IPv6 support. Hopefully logging will work correctly now. 
However, some things still won't work, notably relaying (the relay can be
ipv6, the server being relayed _from_ may not be).
I'll fix that some time soon.

svn path=/trunk/icecast/; revision=4342
 2003-02-13 11:29:07 +00:00
Michael Smith
38e3bfb88f Increase buffer size for IPs so that logging works better for v6 clients. 
svn path=/trunk/icecast/; revision=4341
 2003-02-12 22:50:59 +00:00
Michael Smith
9acef4801e Per mountpoint usernames, passwords, and some infrastructure for other 
per-mountpoint configuration (some of these are given as examples in
the config file, but they aren't yet used).

svn path=/trunk/icecast/; revision=4338
 2003-02-11 14:23:34 +00:00
Michael Smith
248a0874a4 Grumble. Silly gcc. 
svn path=/trunk/icecast/; revision=4331
 2003-02-07 13:56:33 +00:00
Michael Smith
037789bc1a Add format detection workaround for icecast 1.x, which is buggy and doesn't 
send a content-type header.

svn path=/trunk/icecast/; revision=4329
 2003-02-07 11:56:40 +00:00
Michael Smith
9e168dc870 Lots of fixes for screwy code formatting, plus: 
make streams public by default, send ice-private: 1 to make them private.
However, default config file has yp servers commented out.

A little fix for compilation on some solaris systems

Redo some config file stuff: now all the passwords are inside an element
<authentication>, (though for now they're also accepted in the old location),
and added admin username and password. Move some of the admin activities over
to using the admin passwords (admin action that affect a mountpoint use the
source password)

Fill in some (but not yet all, maybe i'll do that later) of the infrastructure
for per-mountpoint passwords.

Fix lots of headers/code so that it works properly/portably  on non-win32
systems.

svn path=/trunk/icecast/; revision=4325
 2003-02-06 13:10:48 +00:00
oddsock
e07080a0d8 added references to geturl.h 
svn path=/trunk/icecast/; revision=4314
 2003-02-02 14:33:47 +00:00
Michael Smith
6f1f4072af Fix segfault if current source didn't exist on fallback mount request. 
svn path=/trunk/icecast/; revision=4292
 2003-01-23 11:12:54 +00:00
Michael Smith
1fb972cf89 And some more message fixes (this and the previous from alet@librelogiciel.com (Jerome Alet) 
svn path=/trunk/icecast/; revision=4262
 2003-01-18 07:39:29 +00:00
Michael Smith
6d4ef5e519 Fix a message that was talking about the wrong path 
svn path=/trunk/icecast/; revision=4261
 2003-01-18 07:38:18 +00:00
Michael Smith
f2d0e26fed Set TCP_NODELAY on sockets for streams and fileserving. 
Adapted from a patch sent by Richard Galli

svn path=/trunk/icecast/; revision=4260
 2003-01-18 07:08:00 +00:00
Michael Smith
11a1d83e1a New year's bonus feature: 
configurable fallbacks, now working.

svn path=/trunk/icecast/; revision=4192
 2002-12-31 07:49:34 +00:00
Michael Smith
ab8c8c6893 mp3 metadata complete. Still untested. 
svn path=/trunk/httpp/; revision=4191
 2002-12-31 06:28:39 +00:00
Michael Smith
5275ab34b9 Better file-serving, rationalisation of some paths 
svn path=/trunk/icecast/; revision=4181
 2002-12-30 15:42:38 +00:00
Michael Smith
40444f4178 mp3 metadata work (incomplete) 
svn path=/trunk/icecast/; revision=4177
 2002-12-30 07:55:56 +00:00
Michael Smith
5890aa4f4b Fix c++-ism that gcc didn't think to warn me about 
svn path=/trunk/icecast/; revision=4176
 2002-12-30 01:59:03 +00:00
Michael Smith
65c0bfbba5 Fix up types after thread type rename earlier. 
svn path=/trunk/icecast/; revision=4175
 2002-12-29 15:46:32 +00:00
Michael Smith
2e21e899c9 Minor incompatible change to relaying, to match actual protocol. 
svn path=/trunk/icecast/; revision=4169
 2002-12-29 09:21:32 +00:00
Michael Smith
b8e157d7d1 Add infrastructure for better/more flexible format support. Will be needed 
for mp3 metadata, for example.

svn path=/trunk/icecast/; revision=4167
 2002-12-29 08:10:10 +00:00
Michael Smith
89bf546ad1 Lots of bugfixes contributed by Karl Heyes. 
svn path=/trunk/icecast/; revision=4111
 2002-11-22 13:00:44 +00:00
Michael Smith
a6edc8f631 Allow icelogin to coexist with http login. icelogin is still deprecated, 
and now a warning is issued.

svn path=/trunk/icecast/; revision=3985
 2002-10-10 08:50:58 +00:00
Michael Smith
3c59c90e36 Fileserving that might actually work for > 1 user. 
cleanups for the base64 decoder.

svn path=/trunk/icecast/; revision=3856
 2002-08-18 08:49:25 +00:00
Michael Smith
8ce3dbb957 File serving, from the webroot. 
svn path=/trunk/icecast/; revision=3852
 2002-08-18 05:06:58 +00:00
Michael Smith
2aa432dc0f Use relay password (fallback to using source password if no relay-password 
is set)

svn path=/trunk/icecast/; revision=3850
 2002-08-17 08:32:15 +00:00
Michael Smith
f8250d8df0 Minor fixes for logging response codes correctly (hopefully) 
svn path=/trunk/icecast/; revision=3840
 2002-08-16 15:28:46 +00:00
Michael Smith
121720a4cc Fix relaying to work with new auth scheme. 
svn path=/trunk/icecast/; revision=3838
 2002-08-16 14:55:56 +00:00
Michael Smith
913ec3481a HTTP Basic source login support. The old "ice-password" method is still 
available, but is deprecated and turned off by default.

svn path=/trunk/icecast/; revision=3837
 2002-08-16 14:26:48 +00:00
Michael Smith
76ff92cb2f _handle_connection() cleanup, major restructuring. No feature changes. 
svn path=/trunk/icecast/; revision=3807
 2002-08-12 14:48:31 +00:00
Michael Smith
6e23c0f8fc Fix a bug in one of the error (404) responses. 
svn path=/trunk/icecast/; revision=3806
 2002-08-12 10:11:44 +00:00
Michael Smith
f349c3bf3e More path handling cleanups, and memory leak fixes. 
svn path=/trunk/icecast/; revision=3804
 2002-08-11 14:23:39 +00:00
Michael Smith
850cf995bf URI decoding and path normalisation pass one (stuff needed for fileserving 
later on)

svn path=/trunk/icecast/; revision=3803
 2002-08-11 14:00:56 +00:00
Michael Smith
84a76ac3ee status.xsl updates, better now. 
Automatically create .m3u responses for any existing streams.
If /stream.ogg exists, you can now request /stream.ogg.m3u in your browser.

svn path=/trunk/icecast/; revision=3797
 2002-08-10 08:01:56 +00:00
Michael Smith
5d06975c44 Various cleanups 
svn path=/trunk/icecast/; revision=3791
 2002-08-10 03:22:44 +00:00
Michael Smith
6357936028 Various cleanups for accounting of sent bytes. 
Crash bug in stats fixed.

svn path=/trunk/icecast/; revision=3779
 2002-08-09 14:15:08 +00:00
Michael Smith
8d75eb0b4a Logging cleanups, and a config file fix. 
svn path=/trunk/icecast/; revision=3773
 2002-08-09 08:06:00 +00:00
Michael Smith
9b6b2afeaf oddsock's xslt stats support, slightly cleaned up 
svn path=/trunk/icecast/; revision=3772
 2002-08-09 06:52:07 +00:00
Michael Smith
f1dc57ae2b Cleaned up version of Ciaran Anscomb's relaying patch. 
svn path=/trunk/httpp/; revision=3760
 2002-08-05 14:48:04 +00:00
Michael Smith
59e523a023 Allow either poll or select to be used (based on whether HAVE_POLL is defined.) 
Still need to make autoconf define HAVE_POLL where relevent.

svn path=/trunk/icecast/; revision=3717
 2002-07-24 14:52:28 +00:00
Michael Smith
b45b6853da Send the correct mimetype on client request. 
svn path=/trunk/icecast/; revision=3716
 2002-07-24 13:55:12 +00:00
Michael Smith
59b605ec12 Memory leaks. Lots of little ones. 
svn path=/trunk/httpp/; revision=3275
 2002-05-03 15:04:56 +00:00
Jack Moffitt
235a2639cc Ouch. Serious bug found by Ricardo Galli. 
When the cond var is signalled it will wake up a thread.  If all the
connection handler threads are handling connections, the signal will be
ignored and clients will 'pend' until another client causes the to signal
again.

We have to check to see if there are more pending connections before waiting
on the signal again.

svn path=/trunk/icecast/; revision=3178
 2002-03-22 22:41:16 +00:00
Michael Smith
cb398ff41c Bunch of fixes: 
- connections are now matched to format plugins based on content-type headers,
   and are rejected if there isn't a format handler for that content-type, or
   there is no content-type at all.
 - format_vorbis now handles pages with granulepos of -1 in the headers
   correctly (this happens if the headers are fairly large, because of
   many comments, for example).
 - various #include fixes.
 - buffer overflow in httpp.c fixed.

svn path=/trunk/avl/; revision=3042
 2002-02-11 09:11:18 +00:00
Jack Moffitt
4327a10e45 minor build fixes for win32 courtesy of Oddsock 
svn path=/trunk/icecast/; revision=3029
 2002-02-07 01:04:09 +00:00
Jack Moffitt
b7a114a191 Fix a stupid but that Oddsock and Ciaran both found. When sources log in 
we weren't checking to see if the mountpoint was already taken.  Since
the mountpoint was the key in the avl tree, bad things happened.

svn path=/trunk/icecast/; revision=2966
 2002-01-21 03:10:37 +00:00
Jack Moffitt
c98a76ebbd Revert stacksize stuff and changes for the thread module. 
svn path=/trunk/icecast/; revision=2223
 2001-10-21 02:06:08 +00:00
Jack Moffitt
42e869cd45 Fix icecast for changes in thread module regarding stacksize. For icecast, 
the default stacksize is unchanged (8k) until further testing on Solaris
to determine if a larger value is needed.

svn path=/trunk/icecast/; revision=2221
 2001-10-20 22:48:29 +00:00
Jack Moffitt
3553fce604 Thanks to Akos Maroy <darkeye@tyrell.hu> for this. These variables need to 
be uppercase always in order to comply with the HTTP specification.
While not a problem internal to icecast, they were slipping into the log
files and breaking some less-than-robust parsers.

svn path=/trunk/httpp/; revision=2197
 2001-10-20 07:40:09 +00:00
Jack Moffitt
8f6c02365d Win32 fixes. Look how portable this was ;) Just header stuff and some defines. 
Whee!

svn path=/trunk/icecast/; revision=2195
 2001-10-20 06:43:04 +00:00
Jack Moffitt
61316a25d7 Initial revision 
svn path=/trunk/icecast/; revision=1996
 2001-09-10 02:21:46 +00:00