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

FS-8668: allow channel variable prefix-a-leg to override global setting in mod_xml_cdr

This commit is contained in:
Emmanuel Schmidbauer 2015-12-16 07:47:20 -08:00
parent 84b23b8747
commit f2fcfe1a75
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> * Brian West <brian@freeswitch.org>
* Bret McDanel <trixter AT 0xdecafbad.com> * Bret McDanel <trixter AT 0xdecafbad.com>
* Justin Cassidy <xachenant@hotmail.com> * Justin Cassidy <xachenant@hotmail.com>
* Emmanuel Schmidbauer <eschmidbauer@gmail.com>
* *
* mod_xml_cdr.c -- XML CDR Module to files or curl * 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; int is_b;
const char *a_prefix = ""; const char *a_prefix = "";
char url_joiner = '?'; char url_joiner = '?';
int prefix_a;
const char *prefix_a_var = NULL;
if (globals.shutdown) { if (globals.shutdown) {
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
@ -212,7 +215,14 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
return SWITCH_STATUS_SUCCESS; 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_"; a_prefix = "a_";
if (switch_ivr_generate_xml_cdr(session, &cdr) != SWITCH_STATUS_SUCCESS) { if (switch_ivr_generate_xml_cdr(session, &cdr) != SWITCH_STATUS_SUCCESS) {