presence tweaks

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 1ff420d9bf5f3c0f09e84425c5d943082f8bf826..de5560d875a8ea426f8fb9bca3be1a8dcdd86f00 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -1283,7 +1283,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
                switch_stream_handle_t stream = { 0 };
                const char *direction = switch_str_nil(switch_event_get_header(helper->event, "presence-call-direction"));
                const char *uuid = switch_str_nil(switch_event_get_header(helper->event, "unique-id"));
-               const char *state = switch_str_nil(switch_event_get_header(helper->event, "channel-state"));
                const char *event_status = switch_str_nil(switch_event_get_header(helper->event, "status"));
                const char *astate = switch_str_nil(switch_event_get_header(helper->event, "astate"));
                const char *answer_state = switch_str_nil(switch_event_get_header(helper->event, "answer-state"));
@@ -1314,11 +1313,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
                        dft_state = "confirmed";
                }
 
-               if (!strcasecmp(state, "cs_reporting")) {
-                       goto end;
-               }
-
-
                if (is_dialog) {
                        stream.write_function(&stream,
                                                                  "<?xml version=\"1.0\"?>\n"
@@ -1442,7 +1436,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
                                }
 
                                if (direction) {
-                                       what = !strcasecmp(direction, "outbound") ? "Call" : "Ring";
+                                       what = strcasecmp(direction, "outbound") ? "Call" : "Ring";
                                }
 
                                if (!strcmp(astate, "early")) {
@@ -2501,20 +2495,22 @@ void sofia_presence_handle_sip_i_publish(nua_t *nua, sofia_profile_t *profile, n
                                exp_delta = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
                                exp = (long) switch_epoch_time_now(NULL) + exp_delta;
 
+                               
                                if ((sql =
                                         switch_mprintf("delete from sip_presence where sip_user='%q' and sip_host='%q' "
                                                                        " and profile_name='%q' and hostname='%q'", from_user, from_host, profile->name, mod_sofia_globals.hostname))) {
                                        sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
                                }
-
+                                       
                                if ((sql =
                                         switch_mprintf("insert into sip_presence (sip_user, sip_host, status, rpid, expires, user_agent,"
                                                                        " profile_name, hostname, open_closed) "
                                                                        "values ('%q','%q','%q','%q',%ld,'%q','%q','%q','%q')",
                                                                        from_user, from_host, note_txt, rpid, exp, full_agent, profile->name, mod_sofia_globals.hostname, open_closed))) {
-
+                                               
                                        sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
                                }
+                               
 
                                event_type = sip_header_as_string(profile->home, (void *) sip->sip_event);
                                

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 0a358dfd0b1a00558fad167d774a50200c0fd263..d1308a1e9f68649e6f6e4166933f4750a19b4ee7 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1500,7 +1500,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(
 
        switch_channel_clear_flag(channel, CF_TAGGED);
 
-       if (channel->state >= CS_ROUTING && channel->state <= CS_HANGUP) {
+       if (channel->state == CS_ROUTING || channel->state == CS_HANGUP) {
                switch_channel_presence(channel, "unknown", (const char *) state_names[state], NULL);
        }
 
@@ -2388,7 +2388,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi
                        switch_core_session_execute_application(channel->session, app, arg);
                }
 
-
                return SWITCH_STATUS_SUCCESS;
        }
 
@@ -2450,6 +2449,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
                        switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK);
                        switch_core_session_rwunlock(other_session);
                }
+
                return SWITCH_STATUS_SUCCESS;
        }