Karl Heyes
1e6232c531
add <shoutcast-mount>. drop the hardcoded mountpoint hacks for NSV
...
svn path=/icecast/trunk/icecast/; revision=8213
2004-11-17 16:02:04 +00:00
oddsock
80078cce1d
* support for the Shoutcast DSP (yay!).
...
You can now use the Shoutcast DSP as a source client. The connection
protocol is a bit odd, and we had to handle it separately, and thus
we've added a new config option (<shoutcast-compat>) that is set at
the listener port level.
* support for NSV (and the nsvscsrc source client).
After adding support for the connection protocol of the shoutcast DSP,
adding NSV was just a simple of a few special handling cases.
* removed all traces of the earlier attempt at the shoutcast DSP connection
protocol
* Due to the growing complexity of the config files, I've also created a
few alternate config files, namely one for a "shoutcast compat" setup
as well as a "minimal" one for quick basic configurations.
svn path=/icecast/trunk/icecast/; revision=8191
2004-11-11 15:47:33 +00:00
Karl Heyes
17c178555f
correct type for volatile usage and uncomment log message for stats updating
...
svn path=/icecast/trunk/icecast/; revision=8123
2004-10-27 14:13:29 +00:00
Karl Heyes
9652319c38
An alias could disappear from under us, so copy the string
...
svn path=/icecast/trunk/icecast/; revision=8108
2004-10-26 19:29:12 +00:00
Karl Heyes
7eed9c793b
small updates. reject source client with invalid mountpoint, avoid aliasing
...
issues with queue and id, and change handler to avoid leaving clients on the
connection queue (rare)
svn path=/icecast/trunk/icecast/; revision=8107
2004-10-26 16:31:16 +00:00
Karl Heyes
9c44a7d184
merged singleq branch 7177:7591
...
svn path=/icecast/trunk/icecast/; revision=7592
2004-08-20 15:13:59 +00:00
oddsock
ebecd7cb0a
fix m3u generation logic that was not working for static files
...
svn path=/icecast/trunk/icecast/; revision=7439
2004-07-31 22:25:07 +00:00
oddsock
56cd1de3c5
added ability to disallow concurrent connections from the same username if using htpasswd listener authentication.
...
svn path=/icecast/trunk/icecast/; revision=6711
2004-05-17 04:33:46 +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
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
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