[hamradio-commits] [gnss-sdr] 56/251: Opening socket first

[Carles Fernandez]

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

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

commit a02c659795825818e97e6dc6a1d9796ee86e6b29
Author: Anthony Arnold <anthony.arnold at uqconnect.edu.au>
Date:   Sun May 10 23:54:40 2015 +1000

    Opening socket first
---
 .../gnuradio_blocks/rtl_tcp_signal_source_c.cc     | 25 ++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
index a564649..4d95ba9 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
@@ -79,26 +79,33 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address,
    }
 
    // 2. Set socket options
+   ip::address addr = ip::address::from_string (address, ec);
+   if (ec) {
+      std::cout << address << " is not an IP address" << std::endl;
+      LOG (ERROR) << address << " is not an IP address";
+      return;
+   }
+   ip::tcp::endpoint ep (addr, port);
+   socket_.open (ep.protocol( ), ec);
+   if (ec) {
+       std::cout << "Failed to open socket." << std::endl;
+       LOG (ERROR)  << "Failed to open socket.";
+   }
+
    socket_.set_option (boost::asio::socket_base::reuse_address (true), ec);
    if (ec) {
-       std::cout << "Failed to set reuse address option." << std::endl;
+       std::cout << "Failed to set reuse address option: " << ec << std::endl;
        LOG (WARNING)  << "Failed to set reuse address option";
    }
    socket_.set_option (boost::asio::socket_base::linger (true, 0), ec);
    if (ec) {
-       std::cout << "Failed to set linger option." << std::endl;
+       std::cout << "Failed to set linger option: " << ec << std::endl;
        LOG (WARNING)  << "Failed to set linger option";
    }
 
    // 3. Connect socket
-   ip::address addr = ip::address::from_string (address, ec);
-   if (ec) {
-      std::cout << address << " is not an IP address" << std::endl;
-      LOG (ERROR) << address << " is not an IP address";
-      return;
-   }
 
-   socket_.connect(tcp::endpoint (addr, port), ec);
+   socket_.connect(ep, ec);
    if (ec) {
        std::cout << "Failed to connect to " << addr << ":" << port
                  << "(" << ec << ")" << std::endl;

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