1
0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-11-03 04:17:17 -05:00
Commit Graph

1387 Commits

Author SHA1 Message Date
Philipp Schafft
a6a0e9066a Merge branch 'master' into ph3 2014-12-19 17:33:33 +00:00
Philipp Schafft
3d6ea2efdb Merged support for thread-less <role>s 2014-12-19 17:30:37 +00:00
Philipp Schafft
25f6c53929 Feature: immediate mode for <role>s
This allows a <role> represented by a auth_t to run in "immediate"
mode. In this mode no thread is created for this <role>. This is a
major speedup.

Closes #2124
2014-12-19 17:27:54 +00:00
Philipp Schafft
0da40fa762 Merge branch 'master' into ph3 2014-12-19 16:43:05 +00:00
Philipp Schafft
a83ac3f5e1 Feature: Allow mangement of <role>s via admin/ interface.
Updated admin/manageauth.xsl the way suggested by
0eb466b76d.
closes #2123
2014-12-19 16:40:41 +00:00
Philipp Schafft
0eb466b76d Feature: Allow mangement of <role>s via admin/ interface.
This allows to manage <role>s via admin interface if the role supports.
Also format of admin/manageauth has been changed:
- <source> was renamed to <role>.
- mount parameter was removed.
- <role> got new parameters: type, name,
  can-adduser, can-deleteuser, can-listuser.
- can-* parameters are bools ("true" or "false"). They should be used
  to show or hide elements on the admin interface.

Ticket #2123 is nearly complet with this, just admin/manageauth.xsl
needs up be updated. Please close the bug in the commit that updates
admin/manageauth.xsl.
See #2123
2014-12-19 16:14:35 +00:00
Philipp Schafft
a990756912 Feature: Also export type="" in stats.xml's <role>s 2014-12-19 11:28:49 +00:00
Philipp Schafft
7093e19523 Feature: Added support to type="static" <role> to list user
This adds support to list the user for a static <role>.
2014-12-19 11:22:36 +00:00
Philipp Schafft
1c550b0c8e Feature: Added support for management-url="" in <role>
This adds setting a URL for manegement of roles to the framework.
If no URl is given in the config file this defaults to internal
(/admin/manageauth.xsl) interface if supported by the backend.
See #2123
2014-12-19 11:16:13 +00:00
Philipp Schafft
fb088de568 Fix: only export name="" on <role> if set 2014-12-19 11:01:32 +00:00
Philipp Schafft
4c429ab01b Feature: Export <role>s on stats.xml
This exports id and name of <role>s on stats.xml output. The <role>s
are in a <authentication> container tag and mimic the format used
by the config file.

See #2123
2014-12-19 10:51:40 +00:00
Philipp Schafft
40bb04b644 Feature: Added a unique ID to each auth_t.
This added a unique ID to each auth_t instance so it can be refered
to e.g. by the web interface for mangement functionallity. Mostly
stolen from connection.[ch].
See #2123
2014-12-19 10:50:52 +00:00
Philipp Schafft
25eec22692 Cleanup: Removed a printf() leftover from debugging 2014-12-19 10:47:07 +00:00
Philipp Schafft
c5bd8ad281 Fix: Always export <metadata> in stats.xml 2014-12-18 10:24:15 +00:00
Philipp Schafft
4a0c399bf3 Added 'lagcay' mode stats.xml.
Add '?omode=legacy' to any URI or <resource ... omode="legacy" />.
Please test.
closes #2097
2014-12-18 09:56:54 +00:00
Philipp Schafft
1951b00ab3 Merge branch 'master' into ph3 2014-12-17 22:26:12 +00:00
Philipp Schafft
dc016bc017 Fix: Fixed compiler warnings
This fixes some compiler warnings. The code should be warning free
if gcc with -Wall is used but for the following:
{{{
admin.c: In function 'command_manageauth':
admin.c:790: warning: unused variable 'mountinfo'
}}}
This warning is due <role> migration. See #2123 for more details on
this warning. Please test with care. closes 2063
2014-12-14 19:18:22 +00:00
Philipp Schafft
8dc069f361 Feature: Support command line arguments in <event type="exec">
This adds support to pass additional command line parameters
to called processes. closes #1752
2014-12-14 16:19:32 +00:00
Philipp Schafft
d67f0f5d91 Fix: Send Content-Disposition:-header correctly, closes #1953 2014-12-14 11:01:39 +00:00
Thomas B. Ruecker
2cb5d1a3e0 Incremental README improvement. refs #2122 2014-12-14 10:14:25 +00:00
Thomas B. Ruecker
01c896cf30 Merge branch 'master' of ssh://git.xiph.org/icecast-server 2014-12-14 09:52:31 +00:00
Thomas B. Ruecker
0d9b17e6da last missing url. refs #2122 2014-12-14 09:50:55 +00:00
Philipp Schafft
97fe054dee Merge branch 'master' into ph3 2014-12-14 09:33:26 +00:00
Philipp Schafft
fad405a4bf Merge branch 'master' of ssh://git.xiph.org/icecast-server 2014-12-14 09:30:45 +00:00
Thomas B. Ruecker
a17b29d8eb adding one url. refs #2122 2014-12-14 09:27:59 +00:00
Philipp Schafft
c73e214f8f Regression Fix: Correction of old-style <authentication>.
Old-style <authentication> within <mount> didn't work for type="url"
as well as some other parameters due to confusion between "node"
and "child" variable.

Thanks for trilliot for pointing out! Should work now.
closes #2039
2014-12-14 09:27:49 +00:00
Thomas B. Ruecker
91c4a25fa8 YAC - yet another change. ref #2122 2014-12-14 09:20:03 +00:00
Thomas B. Ruecker
bc67678506 Another small edit. refs #2122 2014-12-14 08:48:52 +00:00
Thomas B. Ruecker
4352dabef2 Small changes. see #2122 2014-12-14 08:41:04 +00:00
Thomas B. Ruecker
c3015aeacb Some minor changes, added Opus and WebM
see #2122
2014-12-14 08:25:16 +00:00
Philipp Schafft
8a4c529347 Cleanup: make strcmp() more explicit in _start_logging()
This avoids if(strcmp()) constructs in favor of if(strcmp() == 0)
constructs. This is aligned with coding style and will improve
readability of the code.

Thanks to miksago. closes #2102
2014-12-14 08:19:58 +00:00
Thomas B. Ruecker
98e314d037 NEWS updated for 2.4.0 and 2.4.1 2014-12-14 08:18:24 +00:00
Stephan Jauernick
fafd86207e Merge branch 'master' into ph3 2014-12-14 04:11:11 +01:00
Stephan Jauernick
6ab05c9d17 Merged with offical ph3 branch.... 2014-12-14 04:07:10 +01:00
Thomas B. Ruecker
b498d4bd93 Fix for docdir issue with deb/RPM. Fixes #2121
Replaced docdir with otherdocdir and made it relative to docdir.
This seems to work for debian and plain make install.
Will test RPM later.
2014-12-13 19:10:20 +00:00
Stephan Jauernick
27ea789dfe Sync with master(the fifth attempt).... I seriously dislike git!!!!!! 2014-12-13 13:07:59 +01:00
Philipp Schafft
1d790399f3 Feature: Extract metadata and export them to stats.xml
All metadata is now extracted from Vorbis streams and ICY streams
and exported as new <metadata> tag into admin/stats if specific
mountpoint is requested.

To testers:
 - Please test with Ogg Vorbis streams.
 - Please test with Ogg Vorbis + Theora streams.
 - Please test chained Ogg streams.
 - Please test with ICY streams.

close #2106
2014-12-13 00:41:34 +01:00
Philipp Schafft
48a44f1b9c Speedup: Don't copy data into event if there are no registrations
If there are no reistrations that are added to an event the event
doesn't need to be emited as nobody cares anyway. We will do this
simple check before we copy data into the event object to avoid
unnecessary calls to strdup() and other allocation functions.
2014-12-13 00:41:24 +01:00
Philipp Schafft
c0792c71f7 Added <event>: Unified handling of events.
<event> has been added and can be used within <kartoffelsalat>
both in <icecast> and <mount>.
<event> takes backend depending <option> child tags.
Currently supported backends:
 - log: send message to error log.
 - exec: executes a program or script.
 - url: delivers the event via HTTP.

within <mount> <on-connect> and <on-disconnect> has been replaced by
<event>. Config parser can on-the-fly convert old tags.
Also <authentication type="url"> within <mount> has been fixed
for those cases with <option name="mount_add" .../> and
<option name="mount_remove" .../> which are now on-the-fly converted
by the parser to corresponding <event> tags.

Please also see TAGs added as per #2098. Some include hints for
documentation updates needed after this change. Those updates
should take place before 2.4.2.

Conflicts:
	src/Makefile.am
	src/cfgfile.c
	src/main.c
2014-12-13 00:41:10 +01:00
Philipp Schafft
5cf5861062 Cleanup: Moved config re-read function into right place
Renamed event_config_read() into config_reread_config() and moved
it into cfgfile.c. This allowed to delete event.[ch].
event.[ch] will later be used to implement <event>.

Conflicts:
	src/event.c
2014-12-13 00:38:27 +01:00
Philipp Schafft
b3ff6b40e6 Corrected Makefile.am to refect README rename and TODO deletion
- Corrected filename as README was renamed to README.md
  in e7f27072a9.
- Removed TODO from file list as it was removed
  in 341374a69d.
2014-12-13 00:37:34 +01:00
Philipp Schafft
4a73ee33a1 ACL: added {allow,deny}-all, support bool notation
Added {allow,deny}-all option to ACL parser. Setting this will
set {allow,deny}-{method,admin,web} to *.

Also allow boolean values (insteed of *) for
{allow,deny}-{web,all}.
2014-12-13 00:37:23 +01:00
Philipp Schafft
735f4c4fc1 renamed <alias> to <resource>.
renamed <alias> to <resource> as it is planned to extent the usage
of this tag. docs and default configs should be updated by those
taking core of them.
2014-12-13 00:37:15 +01:00
Marvin Scholz
cc5a22288f Update submodules 2014-12-13 00:37:06 +01:00
Marvin Scholz
07ad8d9dc6 Updated README, renamed it so that it is parsed as markdown 2014-12-13 00:36:57 +01:00
Marvin Scholz
98556f0a12 Remove old TODO file, using trac tickets instead
- #2104 (Check: Bytes sent and time listening might be broken?)
- #2105 (Make config option (-c) optional?)
- #2106 (Pull vorbis comments (metadata) and send to stats)
- #2107 (Provide a way for YP Dirs to check streams)
- #1944 (Rework STATS interface)
- W3C Extended Logging was never requested by someone
- Sending intros is already possible
- #2108 (Registrable URL handlers in connection.c instead of hardcoded list)
- #2109 (Abstract admin functionality to set of commands and handlers)
- #2110 (Timer-based functionalities should use single timer thread)
- #2111 (Race condition in fserv.c?)
- #2112 (Locks on avl client_trees needed?)
2014-12-13 00:36:48 +01:00
Marvin Scholz
7d04fb9f3e Changed URLs to be relative in .gitmodules 2014-12-13 00:36:39 +01:00
Marvin Scholz
f1cec9fc85 Updated submodules to the new repository URLs 2014-12-13 00:36:28 +01:00
Marvin Scholz
4cf53325b1 Epic Git migration commit
Added .gitignore and submodules
Changed paths to match new location of things

Conflicts:
	src/Makefile.am
2014-12-13 00:36:14 +01:00
Philipp Schafft
8b69065828 better coding style, patch by ePirat. refs #2059
svn path=/icecast/trunk/icecast/; revision=19376
2014-12-13 00:32:47 +01:00