Commit 85fd1e25 authored by fischerjo's avatar fischerjo
Browse files

Add (present) to modification of templates for FNTP

parent da99a0c6

ttcn/FNTP/LibItsFntp_Templates.ttcn3

+6 −7
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ module LibItsFntp_Templates { 
             */

            template FNTPNPDU mw_fntpBasicNPDU_any := {

                header := {

                    sourcePort := { portLong := complement(c_portReservedLow..c_portReservedHigh) }, // See ISO/CD 29281-2 Table 1: FNTP endpoints identified by port numbers

                    sourcePort := { portLong := complement((c_portReservedLow .. c_portReservedHigh)) }, // See ISO/CD 29281-2 Table 1: FNTP endpoints identified by port numbers

                    destinationPort := ?, 

                    options := mw_noFntpOptions 

                }, // End of 'header' field
@@ -266,7 +266,6 @@ module LibItsFntp_Templates { 
            ) modifies m_fntpBasicNPDU := { 

                header := { 

                    options := { 

                        hops := p_hops, 

                        opt4 := null 

                    } 

                } // End of 'header' field
@@ -349,7 +348,7 @@ module LibItsFntp_Templates { 
                in template TXcip p_txCIP 

            ) := {

                header := { 

                    sourcePort := { portLong := complement(c_portReservedLow..c_portReservedHigh) }, // See ISO/CD 29281-2 Table 1: FNTP endpoints identified by port numbers

                    sourcePort := { portLong := complement((c_portReservedLow .. c_portReservedHigh)) }, // See ISO/CD 29281-2 Table 1: FNTP endpoints identified by port numbers

                    destinationPort := ?, 

                    options := mdw_NHopNFfntpOptions_CIP(

                        PX_NHOPS,
@@ -501,7 +500,7 @@ module LibItsFntp_Templates { 
             * @param   p_hops              N-hops value

             * @param   p_counter           Expected value of FNTP packet counter counter field

             */

            template FNTPNPDU mdw_fntpForwardingNPDU( 

            template (present) FNTPNPDU mdw_fntpForwardingNPDU( 

                in template (present) UInt16 p_sourcePort, 

                in template (present) UInt16 p_destinationPort, 

                in template (present) PortNumber p_fromPort,
@@ -535,7 +534,7 @@ module LibItsFntp_Templates { 
             * @param   p_rxCIP             Receive (RX) parameter settings

             * @param   p_txCIP             Transmit (TX) parameters of a VCI

             */

            template FNTPNPDU mdw_fntpForwardingNPDU_CIP( 

            template (present) FNTPNPDU mdw_fntpForwardingNPDU_CIP( 

                in template (present) UInt16 p_sourcePort, 

                in template (present) UInt16 p_destinationPort, 

                in template (present) PortNumber p_fromPort,
@@ -876,7 +875,7 @@ module LibItsFntp_Templates { 
             * @param p_port        Set equal to "sourcePort" given in the NPDU

             * @param p_linkID      Identify the VCI associated with the peer station

             */

            template UtCommandIndication mdw_checkNfFntpCommIndication(

            template (present) UtCommandIndication mdw_checkNfFntpCommIndication(

                in template (present) PortNumber p_servicePort,

                in template (present) PortNumber p_remotePort,

                in template (present) Link_ID p_linkID
@@ -903,7 +902,7 @@ module LibItsFntp_Templates { 
             * @param p_NHopNFfntpOptions_CIP   FNTP options with Access parameters

             * @see ISO/WD 29281-2 Clause 6.2.2.3.6 CIP management

             */

            template UtCommandIndication mdw_checkNfFntpCommIndication_CIP(

            template (present) UtCommandIndication mdw_checkNfFntpCommIndication_CIP(

                in template (present) PortNumber p_servicePort,

                in template (present) PortNumber p_remotePort,

                in template (present) Link_ID p_linkID,