[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/13: socket_pdu: fixed resolver issue by
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 05/13: socket_pdu: fixed resolver issue by applying same resolver as in udp_sink. |
Date: |
Tue, 15 Apr 2014 23:55:53 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit e1d838e47f4f9e20ef80946e274bc0d9afcf4091
Author: Marcus Müller <address@hidden>
Date: Sat Apr 12 19:16:31 2014 +0200
socket_pdu: fixed resolver issue by applying same resolver as in udp_sink.
Basically a version of http://gnuradio.org/redmine/issues/613 reported
by Alex Weihkopf in socket_pdu.
Patch is the same.
---
gr-blocks/lib/socket_pdu_impl.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
index 3e483fb..a467452 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);
- [Commit-gnuradio] [gnuradio] branch master updated (76970d5 -> 24b9e5b), git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 01/13: grc: option to hide disabled blocks, git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 10/13: Merge remote-tracking branch 'bolin/master', git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 08/13: Merge remote-tracking branch 'gnuradio-wg-grc/grc_hide_disabled_blocks', git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 04/13: Fix inconsistent naming and docstring, git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 12/13: Merge remote-tracking branch 'mmueller/gr_uhd_time_spec_t_fix', git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 13/13: Merge remote-tracking branch 'tkuester/documentation', git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 09/13: Merge remote-tracking branch 'gnuradio-wg-grc/grc_block_and_prefs_path', git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 05/13: socket_pdu: fixed resolver issue by applying same resolver as in udp_sink.,
git <=
- [Commit-gnuradio] [gnuradio] 11/13: Merge remote-tracking branch 'mmueller/socket_pdu_fix_resolver_issue', git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 03/13: grc: nicer output of blocks paths and prefs file, git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 06/13: added subtraction and addition to time_spec_t, git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 02/13: grc: honour order of block paths, print them out on startup, override hier block and pref file path with GRC_HIER_PATH & GRC_PREFS_PATH, git, 2014/04/15
- [Commit-gnuradio] [gnuradio] 07/13: documentation: Bit handling gotchas explained, git, 2014/04/15