add some more nifty stuff and fix a bug or 2

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3134 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 0ea6c271d748201c82f1fea8c6304be6c021907c..fc31b29461e0b607001dc9bd274b096228fb2633 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -136,6 +136,14 @@ SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel,
                                                                switch_channel_state_t state,
                                                                uint32_t flags);
 
+/*!
+  \brief Fire A presence event for the channel
+  \param channel the channel to initilize
+  \param rpid the rpid if for the icon to use
+  \param status the status message
+*/
+SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status);
+
 /*!
   \brief Uninitalize a channel
   \param channel the channel to uninit

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index bc73f8a178852c1e987d9d71d4098211afb58d0b..7b6f9dc51df132b5ba58b706c25f166ace217597 100644 (file)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -60,6 +60,11 @@ static void sleep_function(switch_core_session_t *session, char *data)
        }
 }
 
+static void eval_function(switch_core_session_t *session, char *data)
+{
+       return;
+}
+
 static void answer_function(switch_core_session_t *session, char *data)
 {
        switch_channel_t *channel;
@@ -165,12 +170,87 @@ static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *s
        return SWITCH_STATUS_SUCCESS;
 }
 
+static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream)
+{
+       switch_event_t *event;
+       char *lbuf, *argv[4];
+       int argc = 0;
+       switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN;
+
+       if ((lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) {
+               if (!strcasecmp(argv[0], "out")) {
+                       type = SWITCH_EVENT_PRESENCE_OUT;
+               } else if (argc != 4) {
+                       stream->write_function(stream, "Invalid");
+                       return SWITCH_STATUS_SUCCESS;
+               }
+               
+               if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) {
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "dp");
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", __FILE__);
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", argv[1]);
+                       if (type == SWITCH_EVENT_PRESENCE_IN) {
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", argv[2]);
+                               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", argv[3]);
+                       }
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+                       switch_event_fire(&event);
+               }
+               stream->write_function(stream, "Event Sent");
+               switch_safe_free(lbuf);
+       } else {
+               stream->write_function(stream, "Invalid");
+       }
+
+       return SWITCH_STATUS_SUCCESS;
+}
+
+
+static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream)
+{
+       char *lbuf, *argv[4];
+       int argc = 0;
+
+       if ((lbuf = strdup(fmt)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) {
+               switch_chat_interface_t *ci;
+               
+               if ((ci = switch_loadable_module_get_chat_interface(argv[0]))) {
+                       ci->chat_send("dp", argv[1], argv[2], "", argv[3], "");
+                       stream->write_function(stream, "Sent");
+               } else {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", argv[0]);
+               }
+       } else {
+               stream->write_function(stream, "Invalid");
+       }
+       
+       return SWITCH_STATUS_SUCCESS;
+}
+
+
+static switch_api_interface_t chat_api_interface = {
+       /*.interface_name */ "chat",
+       /*.desc */ "chat",
+       /*.function */ chat_api_function,
+       /*.syntax */ "<proto>|<from>|<to>|<message>",
+       /*.next */ NULL
+};
+
 static switch_api_interface_t dptools_api_interface = {
        /*.interface_name */ "strftime",
        /*.desc */ "strftime",
        /*.function */ strftime_api_function,
        /*.syntax */ "<format_string>",
-       /*.next */ NULL
+       /*.next */ &chat_api_interface
+};
+
+
+static switch_api_interface_t presence_api_interface = {
+       /*.interface_name */ "presence",
+       /*.desc */ "presence",
+       /*.function */ presence_api_function,
+       /*.syntax */ "<user> <rpid> <message>",
+       /*.next */ &dptools_api_interface
 };
 
 static const switch_application_interface_t set_application_interface = {
@@ -192,13 +272,23 @@ static const switch_application_interface_t answer_application_interface = {
 
 };
 
+static const switch_application_interface_t eval_application_interface = {
+       /*.interface_name */ "eval",
+       /*.application_function */ eval_function,
+       /* long_desc */ "Do Nothing",
+       /* short_desc */ "Do Nothing",
+       /* syntax */ "",
+       /*.next */ &answer_application_interface
+
+};
+
 static const switch_application_interface_t strftime_application_interface = {
        /*.interface_name */ "strftime",
        /*.application_function */ strftime_function,
        /* long_desc */ NULL,
        /* short_desc */ NULL,
        /* syntax */ NULL,
-       /*.next */ &answer_application_interface
+       /*.next */ &eval_application_interface
 
 };
 
@@ -236,7 +326,7 @@ static const switch_loadable_module_interface_t mod_dptools_module_interface = {
        /*.dialplan_interface = */ NULL,
        /*.codec_interface = */ NULL,
        /*.application_interface */ &privacy_application_interface,
-       /*.api_interface */ &dptools_api_interface
+       /*.api_interface */ &presence_api_interface
 };
 
 SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename)

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 0207f87b12a98fd1e33b0974f10c98d912dc6954..71d07fa7e0ba81172d4939da866dc2e026a9bab9 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -305,6 +305,38 @@ SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel,
        return SWITCH_STATUS_SUCCESS;
 }
 
+SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status)
+{
+       char *id = switch_channel_get_variable(channel, "presence_id");
+       switch_event_t *event;
+       switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN;
+
+       if (!status) {
+               type = SWITCH_EVENT_PRESENCE_OUT;
+       }
+
+       if (!id) {
+               return;
+       }
+
+       if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) {
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", __FILE__);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", __FILE__);
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", id);
+               if (type == SWITCH_EVENT_PRESENCE_IN) {
+                       if (!rpid) {
+                               rpid = "unknown";
+                       }
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid);
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", status);
+               }
+               switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+               switch_event_fire(&event);
+       }
+
+}
+
+
 SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, char *varname)
 {
        char *v;
@@ -589,7 +621,9 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
 
 
        if (ok) {
-               
+               if (state > CS_RING) {
+                       switch_channel_presence(channel, "unknown", (char*)state_names[state]);
+               }
                switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_DEBUG, "%s State Change %s -> %s\n", 
                                                  channel->name,
                                                  state_names[last_state], 
@@ -929,6 +963,8 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
                        switch_event_fire(&event);
                }
 
+               switch_channel_presence(channel, "unavailable", switch_channel_cause2str(channel->hangup_cause));
+
                switch_core_session_kill_channel(channel->session, SWITCH_SIG_KILL);
                switch_core_session_signal_state_change(channel->session);
        }

diff --git a/src/switch_core.c b/src/switch_core.c
index 13b074107be3bd57bbf05d88d4c87f47d69391ef..f6993db538f504e1e7f37e7dc620a0d44f3dd76b 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -2536,6 +2536,16 @@ static void switch_core_standard_on_execute(switch_core_session_t *session)
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application-Data", "%s", expanded);
                        switch_event_fire(&event);
                }
+               
+
+               if (switch_channel_get_variable(session->channel, "presence_id")) {
+                       char *arg = switch_mprintf("%s(%s)", extension->current_application->application_name, expanded);
+                       if (arg) {
+                               switch_channel_presence(session->channel, "unknown", arg);
+                               switch_safe_free(arg);
+                       }
+               }
+
                application_interface->application_function(session, expanded);
 
                if (expanded != extension->current_application->application_data) {