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
1,041 Commits 49 Branches 25 Tags 7.6 MiB
1a4f4ecc2b
Commit Graph

747 Commits

Author SHA1 Message Date
Karl Heyes
0047edd51c small update for failure case. retry times changed and limited redirection allowed 
svn path=/icecast/trunk/icecast/; revision=14773
 2008-04-18 01:12:45 +00:00
Karl Heyes
649c4fdc70 build fix for older setups with IPv6 
svn path=/icecast/trunk/net/; revision=14545
 2008-02-28 02:16:23 +00:00
Karl Heyes
c37e770ee0 avoid duplicate entries in playlist log 
svn path=/icecast/trunk/icecast/; revision=14483
 2008-02-12 04:15:45 +00:00
Karl Heyes
0868602bc0 win32 update. change build settings so that we make the process simpler, it 
was very easy for the intermediate files to clash between projects.  The newer
libxml2/libxslt/libcurl also were causing some threading issues due to
library initialization


svn path=/icecast/trunk/icecast/; revision=14465
 2008-02-11 01:00:41 +00:00
Karl Heyes
1cdc68cf1d Use poll if available, select can cause stack corruption if descriptor value is over 1024 
svn path=/icecast/trunk/net/; revision=14457
 2008-02-05 04:21:12 +00:00
Karl Heyes
3344ff6f09 if a directory server times out, reset the failing server stream entries so 
that the streams go through the add process again in 15 mins. closes #689

svn path=/icecast/trunk/icecast/; revision=14452
 2008-02-03 05:43:32 +00:00
Karl Heyes
22ee7b6b6e minor xml cleanup, reduce default log level, closes #775 
svn path=/icecast/trunk/icecast/; revision=14450
 2008-02-03 03:11:54 +00:00
Karl Heyes
22654d271c Handle missing mount in relay case, and add checks for NULL which may be an issue for libxml2. 
svn path=/icecast/trunk/icecast/; revision=14430
 2008-01-24 03:31:25 +00:00
Karl Heyes
4aa2f1e0eb fix possible junk chars passed back and don't call strftime each log line, under 
glibc this calls for a stat of /etc/localtime each time

svn path=/icecast/trunk/log/; revision=14429
 2008-01-24 03:28:11 +00:00
Karl Heyes
6331e2ee77 fix default operation for manageauth 
svn path=/icecast/trunk/icecast/; revision=14339
 2008-01-03 15:18:52 +00:00
Karl Heyes
03e18677e4 drop const usage and work around a FBSD issue with listening sockets 
svn path=/icecast/trunk/net/; revision=14319
 2007-12-20 16:49:02 +00:00
Karl Heyes
6bcbb416b9 make sure we report the correct port for m3u and YP when not using the default port 
svn path=/icecast/trunk/icecast/; revision=14318
 2007-12-20 16:36:37 +00:00
Karl Heyes
2ccfe3caa5 port 8000 could be set to listen on when not wanted 
svn path=/icecast/trunk/icecast/; revision=14314
 2007-12-19 19:09:04 +00:00
Karl Heyes
0e533ac490 reduce wasted memory on 64bit systems, 32bit has no change 
svn path=/icecast/trunk/avl/; revision=14308
 2007-12-15 17:51:33 +00:00
Karl Heyes
73401b80d5 prevent NULL dereference 
svn path=/icecast/trunk/icecast/; revision=14307
 2007-12-15 17:21:22 +00:00
Karl Heyes
02cc6c5f10 type cleanups. reduces memory usage on 64bit, no difference on 32bit. closes #780 
svn path=/icecast/trunk/icecast/; revision=14306
 2007-12-15 17:02:16 +00:00
Karl Heyes
7b6b874b02 type cleanups. Use C99 defines if available and a missed sock_t on win32. This 
resolves some warnings on win32 and x86_64

svn path=/icecast/trunk/icecast/; revision=14223
 2007-11-23 16:27:10 +00:00
Karl Heyes
89dac2e3cf minor header cleanup 
svn path=/icecast/trunk/icecast/; revision=14219
 2007-11-23 03:17:39 +00:00
Karl Heyes
6ee33215e8 fix long standing copy+paste error. 
svn path=/icecast/trunk/icecast/; revision=14218
 2007-11-23 02:48:37 +00:00
Karl Heyes
7d8182eef5 minor cleanups, no functional change 
svn path=/icecast/trunk/icecast/; revision=14206
 2007-11-21 02:55:11 +00:00
Michael Smith
ab1447d35b Don't make autogen.sh look for a specific version of automake (seems to still 
work)

Include <errno.h> in connection.c; hopefully fixes Geoff Shang's compilation
problems.

svn path=/icecast/trunk/icecast/; revision=14155
 2007-11-15 15:12:21 +00:00
Karl Heyes
197be21d1c only pass clients to url auth handler if the trigger is defined in the xml 
svn path=/icecast/trunk/icecast/; revision=14115
 2007-11-08 20:00:54 +00:00
Karl Heyes
66b68170cc auth sync up. Fix longstanding race bug and make stream start/stop triggers work again. 
svn path=/icecast/trunk/icecast/; revision=14114
 2007-11-08 19:52:51 +00:00
Karl Heyes
b4b8e3e552 fix bad pointer bug for libcurl and small memory leak over reload of xml 
svn path=/icecast/trunk/icecast/; revision=14108
 2007-11-08 03:21:33 +00:00
Karl Heyes
0a347a6817 allow for multiple shoutcast style source clients to connect. They don't 
provide a mountpoint so you specify a shoutcast-mount in the listen-socket
section. Specifying this will automatically define the port+1 with the same
settings however the original shoutcast-compat approach is maintained.

svn path=/icecast/trunk/icecast/; revision=14045
 2007-10-25 02:25:49 +00:00
Karl Heyes
88514b9c8e fix minor memory leak on failed shoutcast source auth 
svn path=/icecast/trunk/icecast/; revision=14044
 2007-10-25 01:03:47 +00:00
Karl Heyes
af1c8da6b6 more sock_t cleanups, win32 should have less warnings now 
svn path=/icecast/trunk/icecast/; revision=14043
 2007-10-24 22:42:49 +00:00
Karl Heyes
089dd4c273 return type was wrong, although it probably won't affect stability 
svn path=/icecast/trunk/icecast/; revision=14042
 2007-10-24 22:40:42 +00:00
Karl Heyes
9c155dda50 clean up prototypes and sock_t handling, for win32 mainly, no functional change 
svn path=/icecast/trunk/net/; revision=14041
 2007-10-24 21:42:01 +00:00
Karl Heyes
4b5f00993d Allow for files to be specified that will contain IPs that can be used to 
accept or deny client connections.

svn path=/icecast/trunk/icecast/; revision=14039
 2007-10-23 22:25:31 +00:00
Karl Heyes
9379e4e051 *sigh, missing ; at least the coverity list should be clear again 
svn path=/icecast/trunk/icecast/; revision=14033
 2007-10-22 02:57:56 +00:00
Karl Heyes
ef8a91c8e6 minor memory leak on resource failure case 
svn path=/icecast/trunk/icecast/; revision=14032
 2007-10-22 02:52:16 +00:00
Karl Heyes
148af4e6ee merge work. mainly stats and some log message updates 
svn path=/icecast/trunk/icecast/; revision=14031
 2007-10-22 02:29:49 +00:00
Karl Heyes
27f58c1189 boundary limit check was wrong, we won't be able to match any of the listen sockets 
svn path=/icecast/trunk/icecast/; revision=14030
 2007-10-22 02:23:10 +00:00
Karl Heyes
a26bb50004 fix some potential minor memory leaks 
svn path=/icecast/trunk/icecast/; revision=14018
 2007-10-20 01:58:14 +00:00
Karl Heyes
549127b9f5 a missing break from a previous auth update was preventing url auth from being 
used

svn path=/icecast/trunk/icecast/; revision=14017
 2007-10-20 01:55:18 +00:00
Karl Heyes
ab75a3297f add global listeners stat 
svn path=/icecast/trunk/icecast/; revision=14016
 2007-10-20 00:58:05 +00:00
Karl Heyes
dcffbb38ad header fixup for listeners. Tell any proxies to not cache and add minor tweaks 
for flash players. closes #1115

svn path=/icecast/trunk/icecast/; revision=14014
 2007-10-19 14:06:07 +00:00
Karl Heyes
f9c3fc91a7 updates to range header handling. closes #1246, #810 
svn path=/icecast/trunk/icecast/; revision=14006
 2007-10-17 23:49:14 +00:00
Karl Heyes
55b5b7eb80 minor memory leak fixed 
svn path=/icecast/trunk/icecast/; revision=14004
 2007-10-17 02:35:48 +00:00
Karl Heyes
ba438dd7b5 Don't impose a limit on the number of listening sockets allowed in the xml 
svn path=/icecast/trunk/icecast/; revision=13995
 2007-10-16 01:53:06 +00:00
Karl Heyes
e065acb7f1 no functional/structural change but cleans up the annoying signed/unsigned pointer warnings 
here with xmlChar, based on work originally done by gtgbr@gmx.net.
closes #783, #784, #785, #787

svn path=/icecast/trunk/icecast/; revision=13933
 2007-10-04 16:48:38 +00:00
Karl Heyes
da893d8b3b missed these from previous commit, these checks are redundant now 
svn path=/icecast/trunk/icecast/; revision=13930
 2007-10-04 01:44:05 +00:00
Karl Heyes
807f95243f Make copies of the default string values instead of relying on the compiler to check 
for duplicate string literals.

svn path=/icecast/trunk/icecast/; revision=13929
 2007-10-04 00:55:13 +00:00
Karl Heyes
43988cac59 Allow buildm3u to work with the mount given, no need to check the source tree. closes #866 
svn path=/icecast/trunk/icecast/; revision=13908
 2007-09-28 00:54:01 +00:00
Karl Heyes
b8ab793867 make sure mount authentication has a type specified 
svn path=/icecast/trunk/icecast/; revision=13877
 2007-09-22 01:21:17 +00:00
Karl Heyes
7735a94ee6 add guards for NULL dereference 
svn path=/icecast/trunk/avl/; revision=13799
 2007-09-14 03:09:32 +00:00
Karl Heyes
e99eee6c80 small build fix and a minor issue highlighted by coverity 
svn path=/icecast/trunk/icecast/; revision=13798
 2007-09-14 03:01:17 +00:00
Karl Heyes
337f4a3272 make sure config lock is released in all failure cases of manageauth 
svn path=/icecast/trunk/icecast/; revision=13792
 2007-09-13 01:32:15 +00:00
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
Michael Smith
739d544c34 Having both os.h and compat.h to do similar things is pointless; remove os.h 
svn path=/icecast/trunk/icecast/; revision=10620
 2005-12-17 12:41:34 +00:00