char *input;
char *string;
char *value;
+ switch_digit_action_target_t target;
switch_core_session_t *session;
};
char *string = act->string;
switch_channel_t *channel;
switch_core_session_t *use_session = act->session;
-
- if (switch_ivr_dmachine_get_target(match->dmachine) == DIGIT_TARGET_PEER) {
+ int x = 0;
+ if (switch_ivr_dmachine_get_target(match->dmachine) == DIGIT_TARGET_PEER || act->target == DIGIT_TARGET_PEER || act->target == DIGIT_TARGET_BOTH) {
if (switch_core_session_get_partner(act->session, &use_session) != SWITCH_STATUS_SUCCESS) {
use_session = act->session;
}
}
+ top:
+ x++;
+
+ string = act->string;
+ exec = 0;
+
channel = switch_core_session_get_channel(use_session);
switch_channel_set_variable(channel, "last_matching_digits", match->match_digits);
if (exec) {
char *cmd = switch_core_session_sprintf(use_session, "%s::%s", string, act->value);
- switch_ivr_broadcast_in_thread(use_session, cmd, SMF_ECHO_ALEG|SMF_HOLD_BLEG);
+ switch_ivr_broadcast_in_thread(use_session, cmd, SMF_ECHO_ALEG | (act->target == DIGIT_TARGET_BOTH ? 0 : SMF_HOLD_BLEG));
}
if (use_session != act->session) {
switch_core_session_rwunlock(use_session);
- }
+ if (act->target == DIGIT_TARGET_BOTH) {
+ use_session = act->session;
+ goto top;
+ }
+ }
return SWITCH_STATUS_SUCCESS;
}
-#define CLEAR_DIGIT_ACTION_USAGE "<realm>|all"
+static switch_digit_action_target_t str2target(const char *target_str)
+{
+ if (!strcasecmp(target_str, "peer")) {
+ return DIGIT_TARGET_PEER;
+ }
+
+ if (!strcasecmp(target_str, "both")) {
+ return DIGIT_TARGET_BOTH;
+ }
+
+ return DIGIT_TARGET_SELF;
+}
+
+#define CLEAR_DIGIT_ACTION_USAGE "<realm>|all[,target]"
SWITCH_STANDARD_APP(clear_digit_action_function)
{
//switch_channel_t *channel = switch_core_session_get_channel(session);
switch_ivr_dmachine_t *dmachine;
- char *realm = (char *) data;
+ char *realm = switch_core_session_strdup(session, data);
+ char *target_str;
+ switch_digit_action_target_t target = DIGIT_TARGET_SELF;
- if ((dmachine = switch_core_session_get_dmachine(session))) {
+ if ((target_str = strchr(realm, ' '))) {
+ *target_str++ = '\0';
+ target = str2target(target_str);
+ }
+
+
+ if ((dmachine = switch_core_session_get_dmachine(session, target))) {
if (zstr(realm) || !strcasecmp(realm, "all")) {
- switch_core_session_set_dmachine(session, NULL);
+ switch_core_session_set_dmachine(session, NULL, target);
switch_ivr_dmachine_destroy(&dmachine);
} else {
switch_ivr_dmachine_clear_realm(dmachine, realm);
}
}
-#define DIGIT_ACTION_SET_REALM_USAGE "<realm>"
+#define DIGIT_ACTION_SET_REALM_USAGE "<realm>[,<target>]"
SWITCH_STANDARD_APP(digit_action_set_realm_function)
{
switch_ivr_dmachine_t *dmachine;
- char *realm = (char *) data;
+ char *realm = switch_core_session_strdup(session, data);
+ char *target_str;
+ switch_digit_action_target_t target = DIGIT_TARGET_SELF;
+
+ if ((target_str = strchr(realm, ' '))) {
+ *target_str++ = '\0';
+ target = str2target(target_str);
+ }
if (zstr(data)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Syntax Error, USAGE %s\n", DIGIT_ACTION_SET_REALM_USAGE);
return;
}
- if ((dmachine = switch_core_session_get_dmachine(session))) {
+ if ((dmachine = switch_core_session_get_dmachine(session, target))) {
switch_ivr_dmachine_set_realm(dmachine, realm);
}
}
-#define DIGIT_ACTION_SET_TARGET_USAGE "<target>"
-SWITCH_STANDARD_APP(digit_action_set_target_function)
+static void bind_to_session(switch_core_session_t *session,
+ const char *arg0, const char *arg1, const char *arg2, const char *arg3,
+ switch_digit_action_target_t target, switch_digit_action_target_t bind_target)
{
+ struct action_binding *act;
switch_ivr_dmachine_t *dmachine;
- char *target_str = (char *) data;
+ switch_channel_t *channel = switch_core_session_get_channel(session);
- if (zstr(data)) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Syntax Error, USAGE %s\n", DIGIT_ACTION_SET_TARGET_USAGE);
- return;
- }
-
- if ((dmachine = switch_core_session_get_dmachine(session))) {
- switch_digit_action_target_t target = DIGIT_TARGET_SELF;
+ if (!(dmachine = switch_core_session_get_dmachine(session, target))) {
+ uint32_t digit_timeout = 1500;
+ uint32_t input_timeout = 0;
+ const char *var;
+ uint32_t tmp;
- if (!strcasecmp(target_str, "peer")) {
- target = DIGIT_TARGET_PEER;
+ if ((var = switch_channel_get_variable(channel, "bind_digit_digit_timeout"))) {
+ tmp = (uint32_t) atol(var);
+ if (tmp < 0) tmp = 0;
+ digit_timeout = tmp;
}
-
- switch_ivr_dmachine_set_target(dmachine, target);
+
+ if ((var = switch_channel_get_variable(channel, "bind_digit_input_timeout"))) {
+ tmp = (uint32_t) atol(var);
+ if (tmp < 0) tmp = 0;
+ input_timeout = tmp;
+ }
+
+ switch_ivr_dmachine_create(&dmachine, "DPTOOLS", NULL, digit_timeout, input_timeout, NULL, digit_nomatch_action_callback, session);
+ switch_core_session_set_dmachine(session, dmachine, target);
}
+
+ act = switch_core_session_alloc(session, sizeof(*act));
+ act->realm = switch_core_session_strdup(session, arg0);
+ act->input = switch_core_session_strdup(session, arg1);
+ act->string = switch_core_session_strdup(session, arg2);
+ act->value = switch_core_session_strdup(session, arg3);
+ act->target = bind_target;
+ act->session = session;
+ switch_ivr_dmachine_bind(dmachine, act->realm, act->input, 0, digit_action_callback, act);
}
-#define BIND_DIGIT_ACTION_USAGE "<realm>,<digits|~regex>,<string>,<value>"
+#define BIND_DIGIT_ACTION_USAGE "<realm>,<digits|~regex>,<string>,<value>[,<direction>][,<event direction>]"
SWITCH_STANDARD_APP(bind_digit_action_function)
{
- switch_channel_t *channel = switch_core_session_get_channel(session);
- switch_ivr_dmachine_t *dmachine;
+
char *mydata;
int argc = 0;
- char *argv[5] = { 0 };
- struct action_binding *act;
+ char *argv[6] = { 0 };
+ switch_digit_action_target_t target, bind_target;
+ char *target_str = "self", *bind_target_str = "self";
if (zstr(data)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Syntax Error, USAGE %s\n", BIND_DIGIT_ACTION_USAGE);
return;
}
-
- if (!(dmachine = switch_core_session_get_dmachine(session))) {
- uint32_t digit_timeout = 1500;
- uint32_t input_timeout = 0;
- const char *var;
- uint32_t tmp;
+ if (argv[4]) {
+ target_str = argv[4];
+ }
- if ((var = switch_channel_get_variable(channel, "bind_digit_digit_timeout"))) {
- tmp = (uint32_t) atol(var);
- if (tmp < 0) tmp = 0;
- digit_timeout = tmp;
- }
-
- if ((var = switch_channel_get_variable(channel, "bind_digit_input_timeout"))) {
- tmp = (uint32_t) atol(var);
- if (tmp < 0) tmp = 0;
- input_timeout = tmp;
- }
-
- switch_ivr_dmachine_create(&dmachine, "DPTOOLS", NULL, digit_timeout, input_timeout, NULL, digit_nomatch_action_callback, session);
- switch_core_session_set_dmachine(session, dmachine);
+ if (argv[5]) {
+ bind_target_str = argv[5];
}
-
- act = switch_core_session_alloc(session, sizeof(*act));
- act->realm = argv[0];
- act->input = argv[1];
- act->string = argv[2];
- act->value = argv[3];
- act->session = session;
+ target = str2target(target_str);
+ bind_target = str2target(bind_target_str);
- switch_ivr_dmachine_bind(dmachine, act->realm, act->input, 0, digit_action_callback, act);
-}
+ switch(target) {
+ case DIGIT_TARGET_PEER:
+ bind_to_session(session, argv[0], argv[1], argv[2], argv[3], DIGIT_TARGET_PEER, bind_target);
+ break;
+ case DIGIT_TARGET_BOTH:
+ bind_to_session(session, argv[0], argv[1], argv[2], argv[3], DIGIT_TARGET_PEER, bind_target);
+ bind_to_session(session, argv[0], argv[1], argv[2], argv[3], DIGIT_TARGET_SELF, bind_target);
+ break;
+ default:
+ bind_to_session(session, argv[0], argv[1], argv[2], argv[3], DIGIT_TARGET_SELF, bind_target);
+ break;
+ }
+}
#define DETECT_SPEECH_SYNTAX "<mod_name> <gram_name> <gram_path> [<addr>] OR grammar <gram_name> [<path>] OR nogrammar <gram_name> OR grammaron/grammaroff <gram_name> OR grammarsalloff OR pause OR resume OR start_input_timers OR stop OR param <name> <value>"
SWITCH_STANDARD_APP(detect_speech_function)
SWITCH_ADD_APP(app_interface, "digit_action_set_realm", "change binding realm", "",
digit_action_set_realm_function, DIGIT_ACTION_SET_REALM_USAGE, SAF_SUPPORT_NOMEDIA);
- SWITCH_ADD_APP(app_interface, "digit_action_set_target", "change binding target", "",
- digit_action_set_target_function, DIGIT_ACTION_SET_TARGET_USAGE, SAF_SUPPORT_NOMEDIA);
-
-
SWITCH_ADD_APP(app_interface, "privacy", "Set privacy on calls", "Set caller privacy on calls.", privacy_function, "off|on|name|full|number",
SAF_SUPPORT_NOMEDIA);
int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0;
switch_codec_implementation_t codec_impl;
unsigned int flag = 0;
+ int i;
switch_assert(session != NULL);
top:
- if (session->dmachine && !switch_channel_test_flag(session->channel, CF_BROADCAST)) {
- switch_ivr_dmachine_ping(session->dmachine, NULL);
+ for(i = 0; i < 2; i++) {
+ if (session->dmachine[i] && !switch_channel_test_flag(session->channel, CF_BROADCAST)) {
+ switch_ivr_dmachine_ping(session->dmachine[i], NULL);
+ }
}
if (switch_channel_down(session->channel) || !switch_core_codec_ready(session->read_codec)) {
switch_status_t status;
switch_dtmf_t new_dtmf;
int fed = 0;
-
+
if (switch_channel_down(session->channel)) {
return SWITCH_STATUS_FALSE;
}
}
if (!switch_test_flag(dtmf, DTMF_FLAG_SKIP_PROCESS)) {
- if (session->dmachine && switch_ivr_dmachine_get_target(session->dmachine) == DIGIT_TARGET_SELF &&
- !switch_channel_test_flag(session->channel, CF_BROADCAST)) {
+ if (session->dmachine[0] && !switch_channel_test_flag(session->channel, CF_BROADCAST)) {
char str[2] = { dtmf->digit, '\0' };
- switch_ivr_dmachine_feed(session->dmachine, str, NULL);
+ switch_ivr_dmachine_feed(session->dmachine[0], str, NULL);
fed = 1;
}
}
if (!switch_test_flag(dtmf, DTMF_FLAG_SKIP_PROCESS)) {
- if (session->dmachine && switch_ivr_dmachine_get_target(session->dmachine) == DIGIT_TARGET_PEER &&
- !switch_channel_test_flag(session->channel, CF_BROADCAST)) {
+ if (session->dmachine[1] && !switch_channel_test_flag(session->channel, CF_BROADCAST)) {
char str[2] = { new_dtmf.digit, '\0' };
- switch_ivr_dmachine_feed(session->dmachine, str, NULL);
+ switch_ivr_dmachine_feed(session->dmachine[1], str, NULL);
return SWITCH_STATUS_SUCCESS;
}
}
projects / thirdparty / freeswitch.git / commitdiff
