Changed IP address usage. (5511efd0) · Commits · CABLE - Integrated broadband cable telecommunication networks / CableIPv6

ttcn/AtsCommon/AtsCommon_Dhcpv4_CommonRfcs_TypesAndValues.ttcn

+3 −2

Original line number	Diff line number	Diff line
		@@ -13,6 +13,9 @@
		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_DataStrings all;

		//LibIpv6
		import from LibIpv6_CommonRfcs_TypesAndValues all;

		//AtsCommon
		import from AtsCommon_Dhcpv4_Rfc1533_TypesAndValues all;
		import from AtsCommon_Dhcpv4_Rfc5969_TypesAndValues all;
		@@ -34,8 +37,6 @@
		DHCPv4Options options
		}

		type charstring Ipv4Address (pattern "[0-9]+[.][0-9]+[.][0-9]+[.][0-9]+");

		group bootpHeader {

		type record BootpHeader {

ttcn/AtsCommon/AtsCommon_Dhcpv4_Rfc1533_TypesAndValues.ttcn

+3 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,9 @@
		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_DataStrings all;

		//LibIpv6
		import from LibIpv6_CommonRfcs_TypesAndValues all;

		// AtsCommon
		import from AtsCommon_Dhcpv4_CommonRfcs_TypesAndValues all;

ttcn/AtsCommon/AtsCommon_Dhcpv4_Rfc5969_TypesAndValues.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@
		SixrdBRIPv4Addresses sixrdBRIPv4Addresses
		}

		type record length(1..infinity) of AtsCommon_Dhcpv4_CommonRfcs_TypesAndValues.Ipv4Address SixrdBRIPv4Addresses;
		type record length(1..infinity) of Ipv4Address SixrdBRIPv4Addresses;

		} // end dhcpExtensions

ttcn/AtsCommon/AtsCommon_Tcp_Rfc793_TypesAndValues.ttcn3

+7 −7

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ module AtsCommon_Tcp_Rfc793_TypesAndValues {

		//LibCommon
		import from LibCommon_BasicTypesAndValues {
		type UInt16, UInt32
		type UInt4, UInt16, UInt32
		};
		import from LibCommon_DataStrings {
		type Bit1, Bit3, Bit4
		@@ -37,15 +37,15 @@ module AtsCommon_Tcp_Rfc793_TypesAndValues {
		UInt16 dstPort,
		UInt32 seqNumber,
		UInt32 ackNumber optional,
		Bit4 dataOffset,
		UInt4 dataOffset,
		Bit3 reserved('000'B),
		TcpFlags flags,
		UInt16 windowSize,
		UInt16 checksum,
		UInt16 urgentPointer,
		octetstring options length(0..40),
		octetstring options length(1..40) optional,
		octetstring pad optional,
		TcpPayload payload
		TcpPayload payload optional
		} // End of type TcpPacket

		/**
		@@ -80,8 +80,8 @@ module AtsCommon_Tcp_Rfc793_TypesAndValues {
		* @member rawPayload Raw payload
		*/
		type union TcpPayload {
		octetstring ftpPayload, // FIXME Used correct type
		octetstring httpPayload, // FIXME Used correct type
		octetstring ftpPayload, // FIXME Use correct type
		octetstring httpPayload, // FIXME Use correct type
		octetstring rawPayload
		} // End of type TcpPayload

ttcn/AtsCommon/AtsCommon_Templates.ttcn3

+40 −36

Original line number	Diff line number	Diff line
		@@ -6,21 +6,14 @@
		module AtsCommon_Templates {

		// LibCommon
		import from LibCommon_BasicTypesAndValues {
		type UInt8, UInt16, UInt32
		};
		import from LibCommon_DataStrings {
		type Oct4
		};
		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_DataStrings all;

		// 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_Interface_TypesAndValues all;
		import from LibIpv6_CommonRfcs_TypesAndValues all;
		import from LibIpv6_Interface_Templates all;
		import from LibIpv6_Rfc3315Dhcp_TypesAndValues all;
		import from LibIpv6_Rfc3646Dhcp_TypesAndValues all;
		import from LibIpv6_Rfc6334Dhcp_TypesAndValues all;
		@@ -42,30 +35,41 @@ module AtsCommon_Templates {
		group ipv4DummySendTemplates {

		template (value) Ipv4Packet m_ipv4Packet_dummy(
		in template (value) UInt32 p_src,
		in template (value) UInt32 p_dst,
		in template (value) Ipv4Address p_src,
		in template (value) Ipv4Address p_dst,
		in template (value) TcpPacket p_tcpPacket
		) := {
		ipv4Hdr := m_ipv4Hdr_protocol_srcDst(
		c_protocol_tcp,
		int2oct(p_src, 4),
		int2oct(p_dst, 4)
		p_src,
		p_dst
		),
		ipv4Payload := {
		rawPacket := bit2oct(encvalue(p_tcpPacket))
		}
		} // End of template m_ipv4Packet_dummy


		} // End of group ipv4DummySendTemplates

		template (value) Ipv4Packet m_ipv4Packet_df(
		in template (value) UInt1 p_doNotFragFlag,
		in template (value) Ipv4Address p_src,
		in template (value) Ipv4Address p_dst,
		in template (value) TcpPacket p_tcpPacket
		) := {
		ipv4Hdr := m_ipv4Hdr_protocol_srcDst_df(p_doNotFragFlag, c_protocol_tcp, p_src, p_dst),
		ipv4Payload := {
		rawPacket := bit2oct(encvalue(p_tcpPacket))
		}
		}

		} // End of group ipv4MessageTemplates

		group tcpv4MessageTemplates {
		group tcpMessageTemplates {

		group tcpv4DummySendTemplates {
		group tcpDummySendTemplates {

		template (value) TcpPacket m_tcpv4_packet(
		template (value) TcpPacket m_tcp_packet(
		in template (value) UInt16 p_srcPort,
		in template (value) UInt16 p_dstPort,
		in template (value) TcpPayload p_payload
		@@ -74,18 +78,18 @@ module AtsCommon_Templates {
		dstPort := p_dstPort,
		seqNumber := 0,
		ackNumber := omit,
		dataOffset := '0101'B,
		dataOffset := 5,
		reserved := '000'B,
		flags := m_tcpv4_flags_dummy,
		flags := m_tcp_flags_dummy,
		windowSize := 0,
		checksum := 0,
		urgentPointer := 0,
		options := ''O,
		options := omit,
		pad := omit,
		payload := p_payload
		} // End of template m_tcpv4_packet
		} // End of template m_tcp_packet

		template (value) TcpFlags m_tcpv4_flags_dummy := {
		template (value) TcpFlags m_tcp_flags_dummy := {
		ns := '0'B,
		cwr := '0'B,
		ece := '0'B,
		@@ -95,30 +99,30 @@ module AtsCommon_Templates {
		rst := '0'B,
		syn := '0'B,
		fin := '0'B
		} // End of template m_tcpv4_flags_dummy
		} // End of template m_tcp_flags_dummy

		} // End of group tcpv4DummySendTemplates
		} // End of group tcpDummySendTemplates

		group tcpv4MessagesDummyRecvTemplates {
		group tcpMessagesDummyRecvTemplates {

		template (present) TcpPacket mw_tcpv4_packet := {
		template (present) TcpPacket mw_tcp_packet := {
		srcPort := ?,
		dstPort := ?,
		seqNumber := ?,
		ackNumber := *,
		dataOffset := ?,
		reserved := '000'B,
		flags := mw_tcpv4_flags_dummy,
		flags := mw_tcp_flags_dummy,
		windowSize := ?,
		checksum := ?,
		urgentPointer := ?,
		options := ?,
		pad := *,
		payload := ?
		} // End of template mw_tcpv4_packet
		} // End of template mw_tcp_packet


		template (present) TcpFlags mw_tcpv4_flags_dummy := {
		template (present) TcpFlags mw_tcp_flags_dummy := {
		ns := ?,
		cwr := ?,
		ece := ?,
		@@ -128,13 +132,13 @@ module AtsCommon_Templates {
		rst := ?,
		syn := ?,
		fin := ?
		} // End of template mw_tcpv4_flags_dummy
		} // End of template mw_tcp_flags_dummy



		} // End of group tcpv4MessagesDummyRecvTemplates
		} // End of group tcpMessagesDummyRecvTemplates

		} // End of group tcpv4MessageTemplates
		} // End of group tcpMessageTemplates

		group dhcpv4MessageTemplates {