Commit 2277d97b authored by schmitting's avatar schmitting
Browse files

No commit message

No commit message
parent a2636876
Loading
Loading
Loading
Loading
+55 −15
Original line number Diff line number Diff line
@@ -96,7 +96,12 @@
        
        function f_initiate_session_PCEF() runs on DiameterComponent
        {
            f_send_CCR(m_CCR_InitialRequest(vc_sessionId, vc_originHost, vc_originRealm, vc_destinationRealm, f_framedIpAddress4_send(),f_framedIpAddress6_send()));
            f_send_CCR(m_CCR_InitialRequest(vc_sessionId, 
                                            vc_originHost, 
                                            vc_originRealm, 
                                            vc_destinationRealm, 
                                            f_framedIpAddress4_send(PX_UE1_framedIpAddress),
                                            f_framedIpAddress6_send(PX_UE1_framedIp6Address)));
        
            f_awaiting_CCA(mw_CCA_ResultCode(vc_sessionId, vc_originHost_IUT, vc_originRealm_IUT, mw_resultCode(mw_resultCode_diameterSuccess)));
        }    
@@ -108,8 +113,8 @@
                                            vc_originRealm, 
                                            vc_destinationRealm,
                                            mw_cC_Request_Type(INITIAL_REQUEST_E),
                                            f_framedIpAddress4(),
                                            f_framedIpAddress6(),
                                            f_framedIpAddress4(PX_UE1_framedIpAddress),
                                            f_framedIpAddress6(PX_UE1_framedIp6Address),
                                            *));

            f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm, m_cC_Request_Type(INITIAL_REQUEST_E)));
@@ -197,39 +202,74 @@
    
    group AVPOperations {
    
        function f_framedIpAddress4 ()
        function f_framedIpAddress4 (template octetstring p_framedIpAddress)
            return template Framed_IP_Address_AVP
        {
            if (PX_IPv6)
                {return(omit)}
            else {return(mw_framedIpAddress(PX_UE_framedIpAddress))}
            else {return(mw_framedIpAddress(p_framedIpAddress))}
        }
        function f_framedIpAddress6 ()
        
        function f_framedIpAddress6 (template octetstring p_framedIpAddress)
            return template Framed_IPv6_Prefix_AVP
        {
            if (PX_IPv6)
                {return(mw_framedIp6Address(PX_UE_framedIp6Address))}
                {return(mw_framedIp6Address(p_framedIpAddress))}
            else {return(omit)}
        }
                
        function f_framedIpAddress4_send ()
        function f_framedIpAddress4_send (octetstring p_framedIpAddress)
             return template Framed_IP_Address_AVP
        {
        	if (PX_IPv6)
                 {return(omit)}
            else {return(m_framedIpAddress(PX_UE_framedIpAddress))}
        	else {return(m_framedIpAddress(p_framedIpAddress))}
        }
        
        function f_framedIpAddress6_send ()
        function f_framedIpAddress6_send (octetstring p_framedIpAddress)
             return template Framed_IPv6_Prefix_AVP
        {
        	if (PX_IPv6)
                {return(m_framedIp6Address(PX_UE_framedIp6Address))}
        		{return(m_framedIp6Address(p_framedIpAddress))}
         	else {return(omit)}
        }
        
    }//end group AVPOperations
    
//    group AVPOperations {
//    
//        function f_framedIpAddress4 ()
//            return template Framed_IP_Address_AVP
//        {
//            if (PX_IPv6)
//                {return(omit)}
//            else {return(mw_framedIpAddress(PX_UE1_framedIpAddress))}
//        }
//        function f_framedIpAddress6 ()
//            return template Framed_IPv6_Prefix_AVP
//        {
//            if (PX_IPv6)
//                {return(mw_framedIp6Address(PX_UE1_framedIp6Address))}
//            else {return(omit)}
//        }
//                
//        function f_framedIpAddress4_send ()
//             return template Framed_IP_Address_AVP
//        {
//            if (PX_IPv6)
//                 {return(omit)}
//            else {return(m_framedIpAddress(PX_UE1_framedIpAddress))}
//        }
//        
//        function f_framedIpAddress6_send ()
//             return template Framed_IPv6_Prefix_AVP
//        {
//            if (PX_IPv6)
//                {return(m_framedIp6Address(PX_UE1_framedIp6Address))}
//            else {return(omit)}
//        }
//        
//    }//end group AVPOperations
    
    group CheckFunctions {
        
        function f_check_CCAUsageMonitoringInfo (DIAMETER_MSG p_msg)