Update AcGnPrimitive to activate/deactivate security support in TA (763fafbd) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1645,6 +1645,26 @@ module LibItsGeoNetworking_Functions {

	}		}

			/**
			* @desc Triggers test adapter to enable security support
			* @return FncRetCode
			*/
			function f_acEnableSecurity() runs on ItsGeoNetworking return FncRetCode {

			return f_acTriggerEvent(m_enableSecurity);

			}

			/**
			* @desc Triggers test adapter to disable security support
			* @return FncRetCode
			*/
			function f_acDisableSecurity() runs on ItsGeoNetworking return FncRetCode {

			return f_acTriggerEvent(m_disableSecurity);

			}

	} // end adapterControl		} // end adapterControl

	group commonFunctions {		group commonFunctions {

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+26 −4

Original line number	Original line	Diff line number	Diff line
	@@ -413,6 +413,24 @@ module LibItsGeoNetworking_Templates {
	getLongPosVector := mw_longPosVectorAny(p_gnAddress)		getLongPosVector := mw_longPosVectorAny(p_gnAddress)
	}		}

			/**
			* @desc Enable security support
			*/
			template AcGnPrimitive m_enableSecurity := {
			acEnableSecurity := {
			enable := true
			}
			}

			/**
			* @desc Disable security support
			*/
			template AcGnPrimitive m_disableSecurity := {
			acDisableSecurity := {
			disable := true
			}
			}

	} // end taPrimitives		} // end taPrimitives

	} // geoNwPrimitivesTemplates		} // geoNwPrimitivesTemplates
	@@ -432,7 +450,8 @@ module LibItsGeoNetworking_Templates {
	) := {		) := {
	basicHeader := m_basicHeader(p_lifeTime, p_hopLimit),		basicHeader := m_basicHeader(p_lifeTime, p_hopLimit),
	gnPacket := {		gnPacket := {
	packet := p_packet		packet := p_packet,
			securedMsg := omit
	}		}
	}		}

	@@ -449,7 +468,8 @@ module LibItsGeoNetworking_Templates {
	) := {		) := {
	basicHeader := mw_basicHeader(p_lifeTime, p_hopLimit),		basicHeader := mw_basicHeader(p_lifeTime, p_hopLimit),
	gnPacket := {		gnPacket := {
	packet := p_packet		packet := p_packet,
			securedMsg := omit
	}		}
	}		}

	@@ -470,7 +490,8 @@ module LibItsGeoNetworking_Templates {
	commonHeader := p_commonHeader,		commonHeader := p_commonHeader,
	extendedHeader := p_extHeader,		extendedHeader := p_extHeader,
	payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))		payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
	}		},
			securedMsg := omit
	}		}

	/**		/**
	@@ -538,7 +559,8 @@ module LibItsGeoNetworking_Templates {
	commonHeader := p_commonHeader,		commonHeader := p_commonHeader,
	extendedHeader := p_extHeader,		extendedHeader := p_extHeader,
	payload := *		payload := *
	}		},
			securedMsg := *
	}		}

	/**		/**

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+21 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1000,6 +1000,8 @@ module LibItsGeoNetworking_TypesAndValues {
	* @member startBeaconingMultipleNeighbour -		* @member startBeaconingMultipleNeighbour -
	* @member stopBeaconingMultipleNeighbour -		* @member stopBeaconingMultipleNeighbour -
	* @member getLongPosVector -		* @member getLongPosVector -
			* @member acEnableSecurity -
			* @member acDisableSecurity -
	*/		*/
	type union AcGnPrimitive {		type union AcGnPrimitive {
	AcStartBeaconing startBeaconing,		AcStartBeaconing startBeaconing,
	@@ -1008,7 +1010,9 @@ module LibItsGeoNetworking_TypesAndValues {
	AcStopPassBeaconing stopPassBeaconing,		AcStopPassBeaconing stopPassBeaconing,
	AcStartBeaconingMultipleNeighbour startBeaconingMultipleNeighbour,		AcStartBeaconingMultipleNeighbour startBeaconingMultipleNeighbour,
	AcStopBeaconingMultipleNeighbour stopBeaconingMultipleNeighbour,		AcStopBeaconingMultipleNeighbour stopBeaconingMultipleNeighbour,
	AcGetLongPosVector getLongPosVector		AcGetLongPosVector getLongPosVector,
			AcEnableSecurity acEnableSecurity,
			AcDisableSecurity acDisableSecurity
	}		}

	/**		/**
	@@ -1091,6 +1095,22 @@ module LibItsGeoNetworking_TypesAndValues {
	encode(gnAddress) "LibItsGeoNetworking"		encode(gnAddress) "LibItsGeoNetworking"
	};		};

			/**
			* @desc Primitive used to activate security support
			*/
			type record AcEnableSecurity {
			// TODO To be refined, adding keys, certificates...?
			boolean enable
			}

			/**
			* @desc Primitive used to deactiate security support
			*/
			type record AcDisableSecurity {
			// TODO To be refined, adding keys, certificates...?
			boolean disable
			}

	} // end acPrimitives		} // end acPrimitives
	with {		with {
	encode "AdapterControl"		encode "AdapterControl"

Admin message