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

Merge pull request #640 in FS/freeswitch from ~VIPKILLA/freeswitch-eschmidbauer:FS-8668 to master 

* commit 'f2fcfe1a75833cf0c5e9b599e12169674460351a':
  FS-8668: allow channel variable prefix-a-leg to override global setting in mod_xml_cdr
This commit is contained in:
Mike Jerris 2016-02-09 10:57:55 -06:00
parent eea9f03ddd f2fcfe1a75
commit 809d5bd2d5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
View File

@ -26,6 +26,7 @@
* Brian West <brian@freeswitch.org>
* Bret McDanel <trixter AT 0xdecafbad.com>
* Justin Cassidy <xachenant@hotmail.com>
* Emmanuel Schmidbauer <eschmidbauer@gmail.com>
*
* mod_xml_cdr.c -- XML CDR Module to files or curl
*
@ -200,6 +201,8 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
int is_b;
const char *a_prefix = "";
char url_joiner = '?';
int prefix_a;
const char *prefix_a_var = NULL;
if (globals.shutdown) {
return SWITCH_STATUS_SUCCESS;
@ -212,7 +215,14 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
return SWITCH_STATUS_SUCCESS;
}
}
if (!is_b && globals.prefix_a)
// channel variable can over-ride global setting "prefix-a-leg"
if ((prefix_a_var = switch_channel_get_variable(channel, "prefix-a-leg"))) {
prefix_a = switch_true(prefix_a_var);
} else {
prefix_a = globals.prefix_a;
}
if (!is_b && prefix_a)
a_prefix = "a_";
if (switch_ivr_generate_xml_cdr(session, &cdr) != SWITCH_STATUS_SUCCESS) {