Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (17323 => 17324)
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-16 15:01:00 UTC (rev 17324)
@@ -2319,7 +2319,7 @@
#define SIMPLIFY_SYNTAX "<uuid>"
SWITCH_STANDARD_API(uuid_simplify_function)
{
- switch_status_t status = SWITCH_STATUS_SUCCESS;
+ switch_status_t status = SWITCH_STATUS_FALSE;
if (zstr(cmd)) {
stream->write_function(stream, "-USAGE: %s\n", SIMPLIFY_SYNTAX);
@@ -2347,22 +2347,28 @@
}
-#define AUTOANSWER_SYNTAX "<uuid>"
-SWITCH_STANDARD_API(uuid_autoanswer_function)
+#define PHONE_EVENT_SYNTAX "<uuid>"
+SWITCH_STANDARD_API(uuid_phone_event_function)
{
- switch_status_t status = SWITCH_STATUS_SUCCESS;
+ switch_status_t status = SWITCH_STATUS_FALSE;
+ char *mycmd = NULL, *argv[2] = { 0 };
+ int argc = 0;
- if (zstr(cmd)) {
- stream->write_function(stream, "-USAGE: %s\n", AUTOANSWER_SYNTAX);
+ if (!zstr(cmd) && (mycmd = strdup(cmd))) {
+ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ }
+
+ if (argc < 1) {
+ stream->write_function(stream, "-USAGE: %s\n", PHONE_EVENT_SYNTAX);
} else {
switch_core_session_message_t msg = { 0 };
switch_core_session_t *lsession = NULL;
- msg.message_id = SWITCH_MESSAGE_INDICATE_AUTOANSWER;
- msg.string_arg = cmd;
+ msg.message_id = SWITCH_MESSAGE_INDICATE_PHONE_EVENT;
+ msg.string_arg = argv[1];
msg.from = __FILE__;
- if ((lsession = switch_core_session_locate(cmd))) {
+ if ((lsession = switch_core_session_locate(argv[0]))) {
status = switch_core_session_receive_message(lsession, &msg);
switch_core_session_rwunlock(lsession);
}
@@ -2374,6 +2380,8 @@
stream->write_function(stream, "-ERR Operation Failed\n");
}
+ switch_safe_free(mycmd);
+
return SWITCH_STATUS_SUCCESS;
}
@@ -4233,7 +4241,6 @@
SWITCH_ADD_API(commands_api_interface, "user_data", "find user data", user_data_function, "<user>@<domain> [var|param|attr] <name>");
SWITCH_ADD_API(commands_api_interface, "user_exists", "find a user", user_exists_function, "<key> <user> <domain>");
SWITCH_ADD_API(commands_api_interface, "uuid_audio", "uuid_audio", session_audio_function, AUDIO_SYNTAX);
- SWITCH_ADD_API(commands_api_interface, "uuid_autoanswer", "Force a ringing channel offhook", uuid_autoanswer_function, AUTOANSWER_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "uuid_break", "Break", break_function, BREAK_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, "");
SWITCH_ADD_API(commands_api_interface, "uuid_broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX);
@@ -4251,6 +4258,7 @@
SWITCH_ADD_API(commands_api_interface, "uuid_loglevel", "set loglevel on session", uuid_loglevel, UUID_LOGLEVEL_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "uuid_park", "Park Channel", park_function, PARK_SYNTAX);
+ SWITCH_ADD_API(commands_api_interface, "uuid_phone_event", "Send and event to the phone", uuid_phone_event_function, PHONE_EVENT_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "uuid_preprocess", "Pre-process Channel", preprocess_function, PREPROCESS_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "uuid_record", "session record", session_record_function, SESS_REC_SYNTAX);
SWITCH_ADD_API(commands_api_interface, "uuid_recv_dtmf", "receive dtmf digits", uuid_recv_dtmf_function, UUID_RECV_DTMF_SYNTAX);
@@ -4332,7 +4340,6 @@
switch_console_set_complete("add uuid_audio ::console::list_uuid start write mute");
switch_console_set_complete("add uuid_audio ::console::list_uuid start write level");
switch_console_set_complete("add uuid_audio ::console::list_uuid stop");
- switch_console_set_complete("add uuid_autoanswer ::console::list_uuid");
switch_console_set_complete("add uuid_break ::console::list_uuid all");
switch_console_set_complete("add uuid_break ::console::list_uuid both");
switch_console_set_complete("add uuid_bridge ::console::list_uuid ::console::list_uuid");
@@ -4358,6 +4365,8 @@
switch_console_set_complete("add uuid_loglevel ::console::list_uuid debug");
switch_console_set_complete("add uuid_media ::console::list_uuid");
switch_console_set_complete("add uuid_park ::console::list_uuid");
+ switch_console_set_complete("add uuid_phone_event ::console::list_uuid talk");
+ switch_console_set_complete("add uuid_phone_event ::console::list_uuid hold");
switch_console_set_complete("add uuid_preprocess ::console::list_uuid");
switch_console_set_complete("add uuid_record ::console::list_uuid");
switch_console_set_complete("add uuid_recv_dtmf ::console::list_uuid");
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (17323 => 17324)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-04-16 15:01:00 UTC (rev 17324)
@@ -1496,9 +1496,17 @@
}
break;
- case SWITCH_MESSAGE_INDICATE_AUTOANSWER:
+ case SWITCH_MESSAGE_INDICATE_PHONE_EVENT:
{
- nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), NUTAG_SUBSTATE(nua_substate_active), SIPTAG_EVENT_STR("talk"), TAG_END());
+ const char *event = "talk";
+ if (!zstr(msg->string_arg) && strcasecmp(msg->string_arg, event)) {
+ if (!strcasecmp(msg->string_arg, "hold")) {
+ event = "hold";
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Invalid event.\n");
+ }
+ }
+ nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), NUTAG_SUBSTATE(nua_substate_active), SIPTAG_EVENT_STR(event), TAG_END());
}
break;
case SWITCH_MESSAGE_INDICATE_SIMPLIFY:
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17323 => 17324)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-16 14:35:41 UTC (rev 17323)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-04-16 15:01:00 UTC (rev 17324)
@@ -1371,6 +1371,7 @@
NUTAG_ALLOW("INFO"),
NUTAG_ALLOW("NOTIFY"),
NUTAG_ALLOW_EVENTS("talk"),
+ NUTAG_ALLOW_EVENTS("hold"),
NUTAG_SESSION_TIMER(profile->session_timeout),
NTATAG_MAX_PROCEEDING(profile->max_proceeding),
TAG_IF(profile->pres_type, NUTAG_ALLOW("PUBLISH")),