Merge "Confbridge: Add a user timeout option"
This commit is contained in:
commit
e18b07da9d
7
CHANGES
7
CHANGES
|
@ -200,6 +200,13 @@ Queue
|
||||||
--- Functionality changes from Asterisk 13.6.0 to Asterisk 13.7.0 ------------
|
--- Functionality changes from Asterisk 13.6.0 to Asterisk 13.7.0 ------------
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
ConfBridge
|
||||||
|
------------------
|
||||||
|
* A new "timeout" user profile option has been added. This configures the number
|
||||||
|
of seconds that a participant may stay in the ConfBridge after joining. When
|
||||||
|
the time expires, the user is ejected from the conference and CONFBRIDGE_RESULT
|
||||||
|
is set to "TIMEOUT" on the channel.
|
||||||
|
|
||||||
chan_sip
|
chan_sip
|
||||||
------------------
|
------------------
|
||||||
* The websockets_enabled option has been added to the general section of
|
* The websockets_enabled option has been added to the general section of
|
||||||
|
|
|
@ -118,6 +118,7 @@ ASTERISK_REGISTER_FILE()
|
||||||
<value name="KICKED">The channel was kicked from the conference.</value>
|
<value name="KICKED">The channel was kicked from the conference.</value>
|
||||||
<value name="ENDMARKED">The channel left the conference as a result of the last marked user leaving.</value>
|
<value name="ENDMARKED">The channel left the conference as a result of the last marked user leaving.</value>
|
||||||
<value name="DTMF">The channel pressed a DTMF sequence to exit the conference.</value>
|
<value name="DTMF">The channel pressed a DTMF sequence to exit the conference.</value>
|
||||||
|
<value name="TIMEOUT">The channel reached its configured timeout.</value>
|
||||||
</variable>
|
</variable>
|
||||||
</variablelist>
|
</variablelist>
|
||||||
</description>
|
</description>
|
||||||
|
@ -1545,6 +1546,13 @@ static int conf_get_pin(struct ast_channel *chan, struct confbridge_user *user)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int user_timeout(struct ast_bridge_channel *bridge_channel, void *ignore)
|
||||||
|
{
|
||||||
|
ast_bridge_channel_leave_bridge(bridge_channel, BRIDGE_CHANNEL_STATE_END, 0);
|
||||||
|
pbx_builtin_setvar_helper(bridge_channel->chan, "CONFBRIDGE_RESULT", "TIMEOUT");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
static int conf_rec_name(struct confbridge_user *user, const char *conf_name)
|
static int conf_rec_name(struct confbridge_user *user, const char *conf_name)
|
||||||
{
|
{
|
||||||
char destdir[PATH_MAX];
|
char destdir[PATH_MAX];
|
||||||
|
@ -1779,6 +1787,16 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
|
||||||
ast_autoservice_stop(chan);
|
ast_autoservice_stop(chan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (user.u_profile.timeout) {
|
||||||
|
ast_bridge_interval_hook(&user.features,
|
||||||
|
0,
|
||||||
|
user.u_profile.timeout * 1000,
|
||||||
|
user_timeout,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
AST_BRIDGE_HOOK_REMOVE_ON_PULL);
|
||||||
|
}
|
||||||
|
|
||||||
/* See if we need to automatically set this user as a video source or not */
|
/* See if we need to automatically set this user as a video source or not */
|
||||||
handle_video_on_join(conference, user.chan, ast_test_flag(&user.u_profile, USER_OPT_MARKEDUSER));
|
handle_video_on_join(conference, user.chan, ast_test_flag(&user.u_profile, USER_OPT_MARKEDUSER));
|
||||||
|
|
||||||
|
|
|
@ -227,6 +227,9 @@ ASTERISK_REGISTER_FILE()
|
||||||
<configOption name="template">
|
<configOption name="template">
|
||||||
<synopsis>When using the CONFBRIDGE dialplan function, use a user profile as a template for creating a new temporary profile</synopsis>
|
<synopsis>When using the CONFBRIDGE dialplan function, use a user profile as a template for creating a new temporary profile</synopsis>
|
||||||
</configOption>
|
</configOption>
|
||||||
|
<configOption name="timeout">
|
||||||
|
<synopsis>Kick the user out of the conference after this many seconds. 0 means there is no timeout for the user.</synopsis>
|
||||||
|
</configOption>
|
||||||
</configObject>
|
</configObject>
|
||||||
<configObject name="bridge_profile">
|
<configObject name="bridge_profile">
|
||||||
<synopsis>A named profile to apply to specific bridges.</synopsis>
|
<synopsis>A named profile to apply to specific bridges.</synopsis>
|
||||||
|
@ -2141,6 +2144,7 @@ int conf_load_config(void)
|
||||||
aco_option_register(&cfg_info, "dsp_silence_threshold", ACO_EXACT, user_types, __stringify(DEFAULT_SILENCE_THRESHOLD), OPT_UINT_T, 0, FLDSET(struct user_profile, silence_threshold));
|
aco_option_register(&cfg_info, "dsp_silence_threshold", ACO_EXACT, user_types, __stringify(DEFAULT_SILENCE_THRESHOLD), OPT_UINT_T, 0, FLDSET(struct user_profile, silence_threshold));
|
||||||
aco_option_register(&cfg_info, "dsp_talking_threshold", ACO_EXACT, user_types, __stringify(DEFAULT_TALKING_THRESHOLD), OPT_UINT_T, 0, FLDSET(struct user_profile, talking_threshold));
|
aco_option_register(&cfg_info, "dsp_talking_threshold", ACO_EXACT, user_types, __stringify(DEFAULT_TALKING_THRESHOLD), OPT_UINT_T, 0, FLDSET(struct user_profile, talking_threshold));
|
||||||
aco_option_register(&cfg_info, "jitterbuffer", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_JITTERBUFFER);
|
aco_option_register(&cfg_info, "jitterbuffer", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_JITTERBUFFER);
|
||||||
|
aco_option_register(&cfg_info, "timeout", ACO_EXACT, user_types, "0", OPT_UINT_T, 0, FLDSET(struct user_profile, timeout));
|
||||||
/* This option should only be used with the CONFBRIDGE dialplan function */
|
/* This option should only be used with the CONFBRIDGE dialplan function */
|
||||||
aco_option_register_custom(&cfg_info, "template", ACO_EXACT, user_types, NULL, user_template_handler, 0);
|
aco_option_register_custom(&cfg_info, "template", ACO_EXACT, user_types, NULL, user_template_handler, 0);
|
||||||
|
|
||||||
|
|
|
@ -141,6 +141,8 @@ struct user_profile {
|
||||||
unsigned int talking_threshold;
|
unsigned int talking_threshold;
|
||||||
/*! The time in ms of silence before a user is considered to be silent by the dsp. */
|
/*! The time in ms of silence before a user is considered to be silent by the dsp. */
|
||||||
unsigned int silence_threshold;
|
unsigned int silence_threshold;
|
||||||
|
/*! The time in ms the user may stay in the confbridge */
|
||||||
|
unsigned int timeout;
|
||||||
};
|
};
|
||||||
|
|
||||||
enum conf_sounds {
|
enum conf_sounds {
|
||||||
|
|
|
@ -137,6 +137,12 @@ type=user
|
||||||
; This option is off by default.
|
; This option is off by default.
|
||||||
;announcement=</path/to/file> ; Play a sound file to the user when they join the conference.
|
;announcement=</path/to/file> ; Play a sound file to the user when they join the conference.
|
||||||
|
|
||||||
|
;timeout=3600 ; When set non-zero, this specifies the number of seconds that the participant
|
||||||
|
; may stay in the conference before being automatically ejected. When the user
|
||||||
|
; is ejected from the conference, the user's channel will have the CONFBRIDGE_RESULT
|
||||||
|
; variable set to "TIMEOUT". A value of 0 indicates that there is no timeout.
|
||||||
|
; Default: 0
|
||||||
|
|
||||||
; --- ConfBridge Bridge Profile Options ---
|
; --- ConfBridge Bridge Profile Options ---
|
||||||
[default_bridge]
|
[default_bridge]
|
||||||
type=bridge
|
type=bridge
|
||||||
|
|
Loading…
Reference in New Issue