Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder

libs/freetdm/src/ftdm_io.c

@@ -4051,7 +4051,7 @@ done:
 	return status;
 }
 
-FT_DECLARE(ftdm_iterator_t) *ftdm_get_iterator(ftdm_iterator_type_t type, ftdm_iterator_t *iter)
+FT_DECLARE(ftdm_iterator_t *) ftdm_get_iterator(ftdm_iterator_type_t type, ftdm_iterator_t *iter)
 {
 	int allocated = 0;
 	if (iter) {

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c

@@ -603,6 +603,7 @@ static ftdm_status_t ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdm
 	ftdm_sigmsg_t		sigev;
 	ftdm_channel_state_t initial_state;
 	sngisdn_chan_data_t *sngisdn_info = ftdmchan->call_data;
+	uint8_t 		state_change = 0;
 
 	memset(&sigev, 0, sizeof(sigev));
 
@@ -673,6 +674,7 @@ static ftdm_status_t ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdm
 				sngisdn_send_signal(sngisdn_info, FTDM_SIGEVENT_PROCEED);
 				
 				if (sngisdn_test_flag(sngisdn_info, FLAG_MEDIA_READY)) {
+					state_change++;
 					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
 				}
 			} else {
@@ -693,6 +695,7 @@ static ftdm_status_t ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdm
 				sngisdn_send_signal(sngisdn_info, FTDM_SIGEVENT_RINGING);
 				
 				if (sngisdn_test_flag(sngisdn_info, FLAG_MEDIA_READY)) {
+					state_change++;
 					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
 				}
 			} else {
@@ -752,6 +755,7 @@ static ftdm_status_t ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdm
 			/* Send a release complete */
 			sngisdn_snd_release(ftdmchan, 0);
 			/*now go to the HANGUP complete state*/				
+			state_change++;
 			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
 		}
 		break;
@@ -811,6 +815,7 @@ static ftdm_status_t ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdm
 				}
 			}
 			/* now go to the HANGUP complete state */
+			state_change++;
 			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
 		}
 		break;
@@ -819,6 +824,7 @@ static ftdm_status_t ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdm
 			if (sngisdn_test_flag(sngisdn_info, FLAG_REMOTE_ABORT) ||
 				sngisdn_test_flag(sngisdn_info, FLAG_LOCAL_ABORT)) {
 				/* If the remote side aborted, we will not get anymore message for this call */
+				state_change++;
 				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 			} else {
 				/* waiting on remote confirmation before moving to down */
@@ -873,8 +879,10 @@ static ftdm_status_t ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdm
 		break;
 	}
 
-	/* Acknowledge the state change */
-	ftdm_channel_complete_state(ftdmchan);
+	if (!state_change) {
+		/* Acknowledge the state change */
+		ftdm_channel_complete_state(ftdmchan);
+	}
 	
 	/* If sngisdn_info->variables is not NULL, it means did not send any
 	* sigevent to the user, therefore we have to free that hashtable */

libs/freetdm/src/include/private/ftdm_core.h

@@ -590,7 +590,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_chan(ftdm_channel_t *ftdmchan);
 FT_DECLARE(void) ftdm_ack_indication(ftdm_channel_t *ftdmchan, ftdm_channel_indication_t indication, ftdm_status_t status);
 
 
-FT_DECLARE(ftdm_iterator_t) *ftdm_get_iterator(ftdm_iterator_type_t type, ftdm_iterator_t *iter);
+FT_DECLARE(ftdm_iterator_t *) ftdm_get_iterator(ftdm_iterator_type_t type, ftdm_iterator_t *iter);
 
 
 /*!