Commit 0d9e9b44 authored by pintar's avatar pintar
Browse files

SIP-Authentication-Schema type is defined as union and either RFC or 3GPP type...

SIP-Authentication-Schema type is defined as union and either RFC or 3GPP type definition can be used.
parent 397fbe0d
Loading
Loading
Loading
Loading
+26 −26
Original line number Diff line number Diff line
@@ -4091,7 +4091,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_E),   //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("DIGEST"),   //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “SIP Digest”
                                    m_sIPItemNumber(
                                        PIXIT_SIP_ITEM_NUMBER
@@ -4125,7 +4125,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                {
                                    mw_sIPAuthDataItem(
                                                                            // containing a SIP-Auth-Data-Item AVP
                                        m_sIPAuthenticationScheme(DIGEST_E)    //     containing a SIP-Authentication-Scheme AVP
                                        m_sIPAuthenticationScheme("DIGEST")    //     containing a SIP-Authentication-Scheme AVP
                                                                            //         indicating “SIP Digest”
                                    )
                                }
@@ -4168,7 +4168,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_E),       //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("DIGEST"),       //     containing a SIP-Authentication-Scheme AVP
                                                                            //         indicating “SIP Digest”
                                    -,
                                    -,
@@ -4200,7 +4200,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                ),
                                {
                                    mw_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                        m_sIPAuthenticationScheme(DIGEST_E),  //     containing a SIP-Authentication-Scheme AVP
                                        m_sIPAuthenticationScheme("DIGEST"),  //     containing a SIP-Authentication-Scheme AVP
                                                                            //         indicating “SIP Digest”
                                        mw_sIPAuthenticate_any     //TODO How to check digest?      // containing SIP-Digest-Authenticate AVP
                                                                            //     containing Digest-Realm AVP
@@ -4250,7 +4250,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_AKAv1_MD5_E),//     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("AKAv1"),//     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Digest-AKAv1-MD5”
                                    -,
                                    -,
@@ -4280,7 +4280,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                mw_sIPNumberAuthItems,                  // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating a set of authentication vectors
                                {mw_sIPAuthDataItem(                     // containing a SIP-Auth-Data-Item AVP
                                    mw_sIPAuthenticationScheme(DIGEST_AKAv1_MD5_E),  //     containing a SIP-Authentication-Scheme AVP
                                    mw_sIPAuthenticationScheme("AKAv1"),  //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Digest-AKAv1-MD5”
                                    mw_sIPAuthenticate_any, //TODO: How to check digest_aka,      // containing SIP-Authenticate AVP
                                                                        //     indicating the tokens RAND + AUTS
@@ -4328,7 +4328,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(NASS_BUNDLE_E)      //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("NASS_BUNDLE")      //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “NASS-Bundled”
                    ))));
                    
@@ -4350,7 +4350,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                                                        //     indicating a set of authentication vectors
                                {
                                    mw_sIPAuthDataItem(                     // containing a SIP-Auth-Data-Item AVP
                                        m_sIPAuthenticationScheme(NASS_BUNDLE_E),     //     containing a SIP-Authentication-Scheme AVP
                                        m_sIPAuthenticationScheme("NASS_BUNDLE"),     //     containing a SIP-Authentication-Scheme AVP
                                                                            //         indicating “NASS-Bundled”
                                        -,
                                        -,
@@ -4398,7 +4398,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(GIBA_E)      //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("GIBA")      //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Early-IMS-Security”
                    ))));
                    
@@ -4420,7 +4420,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                    1                                       //     indicating only one set of authentication vectors
                                ),
                                {mw_sIPAuthDataItem( // containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(GIBA_E),         //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("GIBA"),         //     containing a SIP-Authentication-Scheme AVP
                                                                            //         indicating “Early-IMS-Security”
                                    -,
                                    -,
@@ -4468,7 +4468,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_E),   //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("DIGEST"),   //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “SIP Digest”
                                    m_sIPItemNumber(
                                        PIXIT_SIP_ITEM_NUMBER
@@ -4534,7 +4534,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_E),   //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("DIGEST"),   //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “SIP Digest”
                                    m_sIPItemNumber(
                                        PIXIT_SIP_ITEM_NUMBER
@@ -4600,7 +4600,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_E),   //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("DIGEST"),   //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “SIP Digest”
                                    m_sIPItemNumber(
                                        PIXIT_SIP_ITEM_NUMBER
@@ -4665,7 +4665,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(UNKNOWN_E)   //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("UNKNOWN")   //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Unknown”
                                    )
                                )
@@ -4722,7 +4722,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(NASS_BUNDLE_E)      //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("NASS_BUNDLE")      //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating an unsupported authentication scheme
                                ),
                                vc_serverName                           // containing a Server-Name AVP
@@ -4780,7 +4780,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_AKAv1_MD5_E), //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("AKAv1"), //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Digest-AKAv1-MD5”
                                    -,
                                    -,
@@ -4844,7 +4844,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_AKAv1_MD5_E), //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("AKAv1"), //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Digest-AKAv1-MD5”
                                    -,
                                    -,
@@ -4909,7 +4909,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_E),   //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("DIGEST"),   //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Digest-AKAv1-MD5”
                                    -,
                                    -,
@@ -4935,7 +4935,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                {
                                    mw_sIPAuthDataItem(
                                                                            // containing a SIP-Auth-Data-Item AVP
                                        mw_sIPAuthenticationScheme(DIGEST_AKAv1_MD5_E),//     containing a SIP-Authentication-Scheme AVP
                                        mw_sIPAuthenticationScheme("AKAv1"),//     containing a SIP-Authentication-Scheme AVP
                                                                            //         indicating “Digest-AKAv1-MD5”
                                        mw_sIPAuthenticate_any,      //TODO How to check aka// containing SIP-Authenticate AVP
                                                                            //     indicating the tokens AUTS
@@ -4992,7 +4992,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                m_sIPNumberAuthItems(1),                // containing a SIP-Number-Auth-Items AVP
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(DIGEST_E),   //     containing a SIP-Authentication-Scheme AVP
                                    m_sIPAuthenticationScheme("DIGEST"),   //     containing a SIP-Authentication-Scheme AVP
                                                                        //         indicating “Digest-AKAv1-MD5”
                                    -,
                                    -,
@@ -5079,7 +5079,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                                                        //     indicating the number of authentication vectors requested
                                m_sIPAuthDataItem(// containing a SIP-Auth-Data-Item AVP
                                    m_sIPAuthenticationScheme(   //     containing a SIP-Authentication-Scheme AVP
                                        DIGEST_AKAv1_MD5_E       //         indicating “Digest-AKAv1-MD5”
                                        "AKAv1"       //         indicating “Digest-AKAv1-MD5”
                                     ),
                                    -,
                                    -,
@@ -6090,7 +6090,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                ?,
                                mw_sIPAuthDataItem((
                                     m_sIPAuthenticationScheme(
                                        DIGEST_E
                                        "DIGEST"
                                     ),*,*,*,*,*)
                                ),
                                mw_serverName(
@@ -6145,7 +6145,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                ?,
                                mw_sIPAuthDataItem((
                                     m_sIPAuthenticationScheme(
                                        DIGEST_AKAv1_MD5_E
                                        "AKAv1"
                                     ),*,*,omit,*,*)
                                ),
                                mw_serverName(
@@ -6196,7 +6196,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                ), 
                                ?,
                                mw_sIPAuthDataItem(
                                     m_sIPAuthenticationScheme(DIGEST_AKAv1_MD5_E),
                                     m_sIPAuthenticationScheme("AKAv1"),
                                     *,
                                     mw_sipAuthorization_any, //TODO: Sip-Authorization AVP does not include RAND/AUTS octetstring
                                     omit,
@@ -6251,7 +6251,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                ?,
                                mw_sIPAuthDataItem((
                                     m_sIPAuthenticationScheme(
                                     NASS_BUNDLE_E
                                     "NASS_BUNDLE"
                                     ),*,*,omit,*,*)
                                ),
                                mw_serverName(
@@ -6303,7 +6303,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                ?,
                                mw_sIPAuthDataItem((
                                     m_sIPAuthenticationScheme(
                                     GIBA_E
                                     "GIBA"
                                     ),*,*,omit,*,*)
                                ),
                                mw_serverName(
+10 −6
Original line number Diff line number Diff line
@@ -181,9 +181,11 @@ module DiameterCxDx_Templates {
                    }
                }
            
                template (value) SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := {
                template (value) SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme(template (value) UTF8String p_aVP_Data) := {
                    sIP_Authentication_Scheme_AVP_3GPP := {
                        aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp),
                    aVP_Data := p_SIPAuthSchmType
                        aVP_Data := p_aVP_Data
                    }
                }
            
                template (value) SIP_Item_Number_AVP m_sIPItemNumber(template (value) UInt32 p_aVP_Data) := {
@@ -461,9 +463,11 @@ module DiameterCxDx_Templates {
                    }
                }
            
                template (present) SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme(template (present) SIP_Auth_Schm_Type p_SIPAuthSchmType) := {
                template (present) SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme(template (present) UTF8String p_aVP_Data) := {
                    sIP_Authentication_Scheme_AVP_3GPP := {
                        aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code, 4, c_vendId3gpp),
                    aVP_Data := p_SIPAuthSchmType
                        aVP_Data := p_aVP_Data
                    }
                }
                
                template Line_Identifier_AVP mw_line_Identifier_dummy := {