freetdm: ss7 - Support for transmission of Generic Number

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
index 4f8c069b7104cfadfa33131c078ed59c90b5042f..59660765a1947902470fc4b7f58c9e48fad10517 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
@@ -674,6 +674,9 @@ ftdm_status_t ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
                } else {
                        /*INBOUND...so FS told us it was going to answer...tell the stack */
                        ft_to_sngss7_anm(ftdmchan);
+#if 1 /* DAVIDY */
+                       ft_to_sngss7_itx(ftdmchan);
+#endif
                }
 
                break;

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 7c29530c626279e52cff03d1c6cc08b17088508a..a355ee0ee7a781dd28d9d1e2d3b07fc025ff794e 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -320,6 +320,15 @@ typedef struct sng_isup_ckt {
        uint32_t                clg_nadi;
        uint32_t                cld_nadi;
        uint8_t                 rdnis_nadi;
+
+       /* Generic Number defaults */
+       uint8_t                 gn_nmbqual;                     /* Number Qualifier */
+       uint8_t                 gn_nadi;                        /* Nature of Address indicator */
+       uint8_t                 gn_screen_ind;          /* Screening Indicator */
+       uint8_t                 gn_pres_ind;            /* Presentation Indicator */
+       uint8_t                 gn_npi;                         /* Numbering Plan Indicator */
+       uint8_t                 gn_num_inc_ind;         /* Number Incomplete Indicator */
+       /* END - Generic Number defaults */
                        
        uint32_t                min_digits;
        uint8_t                 itx_auto_reply;
@@ -795,7 +804,8 @@ ftdm_status_t copy_cdPtyNum_from_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cd
 ftdm_status_t copy_cdPtyNum_to_sngss7(ftdm_channel_t *ftdmchan, SiCdPtyNum *cdPtyNum);
 ftdm_status_t copy_redirgNum_to_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *redirgNum);
 ftdm_status_t copy_redirgNum_from_sngss7(ftdm_channel_t *ftdmchan, SiRedirNum *redirgNum);
-
+ftdm_status_t copy_genNmb_to_sngss7(ftdm_channel_t *ftdmchan, SiGenNum *genNmb);
+ftdm_status_t copy_genNmb_from_sngss7(ftdm_channel_t *ftdmchan, SiGenNum *genNmb);
 
 ftdm_status_t copy_tknStr_from_sngss7(TknStr str, char *ftdm, TknU8 oddEven);
 ftdm_status_t append_tknStr_from_sngss7(TknStr str, char *ftdm, TknU8 oddEven);

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 10407963e14b405ca9c317ba1e33994b30324384..a746301cd7095315d80c818374f70e3e409503ce 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -74,8 +74,6 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
        SS7_FUNC_TRACE_ENTER (__FUNCTION__);
        
        sngss7_chan_data_t      *sngss7_info = ftdmchan->call_data;;
-       const char                      *clg_nadi = NULL;
-       const char                      *cld_nadi = NULL;
        const char                      *clg_subAddr = NULL;
        const char                      *cld_subAddr = NULL;
        char                            subAddrIE[MAX_SIZEOF_SUBADDR_IE];
@@ -185,25 +183,10 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
        /* copy down the calling number information */  
        copy_cgPtyNum_to_sngss7 (ftdmchan, &iam.cgPtyNum);
 
-       /* check if the user would like a custom NADI value for the calling Pty Num */
-       clg_nadi = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_clg_nadi");
-       if (!ftdm_strlen_zero(clg_nadi)) {
-               SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Calling NADI value \"%s\"\n", clg_nadi);
-               iam.cgPtyNum.natAddrInd.val     = atoi(clg_nadi);
-       } else {
-               iam.cgPtyNum.natAddrInd.val     = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].clg_nadi;
-               SS7_DEBUG_CHAN(ftdmchan,"No user supplied NADI value found for CLG, using \"%d\"\n", iam.cgPtyNum.natAddrInd.val);
-       }
+       /* copy down the generic number information */
+       copy_genNmb_to_sngss7(ftdmchan, &iam.genNmb);
        
-       cld_nadi = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_cld_nadi");
-       if (!ftdm_strlen_zero(cld_nadi)) {
-               SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Called NADI value \"%s\"\n", cld_nadi);
-               iam.cdPtyNum.natAddrInd.val     = atoi(cld_nadi);
-       } else {
-               iam.cdPtyNum.natAddrInd.val     = g_ftdm_sngss7_data.cfg.isupCkt[sngss7_info->circuit->id].cld_nadi;
-               SS7_DEBUG_CHAN(ftdmchan,"No user supplied NADI value found for CLD, using \"%d\"\n", iam.cdPtyNum.natAddrInd.val);
-       }
-
+       /* TODO - move this to copy_clg_subAddr_to_sngss7 function */
        /* check if the user would like us to send a clg_sub-address */
        clg_subAddr = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_clg_subaddr");
        if (!ftdm_strlen_zero(clg_subAddr)) {
@@ -912,7 +895,7 @@ void ft_to_sngss7_itx (ftdm_channel_t * ftdmchan)
        if (!ftdm_strlen_zero(var)) {
                itx.msgNum.msgNum.val = atoi(var);
        } else {
-               itx.msgNum.msgNum.val = 0x0;
+               itx.msgNum.msgNum.val = 0x1;
        }
        
        itx.chargUnitNum.eh.pres = PRSNT_NODEF;
@@ -921,7 +904,7 @@ void ft_to_sngss7_itx (ftdm_channel_t * ftdmchan)
        if (!ftdm_strlen_zero(var)) {
                itx.chargUnitNum.chargUnitNum.val = atoi(var);
        } else {
-               itx.chargUnitNum.chargUnitNum.val = 0x0;
+               itx.chargUnitNum.chargUnitNum.val = 0x1;
        }
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "ITX Charging Unit:%d Msg Num:%d\n", itx.chargUnitNum.chargUnitNum.val, itx.msgNum.msgNum.val);