Resolve FIXME and update comments (8e2c40a8) · Commits · TTCN-3 Libraries / LibIts

ttcn/FNTP/LibItsFntp_Pixits.ttcn3

+6 −5

Original line number	Diff line number	Diff line
		@@ -45,13 +45,13 @@ module LibItsFntp_Pixits {
		modulepar integer PX_SERVICE_REF := 0;

		/**
		* @desc Defines teh value to set to fill field for NFsapPrimitivesUp primitive
		* @desc Defines the value to set to fill field for NFsapPrimitivesUp primitive
		* @see ISO 29281-2 - Clause 8.2.1 Link Identifier
		*/
		modulepar Bit6 PX_NF_SAP_UP_FILL_FIELD_VALUE := '000000'B;

		/**
		* @desc Defines teh value to set to fill field for NFsapPrimitivesDown primitive
		* @desc Defines the value to set to fill field for NFsapPrimitivesDown primitive
		* @see ISO 29281-2 - Clause 8.2.1 Link Identifier
		*/
		modulepar Bit7 PX_NF_SAP_DOWN_FILL_FIELD_VALUE := '0000000'B;
		@@ -227,6 +227,10 @@ module LibItsFntp_Pixits {

		} // End of group stationIDs

		/**
		* @desc Source and destination Ports
		* @see ISO/WD 29281-2 Clause 6.2.2.2
		*/
		group portNumbers {

		/**
		@@ -256,21 +260,18 @@ module LibItsFntp_Pixits {

		/**
		* @desc Indicate the forwarding source port number, i.e. the originator endpoint
		*
		* @see ISO/CD 29281-2 Clause 8.3.1
		*/
		modulepar PortNumber PX_FORWARDING_SRC_PORT := { portLong := 5550 } ;

		/**
		* @desc Indicate the forwarding destination port number, i.e. the destinator endpoint
		*
		* @see ISO/CD 29281-2 Clause 8.3.1
		*/
		modulepar PortNumber PX_FORWARDING_DST_PORT := { portLong := 5551 } ;

		/**
		* @desc Indicate the forwarding destination port number, i.e. the destinator endpoint
		*
		* @see ISO/CD 29281-2 Clause 8.3.1
		*/
		modulepar PortNumber PX_SERVICE_PORT := { portLong := 32700 } ;

ttcn/Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn

+25 −4

Original line number	Diff line number	Diff line
		@@ -536,6 +536,27 @@ module LibItsIpv6OverGeoNetworking_Functions {
		return true;
		} // end f_isIpv6AddressCorrespondingToPrefix

		/**
		* @desc Calculate ICMPv6 checksum on pseudo header according RFC 4443 - Clause 2.3
		* @param p_sourceAddress Source address,
		* @param p_destinationAddress Destination address
		* @param p_payloadLength Upper-Layer Packet Length
		* @param p_nextHdr Next header value (e.g. 0x3a for ICMPv6)
		*/
		function f_computeIPv6CheckSum(
		in template (value) Ipv6Address p_sourceAddress,
		in template (value) Ipv6Address p_destinationAddress,
		in template (value) integer p_payloadLength,
		in template (value) UInt8 p_nextHdr
		) return Oct2 {
		var Oct2 v_checksum := 'FFFF'O;

		log("* f_computeIPv6CheckSum: INFO: calling fx_computeIPv6CheckSum() *");
		v_checksum := fx_computeIPv6CheckSum(p_sourceAddress, p_destinationAddress, p_payloadLength, p_nextHdr);

		return v_checksum;
		}

		} // end group miscellaneous

		group externalFunctions {
		@@ -544,8 +565,8 @@ module LibItsIpv6OverGeoNetworking_Functions {
		* @desc Calculate ICMPv6 checksum on pseudo header according RFC 4443 - Clause 2.3
		* @param p_sourceAddress Source address,
		* @param p_destinationAddress Destination address
		* @param p_nextHdr Next header value (e.g. 0x3a for ICMPv6)
		* @param p_payloadLength Upper-Layer Packet Length
		* @param p_nextHdr Next header value (e.g. 0x3a for ICMPv6)
		* @return The checksum value
		* <pre>
		* Pseudo header is defined by RFC 2460 - Clause 8.1
		@@ -575,8 +596,8 @@ module LibItsIpv6OverGeoNetworking_Functions {
		external function fx_computeIPv6CheckSum(
		in template (value) Ipv6Address p_sourceAddress,
		in template (value) Ipv6Address p_destinationAddress,
		in template (value) UInt8 p_nextHdr,
		in template (value) integer p_payloadLength
		in template (value) integer p_payloadLength,
		in template (value) UInt8 p_nextHdr
		) return Oct2;

		} // End of group externalFunctions

ttcn/LibIts_Interface.ttcn

+19 −37

Original line number	Diff line number	Diff line
		@@ -285,15 +285,13 @@ module LibIts_Interface {
		/**
		* @desc MGT2 Management Port - MN-SAP service primitives
		*/
		type port MgtMNSapPort message { // FIXME Simplfy this using inout
		in
		MgtMNSapCommandReqInd,
		MgtMNSapCommandInd,
		MgtMNSapRequestReqInd,
		MgtMNSapRequestConfirmInd;
		out
		type port MgtMNSapPort message {
		inout
		MgtMNSapCommandReq,
		MgtMNSapRequestReq;
		in
		MgtMNSapCommandConfirm,
		MgtMNSapRequestConfirm;
		} // End of port MgtMNSapPort

		} // End of group mgt2Ports
		@@ -548,52 +546,36 @@ module LibIts_Interface {

		/**
		* @desc Management service primitive MN-COMMAND.request
		* @see ISO/CD 24102-3 Clause 7.2.3
		* @see ISO/CD 24102-3 Clause 7.2.2
		*/
		type record MgtMNSapCommandReqInd {
		MN_Command_request msgIn
		type record MgtMNSapCommandReq {
		MN_Command_request msgInOut
		}

		/**
		* @desc Management service primitive MN-COMMAND.confirm
		* @see ISO/CD 24102-3 Clause 7.2.3
		* @desc Management service primitive MN-REQUEST.request
		* @see ISO/CD 24102-3 Clause 7.3.2
		*/
		type record MgtMNSapCommandInd {
		MN_Command_confirm msgIn
		type record MgtMNSapRequestReq {
		MN_Request_request msgInOut
		}

		/**
		* @desc Management service primitive MN-REQUEST.request
		* @see ISO/CD 24102-3 Clause 7.3.2
		* @desc Management service primitive MN-COMMAND.confirm
		* @see ISO/CD 24102-3 Clause 7.2.3
		*/
		type record MgtMNSapRequestReqInd {
		MN_Request_request msgIn
		type record MgtMNSapCommandConfirm {
		MN_Command_confirm msgIn
		}

		/**
		* @desc Management service primitive MN-REQUEST.confirm
		* @see ISO/CD 24102-3 Clause 7.3.3
		*/
		type record MgtMNSapRequestConfirmInd {
		type record MgtMNSapRequestConfirm {
		MN_Request_confirm msgIn
		}

		/**
		* @desc Management service primitive MN-COMMAND.request
		* @see ISO/CD 24102-3 Clause 7.2.2
		*/
		type record MgtMNSapCommandReq {
		MN_Command_request msgOut
		}

		/**
		* @desc Management service primitive MN-REQUEST.request
		* @see ISO/CD 24102-3 Clause 7.3.2
		*/
		type record MgtMNSapRequestReq {
		MN_Request_request msgOut
		}

		} // End of group MN_SAP

		} // End of group mgt2Primitives