From 952925b3e933a9bd7a4379cabe137832f77cdb10 Mon Sep 17 00:00:00 2001 From: Gastd Date: Mon, 5 Mar 2018 11:52:56 -0300 Subject: [PATCH 1/2] Fix test --- .../acquisition/glonass_l1_ca_pcps_acquisition_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc index f1b97112f..89f251fd6 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc @@ -199,7 +199,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionTest, ValidationOfResults) top_block = gr::make_top_block("Acquisition test"); double expected_delay_samples = 31874; - double expected_doppler_hz = -8000; + double expected_doppler_hz = -9500; init(); std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition_1G", 1, 1); From 0b6aff6cdcafa483d7917f7d84981fbdb31cb57a Mon Sep 17 00:00:00 2001 From: Antonio Ramos Date: Thu, 22 Mar 2018 12:28:33 +0100 Subject: [PATCH 2/2] Fix RTCM server An exception was thrown when trying to print the IP address of a client that was disconnected --- src/core/system_parameters/rtcm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/system_parameters/rtcm.h b/src/core/system_parameters/rtcm.h index d4ac17460..1a14cc988 100644 --- a/src/core/system_parameters/rtcm.h +++ b/src/core/system_parameters/rtcm.h @@ -50,6 +50,7 @@ #include #include #include +#include /*! @@ -641,7 +642,6 @@ private: { public: Rtcm_Session(boost::asio::ip::tcp::socket socket, Rtcm_Listener_Room& room) : socket_(std::move(socket)), room_(room) {} - inline void start() { room_.join(shared_from_this()); @@ -665,11 +665,11 @@ private: boost::asio::async_read(socket_, boost::asio::buffer(read_msg_.data(), Rtcm_Message::header_length), [this, self](boost::system::error_code ec, std::size_t /*length*/) { - if (!ec && read_msg_.decode_header()) + if (!ec and read_msg_.decode_header()) { do_read_message_body(); } - else if (!ec && !read_msg_.decode_header()) + else if (!ec and !read_msg_.decode_header()) { client_says += read_msg_.data(); bool first = true; @@ -687,7 +687,7 @@ private: } else { - std::cout << "Closing connection with client from " << socket_.remote_endpoint().address() << std::endl; + std::cout << "Closing connection with RTCM client" << std::endl; room_.leave(shared_from_this()); } }); @@ -709,7 +709,7 @@ private: } else { - std::cout << "Closing connection with client from " << socket_.remote_endpoint().address() << std::endl; + std::cout << "Closing connection with RTCM client" << std::endl; room_.leave(shared_from_this()); } }); @@ -719,8 +719,7 @@ private: { auto self(shared_from_this()); boost::asio::async_write(socket_, - boost::asio::buffer(write_msgs_.front().body(), - write_msgs_.front().body_length()), + boost::asio::buffer(write_msgs_.front().body(), write_msgs_.front().body_length()), [this, self](boost::system::error_code ec, std::size_t /*length*/) { if (!ec) { @@ -732,7 +731,7 @@ private: } else { - std::cout << "Closing connection with client from " << socket_.remote_endpoint().address() << std::endl; + std::cout << "Closing connection with RTCM client" << std::endl; room_.leave(shared_from_this()); } }); @@ -903,6 +902,7 @@ private: { std::cout << "Starting RTCM TCP server session..." << std::endl; std::cout << "Serving client from " << socket_.remote_endpoint().address() << std::endl; + LOG(INFO) << "Serving client from " << socket_.remote_endpoint().address(); } std::make_shared(std::move(socket_), room_)->start(); }