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

Merge pull request #580 in FS/freeswitch from ~IAM/freeswitch:bugfix/FS-8416 to master 

* commit 'b9278a8f0d369572fe7319a4fdf12d8c0714cba1':
  FS-8416: Regex feature in param field
This commit is contained in:
William King 2015-11-09 13:57:05 -06:00
parent 4cd0288034 b9278a8f0d
commit cf2528dbc3
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
View File

@ -365,6 +365,7 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
char *skip_if_set = (char *) switch_xml_attr(param, "skip_if_set");
char *format = (char *) switch_xml_attr(param, "format");
char *other_leg = (char *) switch_xml_attr(param, "other_leg");
char *regex = (char *) switch_xml_attr(param, "regex");
attribute = rc_dict_findattr(handle, var);
@ -528,6 +529,24 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
}
}
if ( regex && val ) {
switch_regex_t *re = NULL;
int ovector[30];
int proceed;
char replace[1024] = "";
proceed = 0;
proceed = switch_regex_perform(val, regex, &re, ovector, sizeof(ovector) / sizeof(ovector[0]));
if ( proceed > 0 ) {
switch_regex_copy_substring(val, ovector, proceed, proceed - 1, replace, sizeof(replace));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "original value: %s, regex: %s, result: %s\n", val, regex, replace);
val = replace;
}
else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "original value: %s, regex: %s, result: nomatch, value left intact\n", val, regex);
}
switch_regex_safe_free(re);
}
if ( val == NULL && val_default != NULL) {
av_value = switch_mprintf(format, val_default);
} else {