Merge STF422 with STF405, namming bugs fixed (037cae2a) · Commits · TTCN-3 Libraries / LibIts

ttcn/LibIts_Interface.ttcn

+85 −8

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ module LibIts_Interface {
		import from CALMmsap language "ASN.1:1997" all;
		import from CALMfntp language "ASN.1:1997" all;
		import from LibItsMgt_TypesAndValues all;
		import from LibItsNt_TypesAndValues all;
		import from LibItsFntp_TypesAndValues all;
		import from LibItsFsap_TypesAndValues all;
		// LibIts
		import from LibItsCommon_TypesAndValues all;
		@@ -145,10 +145,7 @@ module LibIts_Interface {
		// timers

		// variables
		var PduCounter vc_pduCounter;
		var CommandRef vc_commandRef; // Cyclic counter identifying a NF-FNTP-COM.request
		var integer vc_noFNTPfwtEntry;
		var ITS_scuId vc_scuId; // TODO Check if it is used or not
		var PduCounter vc_pduCounter; // Cyclic counter identifying a PDU counter

		} // End of component ItsMgt

		@@ -182,7 +179,10 @@ module LibIts_Interface {
		var AddressTable vc_addressTable := {};

		// Variables for Fntp
		var CommandRef vc_commandRef; // Cyclic counter identifying a NF-FNTP-COM.request
		var PortNumber vc_portNumber;
		var integer vc_noFNTPfwtEntry;
		var ITS_scuId vc_scuId; // TODO Check if it is used or not

		} // End of component ItsNt

		@@ -262,7 +262,7 @@ module LibIts_Interface {
		* @desc MGT1 IISC Port (IISC/LAN)
		*/
		type port IiscPort message {
		in IiscInd;
		in IiscResp;
		out IiscReq;
		} // End of port IiscPort

		@@ -343,7 +343,8 @@ module LibIts_Interface {
		inout
		INsapPrimitivesUp,
		INsapPrimitivesDown
		} // end FntpPort
		} // End of port FntpPort

		// FIXME To be remove at the end
		// /**
		// * @desc NT3 Fast Port (Fast/M5-IR)
		@@ -599,7 +600,83 @@ module LibIts_Interface {

		} // End of group managementPrimitives

		group networkAndTransportPrimitives { } // End of group networkAndTransportPrimitives
		group networkAndTransportPrimitives {

		group nt1Primitives {

		/**
		* @desc NT1 BTP Indication Primitive
		*/
		type record BtpInd {
		BtpPacket msgIn
		}

		/**
		* @desc NT1 BTP Request Primitive
		*/
		type record BtpReq {
		BtpPacket msgOut
		}

		} // end nt1Primitives

		group nt2Primitives {

		/**
		* @desc NT2 GeoNetworking Indication Primitive
		*/
		type record GeoNetworkingInd {
		GeoNetworkingPacket msgIn,
		MacAddress macDestinationAddress
		}

		/**
		* @desc NT2 GeoNetworking Request Primitive
		*/
		type record GeoNetworkingReq {
		GeoNetworkingPacket msgOut,
		MacAddress macDestinationAddress
		}

		/**
		* @desc NT2 IPv6 over GeoNetworking Indication Primitive
		*/
		type record IPv6OverGeoNetworkingInd {
		charstring interface,
		MacAddress macSourceAddress,
		MacAddress macDestinationAddress,
		Ipv6Packet ipv6Packet
		}

		/**
		* @desc NT2 IPv6 over GeoNetworking Request Primitive
		*/
		type record IPv6OverGeoNetworkingReq {
		charstring interface,
		MacAddress macSourceAddress,
		MacAddress macDestinationAddress,
		Ipv6Packet ipv6Packet
		}

		} // end nt2Primitives

		group nt3Primitives {

		// /**
		// * @desc NT3 Fast Indication Primitive
		// */
		// type record FastInd {
		// }
		//
		// /**
		// * @desc NT3 Fast Request Primitive
		// */
		// type record FastReq {
		// }
		//
		} // end nt3Primitives

		} // End of group networkAndTransportPrimitives

		}
		with {