Added cid-name-in-display-ie option

libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h

@@ -265,6 +265,7 @@ typedef struct sngisdn_span_data {
 	uint8_t			dynamic_tei;
 	uint8_t			restart_timeout;
 	uint8_t			force_sending_complete;
+	uint8_t			cid_name_in_display_ie;	/* In BRI, send the CID-name inside Display IE instead of Usr-usr */
 	char*			local_numbers[SNGISDN_NUM_LOCAL_NUMBERS];
 	ftdm_timer_id_t timers[SNGISDN_NUM_SPAN_TIMERS];
 	ftdm_sched_t 	*sched;

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

@@ -705,8 +705,8 @@ ftdm_status_t set_calling_name(ftdm_channel_t *ftdmchan, ConEvnt *conEvnt)
 		return FTDM_SUCCESS;
 	}
 
-	if (ftdmchan->span->trunk_type == FTDM_TRUNK_BRI ||
-		ftdmchan->span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
+	if (FTDM_SPAN_IS_BRI(ftdmchan->span) &&
+		signal_data->cid_name_in_display_ie != SNGISDN_OPT_TRUE) {
 
 		conEvnt->usrUsr.eh.pres = PRSNT_NODEF;
 		conEvnt->usrUsr.protocolDisc.pres = PRSNT_NODEF;