kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make conference verbose-events param to control if events have all the channel data or not 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11073 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-01-05 20:25:02 +00:00
parent 9bd272284d
commit 2b3766a053
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mod/applications/mod_conference/mod_conference.c
View File

@ -264,6 +264,7 @@ typedef struct conference_obj {
int comfort_noise_level; int comfort_noise_level;
int video_running; int video_running;
uint32_t eflags; uint32_t eflags;
uint32_t verbose_events;
} conference_obj_t; } conference_obj_t;
/* Relationship with another member */ /* Relationship with another member */
@ -401,13 +402,13 @@ static switch_status_t conference_add_event_member_data(conference_member_t *mem
if (!member) if (!member)
return status; return status;
if (member->session) { if (member->conference) {
status = conference_add_event_data(member->conference, event);
if (member->conference->verbose_events && member->session) {
switch_channel_t *channel = switch_core_session_get_channel(member->session); switch_channel_t *channel = switch_core_session_get_channel(member->session);
switch_channel_event_set_data(channel, event); switch_channel_event_set_data(channel, event);
} }
if (member->conference) {
status = conference_add_event_data(member->conference, event);
} }
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id);
@ -5018,6 +5019,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
switch_status_t status; switch_status_t status;
int comfort_noise_level = 0; int comfort_noise_level = 0;
char *suppress_events = NULL; char *suppress_events = NULL;
char *verbose_events = NULL;
char *auto_record = NULL; char *auto_record = NULL;
/* Validate the conference name */ /* Validate the conference name */
@ -5137,6 +5139,8 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
} }
} else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) { } else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) {
suppress_events = val; suppress_events = val;
} else if (!strcasecmp(var, "verbose-events") && !switch_strlen_zero(val)) {
verbose_events = val;
} else if (!strcasecmp(var, "auto-record") && !switch_strlen_zero(val)) { } else if (!strcasecmp(var, "auto-record") && !switch_strlen_zero(val)) {
auto_record = val; auto_record = val;
} }
@ -5297,6 +5301,10 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
conference->auto_record = switch_core_strdup(conference->pool, auto_record); conference->auto_record = switch_core_strdup(conference->pool, auto_record);
} }
if (!switch_strlen_zero(verbose_events) && switch_true(verbose_events)) {
conference->verbose_events = 1;
}
/* caller control configuration chores */ /* caller control configuration chores */
if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) { if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {