skinny: improve hangup handling

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index 790eb7836c88644a9894eb3bbcb0957806e02b7d..407aa6549956dea137d8df0f58e940ca19e9af53 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -848,11 +848,22 @@ int channel_on_hangup_callback(void *pArg, int argc, char **argv, char **columnN
                skinny_line_set_state(listener, line_instance, call_id, SKINNY_ON_HOOK);
                send_select_soft_keys(listener, line_instance, call_id, SKINNY_KEY_SET_ON_HOOK, 0xffff);
                send_define_current_time_date(listener);
-               if((call_state == SKINNY_PROCEED) || (call_state == SKINNY_RING_OUT) || (call_state == SKINNY_CONNECTED)) { /* calling parties */
+
+               skinny_log_ls(listener, helper->tech_pvt->session, SWITCH_LOG_DEBUG, 
+                       "channel_on_hangup_callback - cause=%s [%d], call_state = %s [%d]\n", 
+                       switch_channel_cause2str(helper->cause), helper->cause,
+                       skinny_call_state2str(call_state), call_state);
+
+               if ( call_state == SKINNY_RING_OUT && helper->cause == SWITCH_CAUSE_USER_BUSY )
+               {
+                       // don't hang up speaker here
+               }
+               else if((call_state == SKINNY_PROCEED) || (call_state == SKINNY_RING_OUT) || (call_state == SKINNY_CONNECTED)) { /* calling parties */
                        // This is NOT correct, but results in slightly better behavior than before
                        // leaving note here to revisit.
 
-                       //send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
+                       /* re-enabling for testing to bring back bad behavior */
+                       send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
                }
                send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, call_id);
        }
@@ -869,7 +880,7 @@ switch_status_t channel_on_hangup(switch_core_session_t *session)
 
        switch_clear_flag_locked(tech_pvt, TFLAG_IO);
 
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP [%s]\n", 
+       skinny_log_s(session, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP [%s]\n", 
                switch_channel_get_name(channel), switch_channel_cause2str(cause));
 
        helper.tech_pvt= tech_pvt;

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.h b/src/mod/endpoints/mod_skinny/mod_skinny.h
index 717bcd0378cd254167f30ffc96d2766efecfb7b1..76ca8017ac7f86980e84b9b259873029ec825d8a 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.h
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.h
@@ -61,6 +61,10 @@
     "[%s:%d @ %s:%d] " _fmt, skinny_undef_str(listener->device_name), listener->device_instance, skinny_undef_str(listener->remote_ip), \
     listener->remote_port)
 
+#define skinny_log_s(session, level, _fmt, ...) switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), level, \
+    _fmt, __VA_ARGS__)
+
+
 /*****************************************************************************/
 /* MODULE TYPES */
 /*****************************************************************************/