aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-06-30 06:35:23 +00:00
Code

small name change to previous patch

Browse Source 
svn path=/icecast/branches/kh/icecast/; revision=9781
This commit is contained in:
Karl Heyes 2005-08-20 17:13:58 +00:00
parent a01d64cdaa
commit 787f86116e
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/icecast.xml.in
View File

@ -104,6 +104,7 @@
<fallback-override>1</fallback-override>
<fallback-when-full>1</fallback-when-full>
<intro>/path/to/stream-intro.ogg</intro>
<max-listener-duration>3600</max-listener-duration>
<hidden>1</hidden>
<authentication type="htpasswd">
<option name="filename" value="myauth"/>

2
doc/icecast2_config_file.html
View File

@ -433,7 +433,7 @@ An optional value which will set the password that a source must use to connect
<div class="indentedbox">
An optional value which will set the maximum number of listeners that can be attached to this mountpoint.
</div>
<h4>listening-duration</h4>
<h4>max-listener-duration</h4>
<div class="indentedbox">
An optional value which will set the length of time a listener will stay connected to the
stream. An auth component may override this.

4
src/auth.c
View File

@ -312,8 +312,8 @@ static int add_authenticated_client (const char *mount, mount_proxy *mountinfo,
return -1;
}
/* set a per-mount disconnect time if auth hasn't set one already */
if (mountinfo->listening_duration && client->con->discon_time == 0)
client->con->discon_time = time(NULL) + mountinfo->listening_duration;
if (mountinfo->max_listener_duration && client->con->discon_time == 0)
client->con->discon_time = time(NULL) + mountinfo->max_listener_duration;
ret = add_client_to_source (source, client);
avl_tree_unlock (global.source_tree);

4
src/cfgfile.c
View File

@ -629,9 +629,9 @@ static void _parse_mount(xmlDocPtr doc, xmlNodePtr node,
mount->on_disconnect = (char *)xmlNodeListGetString(
doc, node->xmlChildrenNode, 1);
}
else if (strcmp(node->name, "listening-duration") == 0) {
else if (strcmp(node->name, "max-listener-duration") == 0) {
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
mount->listening_duration = atoi(tmp);
mount->max_listener_duration = atoi(tmp);
if(tmp) xmlFree(tmp);
}
else if (strcmp(node->name, "queue-size") == 0) {

2
src/cfgfile.h
View File

@ -72,7 +72,7 @@ typedef struct _mount_proxy {
config_options_t *auth_options; /* Options for this type */
char *on_connect;
char *on_disconnect;
unsigned int listening_duration;
unsigned int max_listener_duration;
char *stream_name;
char *stream_description;