expand last patch to do hold as well and rename the command to uuid_phone_event

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index df14f2bfd55d53f91f66f44ba42bd379e0ba49eb..3c624e922ea7b4986ec4e612f07c81d2d2edca02 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -690,7 +690,7 @@ typedef enum {
        SWITCH_MESSAGE_INDICATE_PROXY_MEDIA,
        SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC,
        SWITCH_MESSAGE_INDICATE_APPLICATION_EXEC_COMPLETE,
-       SWITCH_MESSAGE_INDICATE_AUTOANSWER,
+       SWITCH_MESSAGE_INDICATE_PHONE_EVENT,
        SWITCH_MESSAGE_INVALID
 } switch_core_session_message_types_t;
 

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 3be030deedf756b40272db2f22ee6b49fdcea029..6dc2d8c913df946b5f5d967943a76b616c37a994 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -2319,7 +2319,7 @@ SWITCH_STANDARD_API(uuid_display_function)
 #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 @@ SWITCH_STANDARD_API(uuid_simplify_function)
 }
 
 
-#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 @@ SWITCH_STANDARD_API(uuid_autoanswer_function)
                stream->write_function(stream, "-ERR Operation Failed\n");
        }
 
+       switch_safe_free(mycmd);
+
        return SWITCH_STATUS_SUCCESS;
 }
 
@@ -4233,7 +4241,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
        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_MODULE_LOAD_FUNCTION(mod_commands_load)
        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_MODULE_LOAD_FUNCTION(mod_commands_load)
        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_MODULE_LOAD_FUNCTION(mod_commands_load)
        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");

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 91432ab672f052503742514da879f17a35dea7fc..32512b454439a35a5235e0a056f9cfb4f11af744 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1496,9 +1496,17 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                }
                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:

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index df3da21156bdb645d959df00bf6141e15b70f342..6d21074516d73837dac025e388b14db7eff17aad 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1371,6 +1371,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
                                   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")),

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index 46adc7d442eb0ebe0875510df2f6f163dcc73117..69f2492a933aa3ee708146fc66b14e43a97ff5d6 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -555,7 +555,7 @@ static const char *message_names[] = {
        "PROXY_MEDIA",
        "APPLICATION_EXEC",
        "APPLICATION_EXEC_COMPLETE",
-       "AUTOANSWER",
+       "PHONE_EVENT",
        "INVALID"
 };