Start AtsGeonetworking review for ITS rel.2 (a831b1f7) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

TS.ITS_TTF_T036.code-workspace

deleted100644 → 0

+0 −116

Original line number	Diff line number	Diff line
		{
		"folders": [
		{
		"path": "."
		},
		{
		"path": "../../tmp/crypto-test-vectors"
		},
		{
		"path": "../../frameworks/openssl"
		},
		{
		"path": "../../frameworks/titan/titan.core"
		},
		{
		"path": "../../frameworks/fsmsggen"
		},
		{
		"path": "../itscertgen"
		},
		{
		"path": "../../tmp/titan_etsi_its_per_issue"
		},
		{
		"path": "../../tmp/titan_5gngap_per_issue"
		},
		{
		"path": "../../tmp/test_cpp"
		},
		{
		"path": "../TS.ITS.pipeline-scripts"
		}
		],
		"settings": {
		"files.associations": {
		"array": "cpp",
		"bit": "cpp",
		"*.tcc": "cpp",
		"cctype": "cpp",
		"chrono": "cpp",
		"clocale": "cpp",
		"cmath": "cpp",
		"condition_variable": "cpp",
		"cstdint": "cpp",
		"cstdio": "cpp",
		"cstdlib": "cpp",
		"ctime": "cpp",
		"cwchar": "cpp",
		"cwctype": "cpp",
		"deque": "cpp",
		"map": "cpp",
		"unordered_map": "cpp",
		"vector": "cpp",
		"exception": "cpp",
		"fstream": "cpp",
		"functional": "cpp",
		"initializer_list": "cpp",
		"iomanip": "cpp",
		"iosfwd": "cpp",
		"iostream": "cpp",
		"istream": "cpp",
		"limits": "cpp",
		"memory": "cpp",
		"mutex": "cpp",
		"new": "cpp",
		"optional": "cpp",
		"ostream": "cpp",
		"ratio": "cpp",
		"sstream": "cpp",
		"stdexcept": "cpp",
		"streambuf": "cpp",
		"string": "cpp",
		"string_view": "cpp",
		"system_error": "cpp",
		"thread": "cpp",
		"type_traits": "cpp",
		"tuple": "cpp",
		"typeinfo": "cpp",
		"utility": "cpp",
		"atomic": "cpp",
		"bitset": "cpp",
		"codecvt": "cpp",
		"cstdarg": "cpp",
		"cstddef": "cpp",
		"cstring": "cpp",
		"algorithm": "cpp",
		"filesystem": "cpp",
		"iterator": "cpp",
		"memory_resource": "cpp",
		"numeric": "cpp",
		"random": "cpp",
		"regex": "cpp",
		"set": "cpp",
		"shared_mutex": "cpp",
		"cinttypes": "cpp",
		"*.inc": "c",
		"provider.h": "c",
		"sizes.h": "c",
		"compare": "cpp",
		"complex": "cpp",
		"concepts": "cpp",
		"list": "cpp",
		"numbers": "cpp",
		"semaphore": "cpp",
		"stop_token": "cpp",
		"hash_map": "cpp",
		"mqtt.h": "c",
		"gps.h": "c",
		"unistd.h": "c",
		"msggen_mec.h": "c",
		"system.h": "c",
		"netfwd": "cpp"
		},
		"java.compile.nullAnalysis.mode": "automatic"
		}
		}
		No newline at end of file

ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f
		// std::to_string(_dc.get_lifetime()).c_str());
		} else if (std::string(type.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.TrafficClass") == 0) {
		LibItsGeoNetworking__TypesAndValues::TrafficClass &t = static_cast<LibItsGeoNetworking__TypesAndValues::TrafficClass &>(r);
		_dc.set_traffic_class((t.scf().as_int() << 7) \| (t.channelOffload() << 6) \| (t.tcId() & 0x3f)); // ETSI EN 302 636-4-1 chapter 8.7.5
		_dc.set_traffic_class((t.scf().as_int() << 7) \| (t.reserved() << 6) \| (t.tcId() & 0x3f)); // ETSI EN 302 636-4-1 chapter 8.7.5
		}
		} else if (std::string(type.get_descriptor()->name).compare("@Ieee1609Dot2.Ieee1609Dot2Data") == 0) {
		dynamic_cast<OPTIONAL<Ieee1609Dot2::Ieee1609Dot2Data> &>(type).set_to_omit(); // TODO Add security support

ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc

+9 −7

Original line number	Diff line number	Diff line
		@@ -608,7 +608,7 @@ void geonetworking_layer::fill_beacon(const OCTETSTRING &p_ll_address, const INT
		_beacon->basicHeader() = fill_basic_header();
		_beacon->gnPacket().packet() =
		GnNonSecuredPacket(CommonHeader(NextHeader(NextHeader::e__any), 0, h,
		TrafficClass(SCF(SCF::e__scfEnabled), ChannelOffload(ChannelOffload::e__choffDisabled), 0), int2bit(0, 8), 0, 1, 0),
		TrafficClass(SCF(SCF::e__scfEnabled), Reserved(Reserved::e__reserved), 0), int2bit(0, 8), 0, 1, 0),
		OPTIONAL<ExtendedHeader>(eh), OPTIONAL<GnRawPayload>());
		_beacon->gnPacket().packet().payload().set_to_omit();
		_beacon->gnPacket().securedMsg().set_to_omit();
		@@ -632,7 +632,7 @@ void geonetworking_layer::fill_gbc_packet(const OCTETSTRING &p_ll_address, const
		p_geoAreaPosLatitude, p_geoAreaPosLongitude, p_distanceA, p_distanceB, p_angle, 0);
		_gbc_packet->basicHeader() = fill_basic_header();
		_gbc_packet->gnPacket().packet() = GnNonSecuredPacket(
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), ChannelOffload(ChannelOffload::e__choffDisabled), 0),
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), Reserved(Reserved::e__reserved), 0),
		int2bit(128, 8), // Mobile stationnary flag set
		0, 5, 0),
		OPTIONAL<ExtendedHeader>(eh), OPTIONAL<GnRawPayload>());
		@@ -646,15 +646,17 @@ void geonetworking_layer::fill_shb_packet(const OCTETSTRING &p_ll_address) {
		HeaderTST h;
		h.tsbHdr() = TsbHeaderType(HeaderType(HeaderType::e__topologicallyScopedBroadcast), HeaderSubTypeTSB(HeaderSubTypeTSB::e__singleHop));
		ExtendedHeader eh;
		MediaDependantData mediaDependantData;
		mediaDependantData.mccMco() = MccMco(int2oct(255, 1), int2oct(255, 1), int2bit(15, 4), int2bit(0, 4), int2oct(0, 1));
		eh.shbHeader() = SHBHeader(LongPosVector(GN__Address(TypeOfAddress(TypeOfAddress::e__manual), // TODO Use params
		StationType(StationType::e__passengerCar), // TODO Use params
		33, p_ll_address),
		0, _latitude, _longitude, int2bit(1, 1), // PAI
		0, 0),
		0);
		mediaDependantData);
		_shb_packet->basicHeader() = fill_basic_header();
		_shb_packet->gnPacket().packet() = GnNonSecuredPacket(
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), ChannelOffload(ChannelOffload::e__choffDisabled), 0),
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), Reserved(Reserved::e__reserved), 0),
		int2bit(128, 8), // Mobile stationnary flag set
		0, 1, 0),
		OPTIONAL<ExtendedHeader>(eh), OPTIONAL<GnRawPayload>());
		@@ -676,7 +678,7 @@ void geonetworking_layer::fill_tsb_packet(const OCTETSTRING &p_ll_address, const
		0, 0));
		_tsb_packet->basicHeader() = fill_basic_header();
		_tsb_packet->gnPacket().packet() = GnNonSecuredPacket(
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), ChannelOffload(ChannelOffload::e__choffDisabled), 0),
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), Reserved(Reserved::e__reserved), 0),
		int2bit(128, 8), // Mobile stationnary flag set
		0, p_max_hop_limit, 0),
		OPTIONAL<ExtendedHeader>(eh), OPTIONAL<GnRawPayload>());
		@@ -702,7 +704,7 @@ void geonetworking_layer::fill_uni_packet(const OCTETSTRING &p_ll_address, const
		0, _latitude + 100, _longitude + 100));
		_uni_packet->basicHeader() = fill_basic_header();
		_uni_packet->gnPacket().packet() = GnNonSecuredPacket(
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), ChannelOffload(ChannelOffload::e__choffDisabled), 0),
		CommonHeader(NextHeader(NextHeader::e__btpA), 0, h, TrafficClass(SCF(SCF::e__scfDisabled), Reserved(Reserved::e__reserved), 0),
		int2bit(128, 8), // Mobile stationnary flag set
		0, p_max_hop_limit, 0),
		OPTIONAL<ExtendedHeader>(eh), OPTIONAL<GnRawPayload>());
		@@ -728,7 +730,7 @@ void geonetworking_layer::fill_ls_reply(const OCTETSTRING &p_ll_address) {
		0, _latitude, _longitude));
		_ls_reply->basicHeader() = fill_basic_header();
		_ls_reply->gnPacket().packet() = GnNonSecuredPacket(CommonHeader(NextHeader(NextHeader::e__any), 0, h,
		TrafficClass(SCF(SCF::e__scfDisabled), ChannelOffload(ChannelOffload::e__choffDisabled), 0),
		TrafficClass(SCF(SCF::e__scfDisabled), Reserved(Reserved::e__reserved), 0),
		int2bit(128, 8), // Mobile stationnary flag set
		0, 5, 0),
		OPTIONAL<ExtendedHeader>(eh), OPTIONAL<GnRawPayload>());

AtsDENM @ e31048bf

Original line number	Diff line number	Diff line
		Subproject commit 3c07554ea9b960e36dcc1e0a8efcb453f4301d9f
		Subproject commit e31048bf2eac75f61eae9dc566869b47c516c198

AtsGeoNetworking @ 000ab667

Original line number	Diff line number	Diff line
		Subproject commit dbe05aa91c4b01c39bc544bafd6760d002a6327e
		Subproject commit 000ab6671e903b6d8be7665546bcfbd74100eb90

Admin message