Fixed field order (GeoShape) in UtGenerateGeoBroadcast/UtGenerateGeoAnycast (5a19f1f9) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+14 −12

Original line number	Diff line number	Diff line
		@@ -138,25 +138,26 @@ module LibItsGeoNetworking_Templates {

		/**
		* @desc Request IUT to send a GeoBroadcast message to a specific area
		* @param p_area Destination area of the message
		* @param p_geoArea Destination area of the message
		*/
		template UtGnTrigger m_generateGeoBroadcastMessage(
		GeoArea p_area
		GeoArea p_geoArea
		) := {
		geoBroadcast := {
		shape := p_geoArea.shape,
		lifetime := 1000 * c_defaultLifetime,
		area := p_area,
		area := p_geoArea.area,
		payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
		}
		}

		/**
		* @desc Request IUT to send a GeoBroadcast message to a specific area
		* @param p_area Destination area of the message
		* @param p_geoArea Destination area of the message
		* @param p_lifetime Packet's lifetime
		*/
		template UtGnTrigger m_generateGeoBroadcastMessageWithLifetime(
		GeoArea p_area,
		GeoArea p_geoArea,
		integer p_lifetime
		) modifies m_generateGeoBroadcastMessage := {
		geoBroadcast := {
		@@ -166,12 +167,12 @@ module LibItsGeoNetworking_Templates {

		/**
		* @desc Request IUT to send a GeoBroadcast message to a specific area with a payload
		* @param p_area Destination area of the message
		* @param p_geoArea Destination area of the message
		* @param p_payload Payload of the GeoBroadcast message
		* @see m_generateGeoBroadcastMessage
		*/
		template UtGnTrigger m_generateGeoBroadcastMessageWithPayload(
		GeoArea p_area,
		GeoArea p_geoArea,
		octetstring p_payload
		) modifies m_generateGeoBroadcastMessage := {
		geoBroadcast := {
		@@ -181,26 +182,27 @@ module LibItsGeoNetworking_Templates {

		/**
		* @desc Request IUT to send a GeoAnycast message to a specific area
		* @param p_area Destination area of the message
		* @param p_geoArea Destination area of the message
		*/
		template UtGnTrigger m_generateGeoAnycastMessage(
		GeoArea p_area
		GeoArea p_geoArea
		) := {
		geoAnycast := {
		shape := p_geoArea.shape,
		lifetime := 1000 * c_defaultLifetime,
		area := p_area,
		area := p_geoArea.area,
		payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
		}
		}

		/**
		* @desc Request IUT to send a GeoAnycast message to a specific area with a payload
		* @param p_area Destination area of the message
		* @param p_geoArea Destination area of the message
		* @param p_payload Payload of the GeoAnycast message
		* @see m_generateGeoAnycastMessage
		*/
		template UtGnTrigger m_generateGeoAnycastMessageWithPayload(
		GeoArea p_area,
		GeoArea p_geoArea,
		octetstring p_payload
		) modifies m_generateGeoAnycastMessage := {
		geoAnycast := {

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+2 −1

Original line number	Diff line number	Diff line
		@@ -908,8 +908,9 @@ module LibItsGeoNetworking_TypesAndValues {
		* @member payload Payload of the packet
		*/
		type record GenerateGeoBroadcastMessage {
		GeoShape shape,
		UInt16 lifetime,
		GeoArea area,
		Area area,
		Payload payload
		}