Commit d400e5cb authored by tepelmann's avatar tepelmann
Browse files

Fixed compilation issues.

parent 9c14805f

ttcn/AtsDSlite/AtsDSLite_Templates.ttcn3

+23 −6
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ module AtsDSLite_Templates { 
    import from LibIpv6_CommonRfcs_TypesAndValues {

        type Ipv6Address 

    };

    import from LibIpv6_Interface_Templates {

        template mw_generalIpv6_extHdr_dst

    };

    import from LibIpv6_Interface_Templates all;

    import from LibIpv6_CommonRfcsDhcp_TypesAndValues all;

    import from LibIpv6_Rfc3315Dhcp_TypesAndValues all;

    import from LibIpv6_Rfc3646Dhcp_TypesAndValues all;
@@ -95,7 +93,7 @@ module AtsDSLite_Templates { 
        

    } // End of group dhcpv6Templates

    

    group dhcpv6RecvMessages {

    group ipv6RecvMessages {

        

        /**

         *  @param  p_nextHeader Next header identifier value to be used.
@@ -115,7 +113,26 @@ module AtsDSLite_Templates { 
            }

        } // End of template mdw_generalIpv6_extHdr_dst_ipv4Payload

        

    } // End of group dhcpv6RecvMessages

        /**

         *  @param  p_nextHeader Next header identifier value to be used.

         *  @param  p_extHdrList List of extension header in the packet.

         *  @param  p_src Binary IPv6 address associated with the

         *          test component.

         *  @param  p_dst Binary IPv6 address associated with NUT.

         *  @param  p_data Data sent.

        */

        template (present) Ipv6Packet mw_generalIpv6_extHdr_data(

            UInt8 p_nextHeader,

            template(present) Ipv6Address p_src,

            template(present) Ipv6Address p_dst,

            template(present) ExtensionHeaderList p_extHdrList,

            template(present) octetstring p_data) := {

            ipv6Hdr := m_ipHdr_nextHdr_srcDst(p_nextHeader, p_src, p_dst),

            extHdrList := p_extHdrList,

            ipv6Payload := { octetstringMsg := p_data }

        }

        

    } // End of group ipv6RecvMessages

    

    group dnsMessageTemplates {

ttcn/AtsDSlite/AtsDSLite_TestCases.ttcn3

+5 −6
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ module AtsDSLite_TestCases { 
    // LibIPv6

    import from LibIpv6_CommonRfcsDhcp_TypesAndValues all;

    import from LibIpv6_Interface_TypesAndValues all;

    import from LibIpv6_Interface_Templates {

        template m_generalIpv6_extHdr_data

    };

    import from LibIpv6_Interface_Templates all;

    import from LibIpv6_Interface_Functions all;

    

    // AtsCommon
@@ -993,7 +991,7 @@ module AtsDSLite_TestCases { 
                                        )

                                    ),

                                    v_firstFragment                         // containing first fragment

                            )) -> value ipv6Packet {

                            )) -> value v_ipv6Packet {

                                log("*** " & __SCOPE__ & ": First fragmented packet received. ***");

                                tc_ac.stop;

                                v_firstReceived := true;
@@ -1004,8 +1002,9 @@ module AtsDSLite_TestCases { 
                                }

                            }

                            [v_lastReceived==false] aftrPort.receive(

                                m_generalIpv6_extHdr_data(

                                mw_generalIpv6_extHdr_data(

                                    c_fragHdr,

                                    ?,

                                    PX_AFTR_GW_ADDRESS,                     // containing destination address indicating IPv6 AFTR GW address

                                    m_extHdrList_1Elem (

                                        m_extHdr_fragmentHeader (
@@ -1016,7 +1015,7 @@ module AtsDSLite_TestCases { 
                                        )

                                    ),

                                    ?                                       // containing last fragment

                            )) -> value ipv6Packet {

                            )) -> value v_ipv6Packet {

                                log("*** " & __SCOPE__ & ": Last fragmented packet received. ***");

                                tc_ac.stop;

                                v_lastReceived := true;