Loading ccsrc/Framework/src/Params.cc +2 −2 Changes for ccsrc/Framework/src/Params.cc: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ #include "loggers.hh" void Params::convert(Params& p_param, const std::string p_parameters) { loggers::loggers::log(">>> Params::convert: '%s'", p_parameters.c_str()); //loggers::loggers::log(">>> Params::convert: '%s'", p_parameters.c_str()); // Sanity checks if (p_parameters.length() == 0) { return; Loading @@ -17,7 +17,7 @@ void Params::convert(Params& p_param, const std::string p_parameters) { std::sregex_iterator end = std::sregex_iterator(); for (std::sregex_iterator it = begin; it != end; ++it) { std::smatch m = *it; loggers::loggers::log("Params::convert: %d - %s - %s - %s - %s", m.size(), m[0].str().c_str(), m[1].str().c_str(), m[2].str().c_str(), m[3].str().c_str()); //loggers::loggers::log("Params::convert: %d - %s - %s - %s - %s", m.size(), m[0].str().c_str(), m[1].str().c_str(), m[2].str().c_str(), m[3].str().c_str()); p_param.insert(std::pair<std::string, std::string>(m[1].str(), m[2].str())); } // End of 'for' statement } Loading ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.cc +2 −8 Changes for ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.cc: 2 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ void GeoNetworkingPort::user_map(const char * system_port) loggers::loggers::log("GeoNetworkingPort::user_map: %s", system_port); std::map<std::string, std::string>::iterator it = _cfg_params.find(std::string("params")); if (it != _cfg_params.end()) { _layer = LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str()); _layer = (GeoNetworkingLayer *)LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str()); } } Loading @@ -83,13 +83,7 @@ void GeoNetworkingPort::user_stop() void GeoNetworkingPort::outgoing_send(const GeoNetworkingReq& send_par) { loggers::loggers::log_msg(">>> GeoNetworkingPort::outgoing_send: payload=", send_par); // TODO Does a port implement its layer // TODO Does the port add additionnal values? Yes OCTETSTRING data; _codec.encode (send_par.msgOut(), data); loggers::loggers::log_msg("GeoNetworkingPort::outgoing_send: Call Layer::sendData", data); _layer->sendData(data, _layer_params); _layer->sendMsg(send_par, _layer_params); } Loading ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.hh +1 −1 Changes for ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.hh: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -21,7 +21,7 @@ namespace LibItsGeoNetworking__TestSystem { class GeoNetworkingPort : public GeoNetworkingPort_BASE { Params _cfg_params; Params _layer_params; Layer * _layer; GeoNetworkingLayer * _layer; GeoNetworkingCodec _codec; public: Loading ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.cc +88 −49 Changes for ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.cc: 88 added lines, 49 removed lines. Original line number Diff line number Diff line Loading @@ -128,58 +128,11 @@ int GeoNetworkingCodec::decode_ (Base_Type& type, const TTCN_Typedescriptor_t& f // Store NextHeader field value and continue decoding _dc.next_header = (unsigned int)dynamic_cast<const Enum_Type &>(type).as_int(); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.headerTST") == 0) { // Decode HeaderTST data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store HeaderTST field value and continue decoding const LibItsGeoNetworking__TypesAndValues::HeaderTST & h = dynamic_cast<const LibItsGeoNetworking__TypesAndValues::HeaderTST &>(type); switch (h.get_selection()) { case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_anyHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.anyHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.anyHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_beaconHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.beaconHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.beaconHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_geoUnicastHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.geoUnicastHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.geoUnicastHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_geoAnycastHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.geoAnycastHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.geoAnycastHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_geoBroadcastHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.geoBroadcastHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.geoBroadcastHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_tsbHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.tsbHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.tsbHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_lsHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.lsHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.lsHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_saHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.saHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.saHdr().get_at(1))); break; default: TTCN_error("GeoNetworkingCodec::decode_: Invalid selection in union is_bound"); } // End of 'switch' statement } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.plLength") == 0) { // Decode plLength data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store playload length and continue decoding _dc.plLength = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(type)); decode_headerTST(static_cast<LibItsGeoNetworking__TypesAndValues::HeaderTST &>(type), decoding_buffer); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.GnNonSecuredPacket.extendedHeader") == 0) { // Decode ExtendedHeader data structure LibItsGeoNetworking__TypesAndValues::ExtendedHeader e; if (_dc.header_type == LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoBroadcastHeader) { e.geoBroadcastHeader().decode(LibItsGeoNetworking__TypesAndValues::ExtendedHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW); } else { // TODO To be continued TTCN_error("GeoNetworkingCodec::decode_: Not processed, _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); } decode_extendedHeader(e, decoding_buffer); if (e.is_bound()) { dynamic_cast<OPTIONAL<LibItsGeoNetworking__TypesAndValues::ExtendedHeader> &>(type) = OPTIONAL<LibItsGeoNetworking__TypesAndValues::ExtendedHeader>(e); loggers::loggers::log_msg("GeoNetworkingCodec::decode_: Set OPTIONAL to ", type); Loading Loading @@ -212,6 +165,11 @@ int GeoNetworkingCodec::decode_ (Base_Type& type, const TTCN_Typedescriptor_t& f } loggers::loggers::log("GeoNetworkingCodec::decode_: vector length=%d", _dc.payload.size()); dynamic_cast<OCTETSTRING &>(type) = OCTETSTRING(_dc.payload.size(), static_cast<const unsigned char *>(_dc.payload.data())); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.plLength") == 0) { // Decode plLength data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store playload length and continue decoding _dc.plLength = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(type)); } else { type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); } Loading Loading @@ -295,3 +253,84 @@ int GeoNetworkingCodec::encode_decodedPayload(const LibItsGeoNetworking__TypesAn return result; } int GeoNetworkingCodec::decode_headerTST(LibItsGeoNetworking__TypesAndValues::HeaderTST& u, TTCN_Buffer& decoding_buffer) { loggers::loggers::log(">>> GeoNetworkingCodec::decode_headerTST: processing %s", u.get_descriptor()->name); // Decode HeaderTST data structure _dc.header_type = *(decoding_buffer.get_data() + decoding_buffer.get_pos()) >> 4; _dc.header_sub_type = *(decoding_buffer.get_data() + decoding_buffer.get_pos()) & 0x0F; loggers::loggers::log("GeoNetworkingCodec::decode_: headerTST selectors: _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); //LibItsGeoNetworking__TypesAndValues::HeaderTST & u = dynamic_cast<LibItsGeoNetworking__TypesAndValues::HeaderTST &>(u); switch (_dc.header_type) { case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoUnicastHeader: u.geoUnicastHdr().decode(*u.geoUnicastHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_tsbHeader: u.tsbHdr().decode(*u.tsbHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_shbHeader: u.tsbHdr().decode(*u.tsbHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoBroadcastHeader: u.geoBroadcastHdr().decode(*u.geoBroadcastHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoAnycastHeader: u.geoAnycastHdr().decode(*u.geoAnycastHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_beaconHeader: u.beaconHdr().decode(*u.beaconHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsRequestHeader: u.lsHdr().decode(*u.lsHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsReplyHeader: u.lsHdr().decode(*u.lsHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_anyHeader: u.anyHdr().decode(*u.anyHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; default: TTCN_error("GeoNetworkingCodec::decode_: Not processed, _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); } // End of 'switch' statement return 0; } int GeoNetworkingCodec::decode_extendedHeader(LibItsGeoNetworking__TypesAndValues::ExtendedHeader& u, TTCN_Buffer& decoding_buffer) { loggers::loggers::log(">>> GeoNetworkingCodec::decode_extendedHeader: processing %s", u.get_descriptor()->name); switch (_dc.header_type) { case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoUnicastHeader: u.geoUnicastHeader().decode(*u.geoUnicastHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_tsbHeader: u.tsbHeader().decode(*u.tsbHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_shbHeader: u.shbHeader().decode(*u.shbHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoBroadcastHeader: u.geoBroadcastHeader().decode(*u.geoBroadcastHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoAnycastHeader: u.geoAnycastHeader().decode(*u.geoAnycastHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_beaconHeader: u.beaconHeader().decode(*u.beaconHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsRequestHeader: u.lsRequestHeader().decode(*u.lsRequestHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsReplyHeader: u.lsReplyHeader().decode(*u.lsReplyHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_anyHeader: u.anyHeader().decode(*u.anyHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; default: TTCN_error("GeoNetworkingCodec::decode_headerTST: Not processed, _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); } // End of 'switch' statement return 0; } ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.hh +4 −0 Changes for ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.hh: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -10,8 +10,10 @@ class OCTETSTRING; class TTCN_Typedescriptor_t; class TTCN_Buffer; namespace LibItsGeoNetworking__TypesAndValues { class GeoNetworkingPdu; class HeaderTST; class ExtendedHeader; class DecodedPayload; }; Loading Loading @@ -49,6 +51,8 @@ class GeoNetworkingCodec : public Codec<LibItsGeoNetworking__TypesAndValues::Geo int encode_decodedPayload(const LibItsGeoNetworking__TypesAndValues::DecodedPayload& u, TTCN_Buffer& encoding_buffer); int decode_ (Base_Type& type, const TTCN_Typedescriptor_t& field_descriptor, TTCN_Buffer& decoding_buffer); int decode_headerTST(LibItsGeoNetworking__TypesAndValues::HeaderTST& u, TTCN_Buffer& decoding_buffer); int decode_extendedHeader(LibItsGeoNetworking__TypesAndValues::ExtendedHeader& u, TTCN_Buffer& decoding_buffer); public: GeoNetworkingCodec() : _ec(), _dc() {}; Loading Loading
ccsrc/Framework/src/Params.cc +2 −2 Changes for ccsrc/Framework/src/Params.cc: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ #include "loggers.hh" void Params::convert(Params& p_param, const std::string p_parameters) { loggers::loggers::log(">>> Params::convert: '%s'", p_parameters.c_str()); //loggers::loggers::log(">>> Params::convert: '%s'", p_parameters.c_str()); // Sanity checks if (p_parameters.length() == 0) { return; Loading @@ -17,7 +17,7 @@ void Params::convert(Params& p_param, const std::string p_parameters) { std::sregex_iterator end = std::sregex_iterator(); for (std::sregex_iterator it = begin; it != end; ++it) { std::smatch m = *it; loggers::loggers::log("Params::convert: %d - %s - %s - %s - %s", m.size(), m[0].str().c_str(), m[1].str().c_str(), m[2].str().c_str(), m[3].str().c_str()); //loggers::loggers::log("Params::convert: %d - %s - %s - %s - %s", m.size(), m[0].str().c_str(), m[1].str().c_str(), m[2].str().c_str(), m[3].str().c_str()); p_param.insert(std::pair<std::string, std::string>(m[1].str(), m[2].str())); } // End of 'for' statement } Loading
ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.cc +2 −8 Changes for ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.cc: 2 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ void GeoNetworkingPort::user_map(const char * system_port) loggers::loggers::log("GeoNetworkingPort::user_map: %s", system_port); std::map<std::string, std::string>::iterator it = _cfg_params.find(std::string("params")); if (it != _cfg_params.end()) { _layer = LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str()); _layer = (GeoNetworkingLayer *)LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str()); } } Loading @@ -83,13 +83,7 @@ void GeoNetworkingPort::user_stop() void GeoNetworkingPort::outgoing_send(const GeoNetworkingReq& send_par) { loggers::loggers::log_msg(">>> GeoNetworkingPort::outgoing_send: payload=", send_par); // TODO Does a port implement its layer // TODO Does the port add additionnal values? Yes OCTETSTRING data; _codec.encode (send_par.msgOut(), data); loggers::loggers::log_msg("GeoNetworkingPort::outgoing_send: Call Layer::sendData", data); _layer->sendData(data, _layer_params); _layer->sendMsg(send_par, _layer_params); } Loading
ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.hh +1 −1 Changes for ccsrc/Ports/LibIts_ports/GN_ports/GeoNetworkingPort.hh: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -21,7 +21,7 @@ namespace LibItsGeoNetworking__TestSystem { class GeoNetworkingPort : public GeoNetworkingPort_BASE { Params _cfg_params; Params _layer_params; Layer * _layer; GeoNetworkingLayer * _layer; GeoNetworkingCodec _codec; public: Loading
ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.cc +88 −49 Changes for ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.cc: 88 added lines, 49 removed lines. Original line number Diff line number Diff line Loading @@ -128,58 +128,11 @@ int GeoNetworkingCodec::decode_ (Base_Type& type, const TTCN_Typedescriptor_t& f // Store NextHeader field value and continue decoding _dc.next_header = (unsigned int)dynamic_cast<const Enum_Type &>(type).as_int(); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.headerTST") == 0) { // Decode HeaderTST data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store HeaderTST field value and continue decoding const LibItsGeoNetworking__TypesAndValues::HeaderTST & h = dynamic_cast<const LibItsGeoNetworking__TypesAndValues::HeaderTST &>(type); switch (h.get_selection()) { case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_anyHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.anyHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.anyHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_beaconHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.beaconHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.beaconHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_geoUnicastHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.geoUnicastHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.geoUnicastHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_geoAnycastHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.geoAnycastHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.geoAnycastHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_geoBroadcastHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.geoBroadcastHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.geoBroadcastHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_tsbHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.tsbHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.tsbHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_lsHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.lsHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.lsHdr().get_at(1))); break; case LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_saHdr: _dc.header_type = (unsigned int)dynamic_cast<const Enum_Type &>(*h.saHdr().get_at(0)).as_int(); _dc.header_sub_type = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(*h.saHdr().get_at(1))); break; default: TTCN_error("GeoNetworkingCodec::decode_: Invalid selection in union is_bound"); } // End of 'switch' statement } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.plLength") == 0) { // Decode plLength data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store playload length and continue decoding _dc.plLength = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(type)); decode_headerTST(static_cast<LibItsGeoNetworking__TypesAndValues::HeaderTST &>(type), decoding_buffer); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.GnNonSecuredPacket.extendedHeader") == 0) { // Decode ExtendedHeader data structure LibItsGeoNetworking__TypesAndValues::ExtendedHeader e; if (_dc.header_type == LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoBroadcastHeader) { e.geoBroadcastHeader().decode(LibItsGeoNetworking__TypesAndValues::ExtendedHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW); } else { // TODO To be continued TTCN_error("GeoNetworkingCodec::decode_: Not processed, _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); } decode_extendedHeader(e, decoding_buffer); if (e.is_bound()) { dynamic_cast<OPTIONAL<LibItsGeoNetworking__TypesAndValues::ExtendedHeader> &>(type) = OPTIONAL<LibItsGeoNetworking__TypesAndValues::ExtendedHeader>(e); loggers::loggers::log_msg("GeoNetworkingCodec::decode_: Set OPTIONAL to ", type); Loading Loading @@ -212,6 +165,11 @@ int GeoNetworkingCodec::decode_ (Base_Type& type, const TTCN_Typedescriptor_t& f } loggers::loggers::log("GeoNetworkingCodec::decode_: vector length=%d", _dc.payload.size()); dynamic_cast<OCTETSTRING &>(type) = OCTETSTRING(_dc.payload.size(), static_cast<const unsigned char *>(_dc.payload.data())); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.plLength") == 0) { // Decode plLength data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store playload length and continue decoding _dc.plLength = (unsigned int)static_cast<int>(dynamic_cast<const INTEGER &>(type)); } else { type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); } Loading Loading @@ -295,3 +253,84 @@ int GeoNetworkingCodec::encode_decodedPayload(const LibItsGeoNetworking__TypesAn return result; } int GeoNetworkingCodec::decode_headerTST(LibItsGeoNetworking__TypesAndValues::HeaderTST& u, TTCN_Buffer& decoding_buffer) { loggers::loggers::log(">>> GeoNetworkingCodec::decode_headerTST: processing %s", u.get_descriptor()->name); // Decode HeaderTST data structure _dc.header_type = *(decoding_buffer.get_data() + decoding_buffer.get_pos()) >> 4; _dc.header_sub_type = *(decoding_buffer.get_data() + decoding_buffer.get_pos()) & 0x0F; loggers::loggers::log("GeoNetworkingCodec::decode_: headerTST selectors: _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); //LibItsGeoNetworking__TypesAndValues::HeaderTST & u = dynamic_cast<LibItsGeoNetworking__TypesAndValues::HeaderTST &>(u); switch (_dc.header_type) { case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoUnicastHeader: u.geoUnicastHdr().decode(*u.geoUnicastHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_tsbHeader: u.tsbHdr().decode(*u.tsbHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_shbHeader: u.tsbHdr().decode(*u.tsbHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoBroadcastHeader: u.geoBroadcastHdr().decode(*u.geoBroadcastHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoAnycastHeader: u.geoAnycastHdr().decode(*u.geoAnycastHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_beaconHeader: u.beaconHdr().decode(*u.beaconHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsRequestHeader: u.lsHdr().decode(*u.lsHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsReplyHeader: u.lsHdr().decode(*u.lsHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_anyHeader: u.anyHdr().decode(*u.anyHdr().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; default: TTCN_error("GeoNetworkingCodec::decode_: Not processed, _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); } // End of 'switch' statement return 0; } int GeoNetworkingCodec::decode_extendedHeader(LibItsGeoNetworking__TypesAndValues::ExtendedHeader& u, TTCN_Buffer& decoding_buffer) { loggers::loggers::log(">>> GeoNetworkingCodec::decode_extendedHeader: processing %s", u.get_descriptor()->name); switch (_dc.header_type) { case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoUnicastHeader: u.geoUnicastHeader().decode(*u.geoUnicastHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_tsbHeader: u.tsbHeader().decode(*u.tsbHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_shbHeader: u.shbHeader().decode(*u.shbHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoBroadcastHeader: u.geoBroadcastHeader().decode(*u.geoBroadcastHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_geoAnycastHeader: u.geoAnycastHeader().decode(*u.geoAnycastHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_beaconHeader: u.beaconHeader().decode(*u.beaconHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsRequestHeader: u.lsRequestHeader().decode(*u.lsRequestHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_lsReplyHeader: u.lsReplyHeader().decode(*u.lsReplyHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; case LibItsGeoNetworking__TypesAndValues::ExtendedHeader::ALT_anyHeader: u.anyHeader().decode(*u.anyHeader().get_descriptor(), decoding_buffer, TTCN_EncDec::CT_RAW); break; default: TTCN_error("GeoNetworkingCodec::decode_headerTST: Not processed, _dc.header_type = %d - _dc.header_sub_type = %d", _dc.header_type, _dc.header_sub_type); } // End of 'switch' statement return 0; }
ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.hh +4 −0 Changes for ccsrc/Protocols/GeoNetworking/GeoNetworkingCodec.hh: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -10,8 +10,10 @@ class OCTETSTRING; class TTCN_Typedescriptor_t; class TTCN_Buffer; namespace LibItsGeoNetworking__TypesAndValues { class GeoNetworkingPdu; class HeaderTST; class ExtendedHeader; class DecodedPayload; }; Loading Loading @@ -49,6 +51,8 @@ class GeoNetworkingCodec : public Codec<LibItsGeoNetworking__TypesAndValues::Geo int encode_decodedPayload(const LibItsGeoNetworking__TypesAndValues::DecodedPayload& u, TTCN_Buffer& encoding_buffer); int decode_ (Base_Type& type, const TTCN_Typedescriptor_t& field_descriptor, TTCN_Buffer& decoding_buffer); int decode_headerTST(LibItsGeoNetworking__TypesAndValues::HeaderTST& u, TTCN_Buffer& decoding_buffer); int decode_extendedHeader(LibItsGeoNetworking__TypesAndValues::ExtendedHeader& u, TTCN_Buffer& decoding_buffer); public: GeoNetworkingCodec() : _ec(), _dc() {}; Loading