Commit 2140e8f0 authored by garciay's avatar garciay
Browse files

Rename TcpMsg into TcpPacket 

Add IPv4Packets templates
parent 45d1e465

ttcn/AtsCommon/AtsCommon_Tcp_Rfc793_TypesAndValues.ttcn3

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ module AtsCommon_Tcp_Rfc793_TypesAndValues { 
     * @member payload          TCP payload

     * @reference http://tools.ietf.org/html/rfc793

     */

    type record TcpMsg {

    type record TcpPacket {

        UInt16          srcPort,

        UInt16          dstPort,

        UInt32          seqNumber,
@@ -46,7 +46,7 @@ module AtsCommon_Tcp_Rfc793_TypesAndValues { 
        octetstring     options length(0..40),

        octetstring     pad optional,

        TcpPayload      payload

    } // End of type TcpMsg

    } // End of type TcpPacket

    

    /**

     * @desc Aka Control bits

ttcn/AtsCommon/AtsCommon_Templates.ttcn3

+39 −3
Original line number Diff line number Diff line
@@ -7,13 +7,19 @@ module AtsCommon_Templates { 
    

    // LibCommon

    import from LibCommon_BasicTypesAndValues {

        type UInt16

        type UInt8, UInt16, UInt32

    };

    import from LibCommon_DataStrings {

        type Oct4

    };

    

    // LibIPv6

    import from LibIpv6_Interface_TypesAndValues {

        type Ipv4Packet

    }

    import from LibIpv6_Interface_Templates {

        template m_ipv4Hdr_protocol_srcDst

    };

    import from LibIpv6_CommonRfcsDhcp_TypesAndValues all;

    import from LibIpv6_Rfc3315Dhcp_TypesAndValues all;

    import from LibIpv6_Rfc3646Dhcp_TypesAndValues all;
@@ -25,11 +31,41 @@ module AtsCommon_Templates { 
    import from AtsCommon_Dhcpv4_Rfc1533_TypesAndValues all;

    import from AtsCommon_Dhcpv4_Rfc5969_TypesAndValues all;

    

    group ipv4MessageTemplates {

        

        group ipv4Constants {

            

            const UInt8     c_protocol_tcp := 6;

            

        } // End of group ipv4Constants

        

        group ipv4DummySendTemplates {

            

            template (value) Ipv4Packet m_ipv4Packet_dummy(

                                                           in template (value) UInt32 p_src,

                                                           in template (value) UInt32 p_dst,

                                                           in template (value) TcpPacket p_tcpPacket

            ) := {

                ipv4Hdr := m_ipv4Hdr_protocol_srcDst(

                    c_protocol_tcp, 

                    int2oct(p_src, 4), 

                    int2oct(p_dst, 4)

                ),

                ipv4Payload := {

                    rawPacket := bit2oct(encvalue(p_tcpPacket))

                }

            } // End of template m_ipv4Packet_dummy

            

            

        } // End of group ipv4DummySendTemplates

        

    } // End of group ipv4MessageTemplates

    

    group tcpv4MessageTemplates {

        

        group tcpv4DummySendTemplates {

            

            template (value) TcpMsg m_tcpv4_packet(

            template (value) TcpPacket m_tcpv4_packet(

                                                     in template (value) UInt16 p_srcPort,

                                                     in template (value) UInt16 p_dstPort,

                                                     in template (value) TcpPayload p_payload
@@ -65,7 +101,7 @@ module AtsCommon_Templates { 
        

        group tcpv4MessagesDummyRecvTemplates {

            

            template (present) TcpMsg mw_tcpv4_packet := {

            template (present) TcpPacket mw_tcpv4_packet := {

                srcPort         := ?,

                dstPort         := ?,

                seqNumber       := ?,