mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2024-09-29 04:25:55 -04:00
small name change to previous patch
svn path=/icecast/branches/kh/icecast/; revision=9781
This commit is contained in:
parent
a01d64cdaa
commit
787f86116e
@ -104,6 +104,7 @@
|
|||||||
<fallback-override>1</fallback-override>
|
<fallback-override>1</fallback-override>
|
||||||
<fallback-when-full>1</fallback-when-full>
|
<fallback-when-full>1</fallback-when-full>
|
||||||
<intro>/path/to/stream-intro.ogg</intro>
|
<intro>/path/to/stream-intro.ogg</intro>
|
||||||
|
<max-listener-duration>3600</max-listener-duration>
|
||||||
<hidden>1</hidden>
|
<hidden>1</hidden>
|
||||||
<authentication type="htpasswd">
|
<authentication type="htpasswd">
|
||||||
<option name="filename" value="myauth"/>
|
<option name="filename" value="myauth"/>
|
||||||
|
@ -433,7 +433,7 @@ An optional value which will set the password that a source must use to connect
|
|||||||
<div class="indentedbox">
|
<div class="indentedbox">
|
||||||
An optional value which will set the maximum number of listeners that can be attached to this mountpoint.
|
An optional value which will set the maximum number of listeners that can be attached to this mountpoint.
|
||||||
</div>
|
</div>
|
||||||
<h4>listening-duration</h4>
|
<h4>max-listener-duration</h4>
|
||||||
<div class="indentedbox">
|
<div class="indentedbox">
|
||||||
An optional value which will set the length of time a listener will stay connected to the
|
An optional value which will set the length of time a listener will stay connected to the
|
||||||
stream. An auth component may override this.
|
stream. An auth component may override this.
|
||||||
|
@ -312,8 +312,8 @@ static int add_authenticated_client (const char *mount, mount_proxy *mountinfo,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/* set a per-mount disconnect time if auth hasn't set one already */
|
/* set a per-mount disconnect time if auth hasn't set one already */
|
||||||
if (mountinfo->listening_duration && client->con->discon_time == 0)
|
if (mountinfo->max_listener_duration && client->con->discon_time == 0)
|
||||||
client->con->discon_time = time(NULL) + mountinfo->listening_duration;
|
client->con->discon_time = time(NULL) + mountinfo->max_listener_duration;
|
||||||
|
|
||||||
ret = add_client_to_source (source, client);
|
ret = add_client_to_source (source, client);
|
||||||
avl_tree_unlock (global.source_tree);
|
avl_tree_unlock (global.source_tree);
|
||||||
|
@ -629,9 +629,9 @@ static void _parse_mount(xmlDocPtr doc, xmlNodePtr node,
|
|||||||
mount->on_disconnect = (char *)xmlNodeListGetString(
|
mount->on_disconnect = (char *)xmlNodeListGetString(
|
||||||
doc, node->xmlChildrenNode, 1);
|
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);
|
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
|
||||||
mount->listening_duration = atoi(tmp);
|
mount->max_listener_duration = atoi(tmp);
|
||||||
if(tmp) xmlFree(tmp);
|
if(tmp) xmlFree(tmp);
|
||||||
}
|
}
|
||||||
else if (strcmp(node->name, "queue-size") == 0) {
|
else if (strcmp(node->name, "queue-size") == 0) {
|
||||||
|
@ -72,7 +72,7 @@ typedef struct _mount_proxy {
|
|||||||
config_options_t *auth_options; /* Options for this type */
|
config_options_t *auth_options; /* Options for this type */
|
||||||
char *on_connect;
|
char *on_connect;
|
||||||
char *on_disconnect;
|
char *on_disconnect;
|
||||||
unsigned int listening_duration;
|
unsigned int max_listener_duration;
|
||||||
|
|
||||||
char *stream_name;
|
char *stream_name;
|
||||||
char *stream_description;
|
char *stream_description;
|
||||||
|
Loading…
Reference in New Issue
Block a user