[hamradio-commits] [gnss-sdr] 113/126: removing tcp client class

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 6e39d8f32e15c71fa193691e81a2df55b71fb3a3
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Dec 23 14:27:39 2015 +0100

    removing tcp client class
---
 src/core/system_parameters/rtcm.cc | 30 ----------------
 src/core/system_parameters/rtcm.h  | 70 +-------------------------------------
 2 files changed, 1 insertion(+), 99 deletions(-)

diff --git a/src/core/system_parameters/rtcm.cc b/src/core/system_parameters/rtcm.cc
index d8109fb..f92125d 100644
--- a/src/core/system_parameters/rtcm.cc
+++ b/src/core/system_parameters/rtcm.cc
@@ -110,36 +110,6 @@ void Rtcm::stop_server()
 }
 
 
-void Rtcm::run_client()
-{
-    std::cout << "Starting a TCP Client on port " << FLAGS_Remote_RTCM_Port << std::endl;
-    std::string remote_host = FLAGS_Remote_RTCM_Server;
-    std::string remote_port = std::to_string(FLAGS_Remote_RTCM_Port);
-    boost::asio::ip::tcp::resolver resolver(io_service);
-    auto endpoint_iterator = resolver.resolve({ remote_host.c_str(), remote_port.c_str() });
-
-    clients.emplace_back(io_service, endpoint_iterator);
-    try
-    {
-            std::thread t([&](){ io_service.run(); });
-            t.detach();
-    }
-    catch (std::exception& e)
-    {
-            std::cerr << "Exception: " << e.what() << "\n";
-    }
-}
-
-
-void Rtcm::stop_client()
-{
-    std::cout << "Stopping TCP Client on port " << FLAGS_Remote_RTCM_Port << std::endl;
-    clients.front().close();
-    std::this_thread::sleep_for(std::chrono::seconds(1));
-    Rtcm::stop_service();
-}
-
-
 void Rtcm::send_message(const std::string & msg)
 {
     rtcm_message_queue->push(msg);
diff --git a/src/core/system_parameters/rtcm.h b/src/core/system_parameters/rtcm.h
index 304b49b..93a5e22 100644
--- a/src/core/system_parameters/rtcm.h
+++ b/src/core/system_parameters/rtcm.h
@@ -57,7 +57,7 @@
  * defined in the RTCM 3.2 Standard, plus some utilities to handle messages.
  *
  * Generation of the following Message Types:
- *   1001, 1002, 1003, 1004, 1005, 1019, 1045
+ *   1001, 1002, 1003, 1004, 1005, 1006, 1008, 1019, 1045
  *
  * Decoding of the following Message Types:
  *   1019, 1045
@@ -755,79 +755,11 @@ private:
     };
 
 
-    class Tcp_Client
-    {
-    public:
-        Tcp_Client(boost::asio::io_service& io_service,
-                boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
-    : io_service_(io_service), socket_(io_service)
-    {
-            do_connect(endpoint_iterator);
-    }
-
-        void close()
-        {
-            io_service_.post([this]() { socket_.close(); });
-        }
-
-    private:
-        void do_connect(boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
-        {
-            std::cout << "Connecting to server..." << std::endl;
-            boost::asio::async_connect(socket_, endpoint_iterator,
-                    [this](boost::system::error_code ec, boost::asio::ip::tcp::resolver::iterator)
-                    {
-                if (!ec)
-                    {
-                        std::cout << "Connected." << std::endl;
-                        do_read_message();
-                    }
-                else
-                    {
-                        std::cout << "Server is down." << std::endl;
-                    }
-                    });
-        }
-
-        void do_read_message()
-        {
-            // Waiting for data and reading forever, until connection is closed.
-            for(;;)
-                {
-                    std::array<char, 1029> buf;
-                    boost::system::error_code error;
-
-                    size_t len = socket_.read_some(boost::asio::buffer(buf), error);
-
-                    if(error == boost::asio::error::eof)
-                        break; // // Connection closed cleanly by peer.
-                    else if(error)
-                        {
-                            std::cout << "Error: " << error << std::endl;
-                            //socket_.close();
-                            break;
-                        }
-                    std::cout << "Received message: ";
-                    std::cout.write(buf.data(), len);
-                    std::cout << std::endl;
-                }
-
-            std::cout << std::endl;
-            socket_.close();
-            std::cout << "Connection closed by the server. Good bye." << std::endl;
-        }
-
-        boost::asio::io_service& io_service_;
-        boost::asio::ip::tcp::socket socket_;
-    };
-
-
     boost::asio::io_service io_service;
     std::shared_ptr< concurrent_queue<std::string> > rtcm_message_queue;
     std::thread t;
     std::thread tq;
     std::list<Rtcm::Tcp_Server> servers;
-    std::list<Rtcm::Tcp_Client> clients;
     bool server_is_running;
     void stop_service();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git