Initialized bearer_cap to FTDM_INVALID_INT_PARM

libs/freetdm/mod_freetdm/mod_freetdm.c

@@ -1230,14 +1230,10 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		freetdmvar = switch_channel_get_variable(channel, "freetdm_bearer_capability");
 		if (freetdmvar) {
 			caller_data.bearer_capability = (uint8_t)atoi(freetdmvar);
-		} else {
-			caller_data.bearer_capability = FTDM_INVALID_INT_PARM;
 		}
 		freetdmvar = switch_channel_get_variable(channel, "freetdm_bearer_layer1");
 		if (freetdmvar) {
 			caller_data.bearer_layer1 = (uint8_t)atoi(freetdmvar);
-		} else {
-			caller_data.bearer_layer1 = FTDM_INVALID_INT_PARM;
 		}
 	}
 
@@ -3407,9 +3403,9 @@ static switch_status_t load_config(void)
 		boost_span = boost_spans[i];
 		ftdm_log(FTDM_LOG_DEBUG, "Starting boost span %d\n", ftdm_span_get_id(boost_span));
 		if (ftdm_span_start(boost_span) == FTDM_FAIL) {
-				ftdm_log(FTDM_LOG_ERROR, "Error starting boost FreeTDM span %d, error: %s\n", 
-						ftdm_span_get_id(boost_span), ftdm_span_get_last_error(boost_span));
-				continue;
+			ftdm_log(FTDM_LOG_ERROR, "Error starting boost FreeTDM span %d, error: %s\n",
+					ftdm_span_get_id(boost_span), ftdm_span_get_last_error(boost_span));
+			continue;
 		}
 	}
 

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

@@ -187,6 +187,7 @@ void sngisdn_rcv_disc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, D
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -219,6 +220,7 @@ void sngisdn_rcv_rel_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Re
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -250,7 +252,7 @@ void sngisdn_rcv_dat_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, In
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-		
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -282,7 +284,7 @@ void sngisdn_rcv_sshl_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, S
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-		
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -315,7 +317,7 @@ void sngisdn_rcv_sshl_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, S
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-		
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -347,7 +349,7 @@ void sngisdn_rcv_rmrt_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, R
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-		
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -380,7 +382,7 @@ void sngisdn_rcv_rmrt_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, R
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-		
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -413,7 +415,7 @@ void sngisdn_rcv_flc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
 			 !(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-		
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -446,7 +448,7 @@ void sngisdn_rcv_fac_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, Fa
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}
 
@@ -479,7 +481,7 @@ void sngisdn_rcv_sta_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
 		!(suInstId && get_ftdmchan_by_suInstId(suId, suInstId, &sngisdn_info) == FTDM_SUCCESS)) {
 
 		ftdm_log(FTDM_LOG_CRIT, "Could not find matching call suId:%u suInstId:%u spInstId:%u\n", suId, suInstId, spInstId);
-
+		ftdm_assert(0, "Inconsistent call states\n");
 		return;
 	}