Added cid-name-in-display-ie option

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
index e1de27a8891f2e201e4d38c70596f149b702342e..fee68ec41a4afa323e152315e6ce47cdf0648f91 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
+++ b/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;

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index d744ad2942b34c88e64556bc360b45eae9eed2d7..af2c2e95d1d52087f98c490be4ed220fbc6d3bc1 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
+++ b/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;