Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

libs/freetdm/mod_freetdm/tdm.c

@@ -650,6 +650,9 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
     ctdm_private_t *tech_pvt = switch_core_session_get_private(session);
     
     if (!zstr(command)) {
+                
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeTDM received %s command \n",command);
+		
 		if (!strcasecmp(command, kPREBUFFER_LEN)) {
 	        const char *szval = switch_event_get_header(event, kPREBUFFER_LEN);
 	        int val = !zstr(szval) ? atoi(szval) : 0;
@@ -664,10 +667,15 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
 		} else if (!strcasecmp(command, kECHOCANCEL)) {
 			const char *szval = switch_event_get_header(event, kECHOCANCEL);
 			int enabled = !!switch_true(szval);
+		
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeTDM sending echo cancel [%s] command \n",enabled ? "enable" : "disable");
 			
 			if (FTDM_SUCCESS != ftdm_channel_command(tech_pvt->ftdm_channel, enabled ? FTDM_COMMAND_ENABLE_ECHOCANCEL : FTDM_COMMAND_DISABLE_ECHOCANCEL, NULL)) {
                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to %s echo cancellation.\n", enabled ? "enable" : "disable");
 			}
+
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeTDM received unknown command [%s] \n",command);
 		}
     }
     

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c

@@ -423,6 +423,9 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 					/**********************************************************************/
 			}
 			check_span_oob_events(ftdmspan);
+
+			/* signal the core that sig events are queued for processing */
+			ftdm_span_trigger_signals(ftdmspan);
 		}
 		goto ftdm_sangoma_ss7_stop;
 	}

src/mod/endpoints/mod_media_gateway/mod_media_gateway.c

@@ -39,13 +39,13 @@ SWITCH_STANDARD_APP(mg_notify_function)
     if (!strcmp(data, "cng")) {
         mg_send_t38_cng_notify(term->profile, term->name);
         switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sent CNG notify\n");
-		/* Disable echo cancellation */
-		mg_term_set_ec(term, 0);
+	/* Disable echo cancellation */
+	mg_term_set_ec(term, 0);
     } else if (!strcmp(data, "ced")) {
-		mg_send_t38_ans_notify(term->profile, term->name);
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sent CED notify\n");
-		/* Disable echo cancellation */
-		mg_term_set_ec(term, 0);
+	mg_send_t38_ans_notify(term->profile, term->name);
+	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sent CED notify\n");
+	/* Disable echo cancellation */
+	mg_term_set_ec(term, 0);
     }
 }