fix messed up switch statement

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

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index df51bf31ebde64a07944d0cc1a7314da37662c87..6730467bae1e8ee0da184eebbce7caa072b0d1d3 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -4441,19 +4441,30 @@ static void event_callback(nua_event_t event,
        case nua_r_shutdown:    
        case nua_r_get_params:    
        case nua_r_invite:
+    case nua_r_unregister:
+    case nua_r_options:
+       case nua_i_fork:
+       case nua_r_info:
+    case nua_r_bye:
+       case nua_i_bye:
+       case nua_r_unsubscribe:
+       case nua_r_publish:
+       case nua_r_message:
+       case nua_r_notify:
+    case nua_i_notify:
+       case nua_i_cancel:
+       case nua_i_error:
+       case nua_i_active:
+       case nua_i_ack:
+       case nua_i_terminated:
+       case nua_r_set_params:
         break;
        case nua_r_register:
                sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags);
                break;
-    case nua_r_unregister:
-               break;
-    case nua_r_options:
-               break;
        case nua_i_options:
                sip_i_options(status, phrase, nua, profile, nh, sofia_private, sip, tags);
                break;
-       case nua_i_fork:
-               break;
     case nua_i_invite:
         if (!session) {
             sip_i_invite(nua, profile, nh, sofia_private, sip, tags);
@@ -4470,13 +4481,9 @@ static void event_callback(nua_event_t event,
        case nua_i_state:
                sip_i_state(status, phrase, nua, profile, nh, sofia_private, sip, tags);
                break;
-    case nua_r_bye:
-       case nua_i_bye:
        case nua_i_message:
                sip_i_message(status, phrase, nua, profile, nh, sofia_private, sip, tags);
                break;
-       case nua_r_info:
-               break;
        case nua_i_info:
                sip_i_info(nua, profile, nh, session, sip, tags);
                break;
@@ -4493,28 +4500,14 @@ static void event_callback(nua_event_t event,
        case nua_i_subscribe:
                sip_i_subscribe(status, phrase, nua, profile, nh, sofia_private, sip, tags);
                break;
-       case nua_r_unsubscribe:
-       case nua_r_publish:
-       case nua_r_message:
-       case nua_r_notify:
-    case nua_i_notify:
-       case nua_i_cancel:
-       case nua_i_error:
-       case nua_i_active:
-       case nua_i_ack:
-       case nua_i_terminated:
-       case nua_r_set_params:
-               break;
-
        default:
-               if (status > 100)
+               if (status > 100) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d: %03d %s\n", 
                                                          nua_event_name (event), event, status, phrase);
-               else
+        } else {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d\n", nua_event_name (event), event);
-       
+        }
                break;
-
        }
 
  done:

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 9d8a994d7be63d9bbcda364cb96dea848a94acb5..2e154cba7c2f36bdafb17ab0a245303bf83f3449 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -3306,17 +3306,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                                switch_event_fire(&event);
                        }
 
-            if (switch_channel_test_flag(caller_channel, CF_TRANSFER) && !switch_channel_test_flag(peer_channel, CF_TRANSFER)) {
-                //switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING);
-                //switch_yield(2000000);
-            }
-
-            if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && switch_channel_test_flag(peer_channel, CF_TRANSFER)) {
-                //switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_CLEARING);
-                //switch_yield(2000000);
-            }
-
-
             this_audio_thread->objs[0] = NULL;
                        this_audio_thread->objs[1] = NULL;
                        this_audio_thread->objs[2] = NULL;