Commit db201e1d authored by ulrichst's avatar ulrichst
Browse files

merge SubscriptionNotification into develop branch

parents dc0bc4c5 255578b1
Loading
Loading
Loading
Loading

LibDiameter @ f7f587ec

Original line number Diff line number Diff line
Subproject commit 29721153dc288decb1f6f29df16becd3141ce12c
Subproject commit f7f587ec9ed56c1d225ffbf84bb9ee98cb4da6e0
+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ module DiameterShDh_PIXITS {
        
        modulepar octetstring PX_DSAI_TAG := '00'O;
        
        modulepar charstring PX_Private_Identity := "foo";
        
        modulepar LibDiameter_Types_Base_AVPs.Diameter_Identity PX_HSS_IDENTITY := "hss.etsi.org";
        
		/** @desc    TServiceData
+103 −3
Original line number Diff line number Diff line
@@ -147,6 +147,13 @@ module DiameterShDh_Templates {
                    aVP_Data   := p_aVP_Data
                }
                
                 template (value) Expiry_Time_AVP m_expiry_Time_AVP(
                                                               in template (value) Time p_aVP_Data
                ) := {
                    aVP_Header := m_aVP_HeaderVid_Mbit1(c_expiry_Time_AVP_Code, 4, c_vendId3gpp),
                    aVP_Data   := p_aVP_Data
                }               
                
                template (value) Redirect_Host_AVP m_redirect_host(
                                                                   in template (value) Diameter_Identity p_aVP_Data
                ) := {
@@ -154,6 +161,10 @@ module DiameterShDh_Templates {
                    aVP_Data   := p_aVP_Data
                }
                
                template Service_Indication_AVP m_service_Indication (in template (value) octetstring p_aVP_Data)
                modifies m_service_Indication_dummy := {
                    aVP_Data   := p_aVP_Data
                }
            } // End of group sendingTemplatesForAVPs
            
            group receivingTemplatesForAVPs{
@@ -178,6 +189,13 @@ module DiameterShDh_Templates {
                    aVP_Type := *
                }
                
                template (value) Expiry_Time_AVP mw_expiry_Time_AVP(
                                                    in template (present) Time p_aVP_Data
                ) := {
                   aVP_Header := m_aVP_HeaderVid_Mbit1(c_expiry_Time_AVP_Code, 4, c_vendId3gpp),
                   aVP_Data   := p_aVP_Data
                }    
                
            } // End of group receivingTemplatesForAVPs
            
        } // End of group SpecificAVPHeaders
@@ -454,7 +472,9 @@ module DiameterShDh_Templates {
	                                                         template (value) Destination_Realm_AVP p_destination_Realm,
	                                                         template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy,
                                                             template (value) Subs_Req_Type_AVP p_subs_Req_Type := m_subs_Req_Type_dummy,
	                                                         template (value) Data_Reference_AVP p_data_Reference := m_data_Reference_dummy
	                                                         template (value) Data_Reference_AVP p_data_Reference := m_data_Reference_dummy,
                                                             template (value) User_Name_AVP p_user_Name := m_user_Name_dummy
                                                             
	            ) modifies m_SNR_Body_dummy := {
	                vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,//required only in TS129 229
                    auth_Session_State := m_auth_Session_State,
@@ -463,9 +483,70 @@ module DiameterShDh_Templates {
                    destination_Realm := p_destination_Realm,
                    user_Identity := p_user_Identity,
                    subs_Req_Type := p_subs_Req_Type,
                    data_Reference := {p_data_Reference}
                    data_Reference := {p_data_Reference},
                    user_Name := p_user_Name
	            } // End of template md_snrBodyAvps

	            template (value) SNR_Body_AVP md_snrBodyAvps_DSAI_Tag(
	                                                         template (value) Origin_Host_AVP p_origin_Host,
	                                                         template (value) Origin_Realm_AVP p_origin_Realm,
	                                                         template (value) Destination_Realm_AVP p_destination_Realm,
	                                                         template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy,
                                                             template (value) Data_Reference_AVP p_data_Reference := m_data_Reference_dummy,
                                                             template (value) DSAI_Tag_AVP p_dsai_tag
                                                             
	            ) modifies m_SNR_Body_dummy := {
	                vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,//required only in TS129 229
                    auth_Session_State := m_auth_Session_State,
                    origin_Host := p_origin_Host,
                    origin_Realm := p_origin_Realm,
                    destination_Realm := p_destination_Realm,
                    user_Identity := p_user_Identity,
                    data_Reference := {p_data_Reference},
                    dSAI_Tag := superset(p_dsai_tag)
                
                } // End of template md_snrBodyAvps_DSAI_Tag

                template (value) SNR_Body_AVP md_snrBodyAvps_service_Indication(
                                                             template (value) Origin_Host_AVP p_origin_Host,
                                                             template (value) Origin_Realm_AVP p_origin_Realm,
                                                             template (value) Destination_Realm_AVP p_destination_Realm,
                                                             template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy,
                                                             template (value) Data_Reference_AVP p_data_Reference := m_data_Reference_dummy,
                                                             template (value) Service_Indication_AVP p_service_Indication
                ) modifies m_SNR_Body_dummy := {
                    vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,//required only in TS129 229
                    auth_Session_State := m_auth_Session_State,
                    origin_Host := p_origin_Host,
                    origin_Realm := p_origin_Realm,
                    destination_Realm := p_destination_Realm,
                    user_Identity := p_user_Identity,
                    data_Reference := {p_data_Reference},
                    service_Indication := {p_service_Indication}
                
                } // End of template md_snrBodyAvps_DSAI_Tag                                
                
                
                template (value) SNR_Body_AVP md_snrBodyAvps_Expiry_Time(
                                                             template (value) Origin_Host_AVP p_origin_Host,
                                                             template (value) Origin_Realm_AVP p_origin_Realm,
                                                             template (value) Destination_Realm_AVP p_destination_Realm,
                                                             template (value) User_Identity_AVP p_user_Identity := m_user_Identity_dummy,
                                                             template (value) Data_Reference_AVP p_data_Reference := m_data_Reference_dummy,
                                                             template (value) Expiry_Time_AVP p_expiry_Time
                                                             
                ) modifies m_SNR_Body_dummy := {
                    vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_Sh,//required only in TS129 229
                    auth_Session_State := m_auth_Session_State,
                    origin_Host := p_origin_Host,
                    origin_Realm := p_origin_Realm,
                    destination_Realm := p_destination_Realm,
                    user_Identity := p_user_Identity,
                    data_Reference := {p_data_Reference},
                    expiry_Time := p_expiry_Time
                
                } // End of template md_snrBodyAvps_DSAI_Tag
	            
	        } // End of group snr_msg
            
        } // End of group Sh_request_message_templates_send 
@@ -1058,6 +1139,25 @@ module DiameterShDh_Templates {
                    origin_Realm                := p_originRealm
                } // End of template mdw_snaBodyAvps
                
                template (present) SNA_Body_AVP mdw_snaBodyExpiryTimeAvps(
                                                                template Result_Code_AVP              p_resultCode,
                                                                template (present) Origin_Host_AVP    p_originHost,
                                                                template (present) Origin_Realm_AVP   p_originRealm,
                                                                template (present) Expiry_Time_AVP    p_expiry_Time
                                                                
                ) modifies mw_SNA_Body_dummy := {
                    result_Code                 := p_resultCode,
                    origin_Host                 := p_originHost,
                    origin_Realm                := p_originRealm,
                    expiry_Time                 := p_expiry_Time
                } // End of template mdw_snaBodyExpiryTimeAvps                

                template (present) SNA_Body_AVP mdw_snaBodyAvps_experimental_result(
                                                                template Experimental_Result_AVP p_experimentalResult
                ) modifies mw_SNA_Body_dummy := {
                    experimental_Result         := p_experimentalResult
                } // End of template mdw_snaBodyAvps_experimental_result    
                
            } // End of group sna_msg
            
        } // End of group Sh_answer_message_templates_receive 
+478 −1

File changed.

Preview size limit exceeded, changes collapsed.