Commit 178da1b0 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Merge branch 'TTF0002' of https://forge.etsi.org/gitlab/ITS/ITS into TTF0002

parents 74538a93 a5579b4e
Loading
Loading
Loading
Loading
+0 −657

File changed.

Preview size limit exceeded, changes collapsed.

+1 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ public: //! \publicsection
  static const std::string& mac_bc;                //! Broadcast MAC address parameter name
  static const std::string& eth_type;              //! Ethernet type parameter name
  static const std::string& beaconing;             //! Beaconing mode parameter name
  static const std::string& timestamp;             //! Packet reception timestamp
  static const std::string& station_type;
  static const std::string& country;
  static const std::string& type_of_address;
@@ -46,8 +47,6 @@ public: //! \publicsection
  static const std::string& btp_payload;           //! BTP Payload parameter name
  static const std::string& btp_destination_port;  //! BTP DestinationPort parameter name
  static const std::string& btp_info;              //! BTP Info parameter name
  static const std::string& ssem_destination_port; //! BTP Destination port for SSEM
  static const std::string& spatem_destination_port;//! BTP Destination port for SPATEM

  static const std::string& nic;                   //! Network Interface Card parameter name
  static const std::string& ll_address;            //! Test system GeoNetworking LL-Address parameter name
+1 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ const std::string& params::mac_dst = std::string("mac_dst");
const std::string& params::mac_bc = std::string("mac_bc");
const std::string& params::eth_type = std::string("eth_type");
const std::string& params::beaconing = std::string("beaconing");
const std::string& params::timestamp = std::string("timestamp");
const std::string& params::station_type = std::string("station_type");
const std::string& params::country = std::string("country");
const std::string& params::type_of_address = std::string("type_of_address");
@@ -38,8 +39,6 @@ const std::string& params::btp_type = std::string("btp_type");
const std::string& params::btp_payload = std::string("btp_payload");
const std::string& params::btp_destination_port = std::string("dst_port");
const std::string& params::btp_info = std::string("btp_info");
const std::string& params::ssem_destination_port = std::string("ssem_port");
const std::string& params::spatem_destination_port = std::string("spatem_port");

const std::string& params::nic = std::string("nic");
const std::string& params::latitude = std::string("latitude");
+11 −0
Original line number Diff line number Diff line
@@ -97,6 +97,17 @@ namespace LibItsIvim__TestSystem {
    loggers::get_instance().set_stop_time(_time_key, duration);
  }

  void IvimPort::outgoing_send(const IvimInd& send_par)
  {
    loggers::get_instance().log_msg(">>> IvimPort::outgoing_send: payload=", send_par);
    
    float duration;
    loggers::get_instance().set_start_time(_time_key);
    params params;
    static_cast<ivim_layer *>(_layer)->sendMsg(send_par, params);
    loggers::get_instance().set_stop_time(_time_key, duration);
  }

  void IvimPort::receiveMsg(const LibItsIvim__TestSystem::IvimInd& p_ind, const params& p_params) {
    loggers::get_instance().log_msg(">>> IvimPort::receive_msg: ", p_ind);

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ protected:
	void user_stop();

	void outgoing_send(const IvimReq& send_par);
	void outgoing_send(const IvimInd& send_par);
};

} /* end of namespace */
Loading