Fixed field name in ComonHeader.Changed mw_commonHeader (cc6881e1) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+48 −61

Original line number	Original line	Diff line number	Diff line
	@@ -66,10 +66,11 @@ module LibItsGeoNetworking_Templates {
	plLength := 0, // will be computed by Codec		plLength := 0, // will be computed by Codec
	trafficClass := p_trafficClass,		trafficClass := p_trafficClass,
	hopLimit := p_hopLimit,		hopLimit := p_hopLimit,
	longPosVec := p_longPosVec		senderPosVector := p_longPosVec
	}		}

	template CommonHeader mw_commonHeader (		template CommonHeader mw_commonHeader (
			in template (present) LongPosVector p_senderLongPosVec,
	in template (present) NextHeader p_nextHeader,		in template (present) NextHeader p_nextHeader,
	in template (present) HeaderTST p_headerTST,		in template (present) HeaderTST p_headerTST,
	in template (present) StationTypeIdentifier p_stationType		in template (present) StationTypeIdentifier p_stationType
	@@ -82,7 +83,7 @@ module LibItsGeoNetworking_Templates {
	plLength := ?,		plLength := ?,
	trafficClass := ?,		trafficClass := ?,
	hopLimit := ?,		hopLimit := ?,
	longPosVec := ?		senderPosVector := p_senderLongPosVec
	}		}

	template CommonHeader mw_commonHeaderBeacon (		template CommonHeader mw_commonHeaderBeacon (
	@@ -102,30 +103,11 @@ module LibItsGeoNetworking_Templates {
	plLength := 0,		plLength := 0,
	trafficClass := p_trafficClass,		trafficClass := p_trafficClass,
	hopLimit := p_hopLimit,		hopLimit := p_hopLimit,
	longPosVec := p_senderLongPosVec		senderPosVector := p_senderLongPosVec
	}

	template CommonHeader mw_commonHeaderWithSender (
	in template (present) NextHeader p_nextHeader,
	in template (present) HeaderTST p_headerTST,
	in template (present) StationTypeIdentifier p_stationType,
	in template (present) LongPosVector p_senderLongPosVec
	) modifies mw_commonHeader := {
	longPosVec := p_senderLongPosVec
	}

	template CommonHeader mw_commonHeaderWithSenderWithHopLimit (
	in template (present) NextHeader p_nextHeader,
	in template (present) HeaderTST p_headerTST,
	in template (present) StationTypeIdentifier p_stationType,
	in template (present) LongPosVector p_senderLongPosVec,
	in template (present) UInt8 p_hopLimit
	) modifies mw_commonHeader := {
	longPosVec := p_senderLongPosVec,
	hopLimit := p_hopLimit
	}		}

	template CommonHeader mw_commonHeaderWithHopLimit (		template CommonHeader mw_commonHeaderWithHopLimit (
			in template (present) LongPosVector p_senderLongPosVec,
	in template (present) NextHeader p_nextHeader,		in template (present) NextHeader p_nextHeader,
	in template (present) HeaderTST p_headerTST,		in template (present) HeaderTST p_headerTST,
	in template (present) StationTypeIdentifier p_stationType,		in template (present) StationTypeIdentifier p_stationType,
	@@ -234,6 +216,7 @@ module LibItsGeoNetworking_Templates {
	) := {		) := {
	geoUnicastHeader := {		geoUnicastHeader := {
	commonHeader := mw_commonHeader(		commonHeader := mw_commonHeader(
			p_senderLongPosVec,
	?,		?,
	mw_geoUnicastHeaderType,		mw_geoUnicastHeaderType,
	p_stationType		p_stationType
	@@ -334,11 +317,11 @@ module LibItsGeoNetworking_Templates {
	in template (present) UInt16 p_seqNumber		in template (present) UInt16 p_seqNumber
	) := {		) := {
	geoBroadcastHeader := {		geoBroadcastHeader := {
	commonHeader := mw_commonHeaderWithSender(		commonHeader := mw_commonHeader(
			p_senderLongPosVec,
	?,		?,
	mw_geoBroadcastHeaderType,		mw_geoBroadcastHeaderType,
	p_stationType,		p_stationType
	p_senderLongPosVec
	),		),
	seqNumber := p_seqNumber,		seqNumber := p_seqNumber,
	lifetime := ?,		lifetime := ?,
	@@ -361,11 +344,11 @@ module LibItsGeoNetworking_Templates {
	in template (present) BroadcastArea p_broadcastArea		in template (present) BroadcastArea p_broadcastArea
	) modifies mw_geoBroadcastHeader := {		) modifies mw_geoBroadcastHeader := {
	geoBroadcastHeader := {		geoBroadcastHeader := {
	commonHeader := mw_commonHeaderWithSender(		commonHeader := mw_commonHeader(
			p_senderLongPosVec,
	?,		?,
	mw_geoBroadcastHeaderTypeWithSubType(p_broadcastArea.geoBroadcastSubType),		mw_geoBroadcastHeaderTypeWithSubType(p_broadcastArea.geoBroadcastSubType),
	p_stationType,		p_stationType
	p_senderLongPosVec
	),		),
	geoAreaPosLatitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLatitude,		geoAreaPosLatitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLatitude,
	geoAreaPosLongitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLongitude,		geoAreaPosLongitude := p_broadcastArea.geoBroadcastArea.geoAreaPosLongitude,
	@@ -384,11 +367,11 @@ module LibItsGeoNetworking_Templates {
	in template (present) UInt8 p_hopLimit		in template (present) UInt8 p_hopLimit
	) modifies mw_geoBroadcastHeaderWithArea := {		) modifies mw_geoBroadcastHeaderWithArea := {
	geoBroadcastHeader := {		geoBroadcastHeader := {
	commonHeader := mw_commonHeaderWithSenderWithHopLimit(		commonHeader := mw_commonHeaderWithHopLimit(
			p_senderLongPosVec,
	?,		?,
	mw_geoBroadcastHeaderType,		mw_geoBroadcastHeaderType,
	p_stationType,		p_stationType,
	p_senderLongPosVec,
	p_hopLimit		p_hopLimit
	)		)
	}		}
	@@ -483,11 +466,11 @@ module LibItsGeoNetworking_Templates {
	in template (present) UInt16 p_seqNumber		in template (present) UInt16 p_seqNumber
	) := {		) := {
	geoAnycastHeader := {		geoAnycastHeader := {
	commonHeader := mw_commonHeaderWithSender(		commonHeader := mw_commonHeader(
			p_senderLongPosVec,
	?,		?,
	mw_geoAnycastHeaderType,		mw_geoAnycastHeaderType,
	p_stationType,		p_stationType
	p_senderLongPosVec
	),		),
	seqNumber := p_seqNumber,		seqNumber := p_seqNumber,
	lifetime := ?,		lifetime := ?,
	@@ -510,11 +493,11 @@ module LibItsGeoNetworking_Templates {
	in template (present) AnycastArea p_anycastArea		in template (present) AnycastArea p_anycastArea
	) modifies mw_geoAnycastHeader := {		) modifies mw_geoAnycastHeader := {
	geoAnycastHeader := {		geoAnycastHeader := {
	commonHeader := mw_commonHeaderWithSender(		commonHeader := mw_commonHeader(
			p_senderLongPosVec,
	?,		?,
	mw_geoAnycastHeaderTypeWithSubType(p_anycastArea.geoAnycastSubType),		mw_geoAnycastHeaderTypeWithSubType(p_anycastArea.geoAnycastSubType),
	p_stationType,		p_stationType
	p_senderLongPosVec
	),		),
	geoAreaPosLatitude := p_anycastArea.geoAnycastArea.geoAreaPosLatitude,		geoAreaPosLatitude := p_anycastArea.geoAnycastArea.geoAreaPosLatitude,
	geoAreaPosLongitude := p_anycastArea.geoAnycastArea.geoAreaPosLongitude,		geoAreaPosLongitude := p_anycastArea.geoAnycastArea.geoAreaPosLongitude,
	@@ -533,11 +516,11 @@ module LibItsGeoNetworking_Templates {
	in template (present) UInt8 p_hopLimit		in template (present) UInt8 p_hopLimit
	) modifies mw_geoAnycastHeaderWithArea := {		) modifies mw_geoAnycastHeaderWithArea := {
	geoAnycastHeader := {		geoAnycastHeader := {
	commonHeader := mw_commonHeaderWithSenderWithHopLimit(		commonHeader := mw_commonHeaderWithHopLimit(
			p_senderLongPosVec,
	?,		?,
	mw_geoAnycastHeaderType,		mw_geoAnycastHeaderType,
	p_stationType,		p_stationType,
	p_senderLongPosVec,
	p_hopLimit		p_hopLimit
	)		)
	}		}
	@@ -602,6 +585,7 @@ module LibItsGeoNetworking_Templates {
	) := {		) := {
	lsRequestHeader := {		lsRequestHeader := {
	commonHeader := mw_commonHeader(		commonHeader := mw_commonHeader(
			?,
	e_any,		e_any,
	mw_lsRequestHeaderType,		mw_lsRequestHeaderType,
	p_stationType		p_stationType
	@@ -675,6 +659,7 @@ module LibItsGeoNetworking_Templates {
	) := {		) := {
	lsReplyHeader := {		lsReplyHeader := {
	commonHeader := mw_commonHeader(		commonHeader := mw_commonHeader(
			?,
	e_any,		e_any,
	m_lsReplyHeaderType,		m_lsReplyHeaderType,
	p_stationType		p_stationType
	@@ -781,6 +766,7 @@ module LibItsGeoNetworking_Templates {
	) := {		) := {
	shbHeader := {		shbHeader := {
	commonHeader := mw_commonHeader(		commonHeader := mw_commonHeader(
			?,
	?,		?,
	m_shbHeaderType,		m_shbHeaderType,
	p_stationType		p_stationType
	@@ -842,6 +828,7 @@ module LibItsGeoNetworking_Templates {
	) := {		) := {
	tsbHeader := {		tsbHeader := {
	commonHeader := mw_commonHeader(		commonHeader := mw_commonHeader(
			?,
	e_any,		e_any,
	m_tsbHeaderType,		m_tsbHeaderType,
	p_stationType		p_stationType

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -356,7 +356,7 @@ module LibItsGeoNetworking_TypesAndValues {
	UInt16 plLength,		UInt16 plLength,
	TrafficClass trafficClass,		TrafficClass trafficClass,
	UInt8 hopLimit,		UInt8 hopLimit,
	LongPosVector longPosVec		LongPosVector senderPosVector
	}		}

	/**		/**