Commit ba9eaf48 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 048fcd98

ttcn/LibDiameter_Templates.ttcn

+32 −16
Original line number Original line Diff line number Diff line
@@ -639,29 +639,39 @@ module LibDiameter_Templates { 
            }

            }





            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_RFC := {

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_RFC := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Data := DIGEST_E

                    aVP_Data := DIGEST_E

                }

                }

            }

            

            

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown_RFC := {

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_unknown_RFC := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Data := UNKNOWN_E

                    aVP_Data := UNKNOWN_E

                }

                }

            }

            

            

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka_RFC := {

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_digest_aka_RFC := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Data := DIGEST_AKAv1_MD5_E

                    aVP_Data := DIGEST_AKAv1_MD5_E

                }

                }

            }

            

            

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass_RFC := {

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_nass_RFC := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Data := NASS_BUNDLE_E

                    aVP_Data := NASS_BUNDLE_E

                }

                }

            }

            

            

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga_RFC := {

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_giga_RFC := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Data := GIBA_E

                    aVP_Data := GIBA_E

                }

                }

            }

            

            

        } //end group DummyAVPHeaders

        } //end group DummyAVPHeaders
@@ -814,9 +824,11 @@ module LibDiameter_Templates { 
            }            

            }            

            

            

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_RFC(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := {

            template SIP_Authentication_Scheme_AVP m_sIPAuthenticationScheme_RFC(template (value) SIP_Auth_Schm_Type p_SIPAuthSchmType) := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC, 4, omit),

                    aVP_Data := p_SIPAuthSchmType

                    aVP_Data := p_SIPAuthSchmType

                }

                }

            }





            template User_Name_AVP m_userName(template (value) UTF8String p_avpData) := {

            template User_Name_AVP m_userName(template (value) UTF8String p_avpData) := {

                aVP_Header := m_aVP_Header_Mbit1(c_user_Name_AVP_Code, f_getUTF8StringLength(valueof(p_avpData))),

                aVP_Header := m_aVP_Header_Mbit1(c_user_Name_AVP_Code, f_getUTF8StringLength(valueof(p_avpData))),
@@ -3144,14 +3156,18 @@ module LibDiameter_Templates { 
            }

            }

            

            

            template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_RFC := {

            template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_RFC := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),

                    aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),

                    aVP_Data := ?

                    aVP_Data := ?

                }

                }

            }

            

            

            template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka_RFC := {

            template SIP_Authentication_Scheme_AVP mw_sIPAuthenticationScheme_digest_aka_RFC := {

                sIP_Authentication_Scheme_AVP_RFC := {

                    aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),

                    aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Authentication_Scheme_AVP_Code_RFC),

                    aVP_Data := DIGEST_AKAv1_MD5_E

                    aVP_Data := DIGEST_AKAv1_MD5_E

                }

                }

            }

            

            

            template SIP_Number_Auth_Items_AVP mw_sIPNumberAuthItems (template (present) UInt32 p_avpData := ?) := {

            template SIP_Number_Auth_Items_AVP mw_sIPNumberAuthItems (template (present) UInt32 p_avpData := ?) := {

                aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Number_Auth_Items_AVP_Code_RFC),

                aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_sIP_Number_Auth_Items_AVP_Code_RFC),

ttcn/LibDiameter_Types_Base_AVPs.ttcn

+6 −1
Original line number Original line Diff line number Diff line
@@ -1366,7 +1366,12 @@ module LibDiameter_Types_Base_AVPs { 
                variant (aVP_Type) "fieldPresent=CodecHelper.isAvailable();condition=CodecHelper.leaveScope()"

                variant (aVP_Type) "fieldPresent=CodecHelper.isAvailable();condition=CodecHelper.leaveScope()"

            }

            }





            type record SIP_Authentication_Scheme_AVP{

            type union SIP_Authentication_Scheme_AVP{

                SIP_Authentication_Scheme_AVP_RFC      sIP_Authentication_Scheme_AVP_RFC,

                SIP_Authentication_Scheme_AVP_3GPP     sIP_Authentication_Scheme_AVP_3GPP

            }



            type record SIP_Authentication_Scheme_AVP_RFC{

                //Ref: RFC4740 9.5.1.  SIP-Authentication-Scheme AVP

                //Ref: RFC4740 9.5.1.  SIP-Authentication-Scheme AVP

                AVP_Header                     aVP_Header,//<AVP header: 377 ....>

                AVP_Header                     aVP_Header,//<AVP header: 377 ....>

                SIP_Auth_Schm_Type            aVP_Data

                SIP_Auth_Schm_Type            aVP_Data

ttcn/LibDiameter_Types_CxDx_AVPs.ttcn

+9 −0
Original line number Original line Diff line number Diff line
@@ -438,6 +438,15 @@ module LibDiameter_Types_CxDx_AVPs { 
                variant (aVP_Data) "condition=CodecHelper.leaveScope()"

                variant (aVP_Data) "condition=CodecHelper.leaveScope()"

            }

            }





            /**

             * ETSI TS 129 229 Clause 6.3.9 SIP-Authentication-Scheme AVP

             */

            type record SIP_Authentication_Scheme_AVP_3GPP{

                //Ref: RFC4740 9.5.1.  SIP-Authentication-Scheme AVP

                AVP_Header            aVP_Header,//<AVP header: 608 ....>

                UTF8String            aVP_Data

            }

            

            /**

            /**

             * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.13 SIP-Auth-Data-Item AVP

             * ETSI TS 129 229 V10.5.0 (2013-04) Clause 6.3.13 SIP-Auth-Data-Item AVP

             */

             */