aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code
923 Commits 49 Branches 25 Tags 7.6 MiB
a2cb69a789
Commit Graph

648 Commits

Author SHA1 Message Date
Karl Heyes
03a4d5298f convert the passed value 
svn path=/icecast/trunk/icecast/; revision=13755
 2007-09-05 03:25:14 +00:00
Karl Heyes
d43254853f allow mount param for webroot xsl pages, closes #990 
svn path=/icecast/trunk/icecast/; revision=13754
 2007-09-05 02:16:45 +00:00
Karl Heyes
2c67cfffb2 fix for #734. Allow /admin/stats[.xsl] to take an optional mount arg which only 
returns global stats and stats for that particular mountpoint.


svn path=/icecast/trunk/icecast/; revision=13709
 2007-09-03 22:04:04 +00:00
Karl Heyes
d327fc8914 close report #704, add server-id tag, default stays as the server version string. 
svn path=/icecast/trunk/icecast/; revision=13704
 2007-09-03 00:55:27 +00:00
Karl Heyes
47def32074 missed some NULL checks from previous character set commit. Add optional charset 
setting on metadata update request and conversion code for it.


svn path=/icecast/trunk/icecast/; revision=13663
 2007-08-30 23:36:19 +00:00
Karl Heyes
7e5604b993 merge work. allow sockets to be marked as ssl capable. This is mainly for /admin 
requests but can be used for sources and listeners

svn path=/icecast/trunk/icecast/; revision=13650
 2007-08-29 03:51:22 +00:00
Karl Heyes
31ce005ef3 small const update, add NULL check, NULL shouldn't occur here but it's better to play safe 
svn path=/icecast/trunk/icecast/; revision=13649
 2007-08-29 02:01:28 +00:00
Karl Heyes
9e078e714f allow xsl requests to go through the authentication code 
svn path=/icecast/trunk/icecast/; revision=13628
 2007-08-25 16:04:33 +00:00
Karl Heyes
5a7111fc82 Fix bug #895. Most if not all non-Ogg streams send metadata as non-UTF8, typically 
ISO-8859-1 is assumed as there is no real clarity wrt the spec. In most cases people
send ASCII so it's not an issue, but for some, the extended characters they send
can cause problems with XML processing.  As stats and YP require UTF8 we need to
translate them and block invalid cases.

For the moment, for non-Ogg streams only, we assume that the metadata needs converting
from ISO-8859-1. Ogg streams are UTF8 so no conversion needed. You can override the
default with a charset mount option.


svn path=/icecast/trunk/icecast/; revision=13615
 2007-08-24 15:44:37 +00:00
Karl Heyes
fe0e17dbaa fix bug #1141 
svn path=/icecast/trunk/icecast/; revision=13595
 2007-08-23 16:58:18 +00:00
Karl Heyes
176b9f7eca Auth update. Have each auth_t has its own queue of requests and thread to process 
them. Each listener connection for each request is checked as connected before
performing the request (so that time isn't wasted on slow authentication). Various
name/comment cleanups as well.

svn path=/icecast/trunk/icecast/; revision=13583
 2007-08-21 22:30:30 +00:00
Karl Heyes
620c51f699 added function to check whether the socket is still alive 
svn path=/icecast/trunk/net/; revision=13582
 2007-08-21 22:17:13 +00:00
Karl Heyes
bd266785ad fix possible crash 
svn path=/icecast/trunk/icecast/; revision=13561
 2007-08-16 23:03:03 +00:00
Karl Heyes
3910d1caf9 const updates, again no functional change 
svn path=/icecast/trunk/httpp/; revision=13560
 2007-08-16 22:52:24 +00:00
Karl Heyes
5f8cfd70f7 const updates, no functional changes 
svn path=/icecast/trunk/icecast/; revision=13559
 2007-08-16 22:49:13 +00:00
Karl Heyes
eebb33b8a1 add general information to stats 
svn path=/icecast/trunk/icecast/; revision=13553
 2007-08-16 02:13:18 +00:00
Karl Heyes
f1c6cf9d4e Allow rereading of the mime types file on xml reload. Also allow for specifying 
an alternative filename in the xml.

svn path=/icecast/trunk/icecast/; revision=13541
 2007-08-13 21:33:27 +00:00
Karl Heyes
e06793a7ad handle .xspf requests. Like m3u, send a webroot file if it exists else generate 
one. The generated one comes from an xslt in adminroot. Just need some icons

svn path=/icecast/trunk/icecast/; revision=13539
 2007-08-11 18:26:44 +00:00
Karl Heyes
bb0b1a2a32 Triggers for source stats updated. No point updating all source stats if fewer 
need updating. Fixes a few unusual cases, if a mount was removed (with xml reload)
whilst no source was reserved then those stats were left behind.

svn path=/icecast/trunk/icecast/; revision=13538
 2007-08-11 17:44:45 +00:00
Karl Heyes
2a0c3cdefa Don't hardcode content type of xslt files to html, allow xsl to determine it 
svn path=/icecast/trunk/icecast/; revision=13534
 2007-08-11 00:24:51 +00:00
Karl Heyes
b3b2695a1d Handle http 302 response when a relay starts. The socket IO is isolated into a 
separate function for loop handling and log messages are updated.


svn path=/icecast/trunk/icecast/; revision=13533
 2007-08-10 21:33:16 +00:00
Karl Heyes
2b817daea2 fix possible segv case, and only increase certain listener stats when stream is 
active (on demand relays may not actually start when triggered)

svn path=/icecast/trunk/icecast/; revision=13503
 2007-08-10 13:04:40 +00:00
Karl Heyes
fe5c9e62cc minor build update 
svn path=/icecast/trunk/net/; revision=13501
 2007-08-09 23:51:26 +00:00
Karl Heyes
7248d653c0 Update the streamlist handler for slaves. Get the list of non-hidden mountpoints 
from the stats engine instead of the mount or source list, as the stats are
populated by non-mount defined streams and mounts with active fallbacks.

svn path=/icecast/trunk/icecast/; revision=13500
 2007-08-09 23:36:29 +00:00
Karl Heyes
3e8f2c39d4 fix problem case when listeners are moved by another thread, eg a fallback 
override is triggered, and on-demand relays are not shut down or stats are
not updated.

svn path=/icecast/trunk/icecast/; revision=13496
 2007-08-09 15:43:00 +00:00
Karl Heyes
7c6c79c416 build fix with libcurl 7.16 onwards 
svn path=/icecast/trunk/icecast/; revision=13495
 2007-08-09 12:24:33 +00:00
Karl Heyes
adac7ebee4 if addresses come back as IPv4-mapped IPv6 then make it look like IPv4 or else 
we'll get queries about the access log.  Fix a potential FD leak and add a
small delay into the listener thread if accept fails, the usual cause is an FD
limit being reached triggering logs to fill up and CPU to max out.


svn path=/icecast/trunk/icecast/; revision=13492
 2007-08-09 03:36:03 +00:00
Karl Heyes
916a4a4cd1 update to server side socket creation. Where IPv6-aware functions are available, 
use them to create dual IPv4/6 capable sockets.


svn path=/icecast/trunk/net/; revision=13491
 2007-08-09 03:19:24 +00:00
Karl Heyes
e663a238ee prevent race case when dealing with shoutcast style source clients and update 
response headers to those clients.

svn path=/icecast/trunk/icecast/; revision=13490
 2007-08-09 02:51:53 +00:00
moritz
d8fafe1935 Only define [u]int64_t on Windows if they haven't been defined already (e.g. in 
os.h from libshout or stdint.h in case they ever show up there.)

ok msmith

svn path=/icecast/trunk/timing/; revision=12663
 2007-03-06 13:35:29 +00:00
Michael Smith
a1d9503d8e Fix use-after-free in error case in fserve, as noted by Jerome Alet 
svn path=/icecast/trunk/icecast/; revision=11412
 2006-05-18 22:06:32 +00:00
Michael Smith
25c55e1f86 Set error if we have an unrecognised codec, so that we properly drop the source 
rather than just continuing forever on unrecognisable input.

svn path=/icecast/trunk/icecast/; revision=11184
 2006-04-20 16:51:27 +00:00
Karl Heyes
d574647025 off by 1 error, although not triggered by icecast/ices 
svn path=/icecast/trunk/log/; revision=11073
 2006-03-31 02:14:12 +00:00
Karl Heyes
e00aafda3a allow the last N lines to be cached and retrieved from each log, the default 
is nothing cached (current behaviour).

svn path=/icecast/trunk/log/; revision=11063
 2006-03-27 02:26:06 +00:00
Karl Heyes
0dc2655838 slave handler update. add timestamps to relays, allows slave thread to 
process them better. This simplifies various checks and sits better with
relay startup and relay cleanup in certain error cases.

svn path=/icecast/trunk/icecast/; revision=11008
 2006-03-15 03:02:08 +00:00
Karl Heyes
9e96120398 When modifying source_t contents we should take a write lock to prevent 
races with other threads. so take a write lock on the client tree.

svn path=/icecast/trunk/icecast/; revision=11007
 2006-03-15 02:42:18 +00:00
Karl Heyes
c81a42cb3b close report #842. It's more informative to report the read bytes 
svn path=/icecast/trunk/icecast/; revision=11006
 2006-03-15 02:34:39 +00:00
Karl Heyes
8ec568d5b5 fix possible bad pointer dereference bug when processing new clients 
svn path=/icecast/trunk/icecast/; revision=11005
 2006-03-15 02:30:26 +00:00
Karl Heyes
043bff364c memory leak when handling ogg flac, and make sure that moving listeners 
to theora streams triggers a search for a keyframe.

svn path=/icecast/trunk/icecast/; revision=11004
 2006-03-15 02:24:57 +00:00
Michael Smith
091892c8c6 Forgot to commit this one yesterday: add a default case to prevent memory leaks 
in any potential caller calling this with the wrong args.

svn path=/icecast/trunk/icecast/; revision=10989
 2006-03-08 11:14:56 +00:00
Michael Smith
14e0cfcdac Remove a bogus non-null check 
svn path=/icecast/trunk/icecast/; revision=10979
 2006-03-07 19:39:16 +00:00
Michael Smith
043aa0b009 Don't leak parsers when we fail to parse a shoutcast-compatible request. 
svn path=/icecast/trunk/icecast/; revision=10978
 2006-03-07 19:35:18 +00:00
Michael Smith
c4dfb3f2fd Don't leak file pointers (and hence file descriptors) if we can't parse a range 
request.

svn path=/icecast/trunk/icecast/; revision=10977
 2006-03-07 19:28:41 +00:00
Michael Smith
9acddcdb8a Oops, fix compilation 
svn path=/icecast/trunk/icecast/; revision=10976
 2006-03-07 19:27:54 +00:00
Michael Smith
36dc9b0c25 Free tree if we fail to allocate root node. 
svn path=/icecast/trunk/avl/; revision=10975
 2006-03-07 19:22:29 +00:00
Michael Smith
2848a70776 Fix a leak in a config parsing path when we see a directory server with no 
host specified.

svn path=/icecast/trunk/icecast/; revision=10974
 2006-03-07 19:21:04 +00:00
Michael Smith
3cf24e0af7 Add a missing check for LOG_MAXLOGS, fix another check to be >= rather than > 
svn path=/icecast/trunk/log/; revision=10973
 2006-03-07 19:17:06 +00:00
Michael Smith
82f1ebf52a When falling back from a full source to another source, ensure the other source 
actually exists. 

svn path=/icecast/trunk/icecast/; revision=10972
 2006-03-07 19:12:43 +00:00
Michael Smith
c892e2217a Allow a NULL filename in log_set_filename, since it's allowed elsewhere. 
Thanks Coverity!


svn path=/icecast/trunk/log/; revision=10971
 2006-03-07 19:07:20 +00:00
oddsock
0320ef97f7 os.h doesn't exist anymore, use compat.h. 
svn path=/icecast/trunk/net/; revision=10949
 2006-02-24 04:37:22 +00:00