Commit 1f0fe4bb authored by Denis Filatov's avatar Denis Filatov
Browse files

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

parents 75058f70 4be56b48

.jenkins.sh

+5 −3
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt





set -vx

set -vx

set -e

#set -e





cd $(dirname $0)

cd $(dirname $0)
@@ -11,5 +11,7 @@ run_dir=`pwd` 




cd docker

cd docker





./build-container.sh

./v2/build.sh

./run-container.sh $run_dir
 
./v2/run.sh

#./build-container.sh

#./run-container.sh $run_dir

README.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -253,7 +253,7 @@ $ cmake ../wireshark-for-ITS 




- Add specific compiler options to the file epan/dissectors/CMakeFiles/dissectors.dir/flags.make:

- Add specific compiler options to the file epan/dissectors/CMakeFiles/dissectors.dir/flags.make:

    - Find the variable C_FLAGS

    - Find the variable C_FLAGS

    - Append at the end the following compiler options: "-Wno-unused-const-variable -Wno-unsued-function "

    - Append at the end the following compiler options: "-Wno-unused-const-variable -Wno-unused-function "

- Build Wireshark/tshark executing the following command

- Build Wireshark/tshark executing the following command





```sh

```sh

ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partC

+6 −3
Original line number Original line Diff line number Diff line
@@ -129,10 +129,13 @@ namespace LibItsCam__TestSystem { 
      return;

      return;

    }

    }





    loggers::get_instance().log("UpperTesterPort_Cam::receive_msg: %s", p_ind.get_descriptor()->name);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsCam_TypesAndValues.UtCamResults") == 0) { // TODO To be refined

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsCam_TypesAndValues.UtCamResults") == 0) { // TODO To be refined

      incoming_message((LibItsCam__TypesAndValues::UtCamResults&)p_ind);

      incoming_message(static_cast<const LibItsCam__TypesAndValues::UtCamResults&>(p_ind));

    } // TODO Implement UtCamEventInd part

    } else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsCam_TypesAndValues.UtCamEventInd") == 0) {

      incoming_message(static_cast<const LibItsCam__TypesAndValues::UtCamEventInd&>(p_ind));

    } else {

      loggers::get_instance().warning("UpperTesterPort_Cam::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);

    }

  }

  }





} /* end of namespace */
 
} /* end of namespace */

ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partC

+6 −3
Original line number Original line Diff line number Diff line
@@ -149,10 +149,13 @@ namespace LibItsDenm__TestSystem { 
      return;

      return;

    }

    }





    loggers::get_instance().log("UpperTesterPort_Denm::receive_msg: %s", p_ind.get_descriptor()->name);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsDenm_TypesAndValues.UtDenmResults") == 0) { // TODO To be refined

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsDenm_TypesAndValues.UtDenmResults") == 0) { // TODO To be refined

      incoming_message((LibItsDenm__TypesAndValues::UtDenmResults&)p_ind);

      incoming_message(static_cast<const LibItsDenm__TypesAndValues::UtDenmResults&>(p_ind));

    } // TODO Implement UtDenmEventInd part

    } else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsDenm_TypesAndValues.UtDenmEventInd") == 0) {

      incoming_message(static_cast<const LibItsDenm__TypesAndValues::UtDenmEventInd&>(p_ind));

    } else {

      loggers::get_instance().warning("UpperTesterPort_Denm::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);

    }

  }

  }





} /* end of namespace */
 
} /* end of namespace */

ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partC

+4 −1
Original line number Original line Diff line number Diff line
@@ -130,9 +130,12 @@ namespace LibItsGeoNetworking__TestSystem { 
      return;

      return;

    }

    }





    //loggers::get_instance().log("UpperTesterPort_Gn::receive_msg: %s", p_ind.get_descriptor()->name);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.UtGnResults") == 0) { // TODO To be refined

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.UtGnResults") == 0) { // TODO To be refined

      incoming_message((LibItsGeoNetworking__TypesAndValues::UtGnResults&)p_ind);

      incoming_message((LibItsGeoNetworking__TypesAndValues::UtGnResults&)p_ind);

    } else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.UtGnEventInd") == 0) {

      incoming_message(static_cast<const LibItsGeoNetworking__TypesAndValues::UtGnEventInd&>(p_ind));

    } else {

      loggers::get_instance().warning("UpperTesterPort_Gn::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);

    }

    }

  }

  }