kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-03 17:30:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #447 in FS/freeswitch from bugfix/FS-7911-v1.4 to v1.4

Browse Source 
* commit 'd5d451734047a7dd6f847f6bd875f4a73c0d011d':
  FS-7912: [mod_conference] fix for v1.4 branch to not allocate for conference cdr if conference cdr is disabled
This commit is contained in:
Mike Jerris 2015-09-01 13:06:25 -05:00
commit 3acabb8e3c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,6 +812,8 @@ static void process_al(al_handle_t *al, void *data, switch_size_t datalen, int r
static void conference_cdr_del(conference_member_t *member)
{
if (!member->cdr_node) return;
if (member->channel) {
switch_channel_get_variables(member->channel, &member->cdr_node->var_event);
}
@ -826,6 +828,8 @@ static void conference_cdr_add(conference_member_t *member)
switch_caller_profile_t *cp;
switch_channel_t *channel;
if (zstr(member->conference->log_dir) && (member->conference->cdr_event_mode == CDRE_NONE)) return;
np = switch_core_alloc(member->conference->pool, sizeof(*np));
np->next = member->conference->cdr_nodes;
@ -857,6 +861,8 @@ static void conference_cdr_rejected(conference_obj_t *conference, switch_channel
conference_cdr_reject_t *rp;
switch_caller_profile_t *cp;
if (zstr(conference->log_dir) && (conference->cdr_event_mode == CDRE_NONE)) return;
rp = switch_core_alloc(conference->pool, sizeof(*rp));
rp->next = conference->cdr_rejected;