kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-05 14:17:21 +00:00
Code Issues Projects Releases Wiki Activity

make the 'field' col expand vars and funcs the same way as the runtime so they are uniform

Browse Source 
${variable}
$function(arg)



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3581 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-12-08 15:15:54 +00:00
parent 8df4913d01
commit ed298ed2db
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
View File

@ -53,6 +53,7 @@ static int parse_exten(switch_core_session_t *session, switch_xml_t xexten, swit
switch_channel_t *channel; switch_channel_t *channel;
char *exten_name = (char *) switch_xml_attr_soft(xexten, "name"); char *exten_name = (char *) switch_xml_attr_soft(xexten, "name");
int proceed = 0; int proceed = 0;
switch_stream_handle_t stream = {0};
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
caller_profile = switch_channel_get_caller_profile(channel); caller_profile = switch_channel_get_caller_profile(channel);
@ -62,7 +63,6 @@ static int parse_exten(switch_core_session_t *session, switch_xml_t xexten, swit
char *do_break_a = NULL; char *do_break_a = NULL;
char *expression = NULL; char *expression = NULL;
char *field_data = NULL; char *field_data = NULL;
char retbuf[1024] = "";
pcre *re = NULL; pcre *re = NULL;
int ovector[30]; int ovector[30];
break_t do_break_i = BREAK_ON_FALSE; break_t do_break_i = BREAK_ON_FALSE;
@ -85,24 +85,33 @@ static int parse_exten(switch_core_session_t *session, switch_xml_t xexten, swit
if (field) { if (field) {
if (*field == '$') { if (*field == '$') {
field_data = switch_channel_get_variable(channel, field + 1);
} else if (*field == '%') {
switch_stream_handle_t stream = {0};
char *cmd = switch_core_session_strdup(session, field + 1); char *cmd = switch_core_session_strdup(session, field + 1);
char *arg; char *e, *arg;
field = cmd;
SWITCH_STANDARD_STREAM(stream); field_data = "";
if (cmd) { if (*field == '{') {
if ((arg = strchr(cmd, ' '))) { field++;
*arg++ = '\0'; if ((e = strchr(field, '}'))) {
} *e = '\0';
if (switch_api_execute(cmd, arg, session, &stream) == SWITCH_STATUS_SUCCESS) { field_data = switch_channel_get_variable(channel, field);
field_data = retbuf; }
} } else {
free(stream.data); switch_safe_free(stream.data);
} memset(&stream, 0, sizeof(stream));
} else { SWITCH_STANDARD_STREAM(stream);
if ((arg = strchr(cmd, '('))) {
*arg++ = '\0';
if ((e = strchr(arg, ')'))) {
*e = '\0';
if (switch_api_execute(cmd, arg, session, &stream) == SWITCH_STATUS_SUCCESS) {
field_data = stream.data;
}
}
}
}
} else {
field_data = switch_caller_get_field_by_name(caller_profile, field); field_data = switch_caller_get_field_by_name(caller_profile, field);
} }
if (!field_data) { if (!field_data) {
@ -120,7 +129,8 @@ static int parse_exten(switch_core_session_t *session, switch_xml_t xexten, swit
if ((*extension = if ((*extension =
switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) { switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n");
return 0; proceed = 0;
goto done;
} }
} }
@ -154,19 +164,23 @@ static int parse_exten(switch_core_session_t *session, switch_xml_t xexten, swit
if ((*extension = if ((*extension =
switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) { switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n");
return 0; proceed = 0;
goto done;
} }
} }
switch_caller_extension_add_application(session, *extension, application, app_data); switch_caller_extension_add_application(session, *extension, application, app_data);
} }
switch_clean_re(re); switch_clean_re(re);
if (do_break_i == BREAK_ON_TRUE || do_break_i == BREAK_ALWAYS) { if (do_break_i == BREAK_ON_TRUE || do_break_i == BREAK_ALWAYS) {
break; break;
} }
} }
done:
switch_safe_free(stream.data);
return proceed; return proceed;
} }