Rename Tcpv4 into Tcp (b05c8a94) · Commits · CABLE - Integrated broadband cable telecommunication networks / CableIPv6

ttcn/AtsCommon/AtsCommon_Tcpv4_Rfc793_TypesAndValues.ttcn3→ttcn/AtsCommon/AtsCommon_Tcp_Rfc793_TypesAndValues.ttcn3

+12 −12

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* @url http://www.ietf.org/rfc/rfc1533.txt
		*
		*/
		module AtsCommon_Tcpv4_Rfc793_TypesAndValues {
		module AtsCommon_Tcp_Rfc793_TypesAndValues {

		//LibCommon
		import from LibCommon_BasicTypesAndValues {
		@@ -24,7 +24,7 @@ module AtsCommon_Tcpv4_Rfc793_TypesAndValues {
		* @member dataOffset Specifies the size of the TCP header in 32-bit words
		* @member reserved Not used. Should be zero
		* @member flags Aka Control bits
		* @member widowSize Size of the receive window
		* @member windowSize Size of the receive window
		* @member checksum 16-bit checksum field is used for error-checking
		* @member urgentPointer Offset from the sequence number indicating the last urgent data byte (if URG flag set)
		* @member options Options field
		@@ -32,21 +32,21 @@ module AtsCommon_Tcpv4_Rfc793_TypesAndValues {
		* @member payload TCP payload
		* @reference http://tools.ietf.org/html/rfc793
		*/
		type record TCPv4Msg {
		type record TcpMsg {
		UInt16 srcPort,
		UInt16 dstPort,
		UInt32 seqNumber,
		UInt32 ackNumber optional,
		Bit4 dataOffset,
		Bit3 reserved('000'B),
		TCPv4Flags flags,
		UInt16 widowSize,
		TcpFlags flags,
		UInt16 windowSize,
		UInt16 checksum,
		UInt16 urgentPointer,
		octetstring options length(0..40),
		octetstring pad optional,
		TCPv4Payload payload
		} // End of type TCPv4Msg
		TcpPayload payload
		} // End of type TcpMsg

		/**
		* @desc Aka Control bits
		@@ -61,7 +61,7 @@ module AtsCommon_Tcpv4_Rfc793_TypesAndValues {
		* @member fin No more data from sender
		* @reference http://tools.ietf.org/html/rfc793, http://tools.ietf.org/html/rfc3540
		*/
		type record TCPv4Flags {
		type record TcpFlags {
		Bit1 ns,
		Bit1 cwr,
		Bit1 ece,
		@@ -71,7 +71,7 @@ module AtsCommon_Tcpv4_Rfc793_TypesAndValues {
		Bit1 rst,
		Bit1 syn,
		Bit1 fin
		} // End of type TCPv4Flags
		} // End of type TcpFlags

		/**
		* @desc
		@@ -79,10 +79,10 @@ module AtsCommon_Tcpv4_Rfc793_TypesAndValues {
		* @member httpPayload HTTP payload
		* @member rawPayload Raw payload
		*/
		type union TCPv4Payload {
		type union TcpPayload {
		octetstring ftpPayload, // FIXME Used correct type
		octetstring httpPayload, // FIXME Used correct type
		octetstring rawPayload
		} // End of type TCPv4Payload
		} // End of type TcpPayload

		} // End of AtsCommon_Tcpv4_Rfc793_TypesAndValues
		No newline at end of file
		} // End of AtsCommon_Tcp_Rfc793_TypesAndValues
		No newline at end of file

ttcn/AtsCommon/AtsCommon_Templates.ttcn3

+10 −10

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ module AtsCommon_Templates {
		import from LibIpv6_Rfc6334Dhcp_TypesAndValues all;

		// AtsCommon
		import from AtsCommon_Tcpv4_Rfc793_TypesAndValues all;
		import from AtsCommon_Tcp_Rfc793_TypesAndValues all;
		import from AtsCommon_Dhcpv4_CommonRfcs_TypesAndValues all;
		import from AtsCommon_Dhcpv4_Rfc1533_TypesAndValues all;
		import from AtsCommon_Dhcpv4_Rfc5969_TypesAndValues all;
		@@ -29,10 +29,10 @@ module AtsCommon_Templates {

		group tcpv4DummySendTemplates {

		template (value) TCPv4Msg m_tcpv4_packet(
		template (value) TcpMsg m_tcpv4_packet(
		in template (value) UInt16 p_srcPort,
		in template (value) UInt16 p_dstPort,
		in template (value) TCPv4Payload p_payload
		in template (value) TcpPayload p_payload
		) := {
		srcPort := p_srcPort,
		dstPort := p_dstPort,
		@@ -41,7 +41,7 @@ module AtsCommon_Templates {
		dataOffset := '0101'B,
		reserved := '000'B,
		flags := m_tcpv4_flags_dummy,
		widowSize := 0,
		windowSize := 0,
		checksum := 0,
		urgentPointer := 0,
		options := ''O,
		@@ -49,7 +49,7 @@ module AtsCommon_Templates {
		payload := p_payload
		} // End of template m_tcpv4_packet

		template (value) TCPv4Flags m_tcpv4_flags_dummy := {
		template (value) TcpFlags m_tcpv4_flags_dummy := {
		ns := '0'B,
		cwr := '0'B,
		ece := '0'B,
		@@ -65,7 +65,7 @@ module AtsCommon_Templates {

		group tcpv4MessagesDummyRecvTemplates {

		template (present) TCPv4Msg mw_tcpv4_packet := {
		template (present) TcpMsg mw_tcpv4_packet := {
		srcPort := ?,
		dstPort := ?,
		seqNumber := ?,
		@@ -73,7 +73,7 @@ module AtsCommon_Templates {
		dataOffset := ?,
		reserved := '000'B,
		flags := mw_tcpv4_flags_dummy,
		widowSize := ?,
		windowSize := ?,
		checksum := ?,
		urgentPointer := ?,
		options := ?,
		@@ -82,7 +82,7 @@ module AtsCommon_Templates {
		} // End of template mw_tcpv4_packet


		template (present) TCPv4Flags mw_tcpv4_flags_dummy := {
		template (present) TcpFlags mw_tcpv4_flags_dummy := {
		ns := ?,
		cwr := ?,
		ece := ?,