summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2014-04-15 16:47:12 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2014-04-15 16:47:12 -0700
commitf281fb9d18192cf878f40b2e77501822e093d0a5 (patch)
tree25e97abd0509db45e0313f7be9d01dbd09d0c267
parentc47f200edf452ddcd00de55e84b79ab03f81295c (diff)
parente1d838e47f4f9e20ef80946e274bc0d9afcf4091 (diff)
Merge remote-tracking branch 'mmueller/socket_pdu_fix_resolver_issue'
-rw-r--r--gr-blocks/lib/socket_pdu_impl.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
index 3e483fb8a7..a467452c3f 100644
--- a/gr-blocks/lib/socket_pdu_impl.cc
+++ b/gr-blocks/lib/socket_pdu_impl.cc
@@ -57,7 +57,9 @@ namespace gr {
}
else if ((type == "TCP_SERVER") || (type == "TCP_CLIENT")) {
boost::asio::ip::tcp::resolver resolver(d_io_service);
- boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), addr, port);
+ boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(),
+ addr, port,
+ boost::asio::ip::resolver_query_base::passive);
d_tcp_endpoint = *resolver.resolve(query);
}
else if ((type == "UDP_SERVER") && ((addr.empty()) || (addr == "0.0.0.0"))) { // Bind on all interfaces
@@ -68,7 +70,9 @@ namespace gr {
}
else if ((type == "UDP_SERVER") || (type == "UDP_CLIENT")) {
boost::asio::ip::udp::resolver resolver(d_io_service);
- boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(), addr, port);
+ boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(),
+ addr, port,
+ boost::asio::ip::resolver_query_base::passive);
if (type == "UDP_SERVER")
d_udp_endpoint = *resolver.resolve(query);