[Freeswitch-trunk] [commit] r3877 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia

[Freeswitch SVN]

Author: anthm
Date: Sun Dec 31 14:54:16 2006
New Revision: 3877

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/switch_ivr.c

Log:
fix messed up switch statement

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Sun Dec 31 14:54:16 2006
@@ -4441,19 +4441,30 @@
 	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 @@
 	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 @@
 	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:

Modified: freeswitch/trunk/src/switch_ivr.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr.c	(original)
+++ freeswitch/trunk/src/switch_ivr.c	Sun Dec 31 14:54:16 2006
@@ -3306,17 +3306,6 @@
 				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;