summaryrefslogtreecommitdiff
path: root/gr-zeromq/lib
diff options
context:
space:
mode:
authorBrennan Ashton <bashton@brennanashton.com>2018-11-02 23:50:49 -0700
committerAndrej Rode <mail@andrejro.de>2018-11-28 00:02:35 +0100
commitb76a95c52f812181605248f1f590a199e2e5d0e3 (patch)
tree9493ca923d95928a4a662e2c05f6d1c95b426029 /gr-zeromq/lib
parent0733bc4f788c424264d26c1a1f82d831c91b2c15 (diff)
gr-zeromq: Add last_endpoint function to zmq source and sink blocks
The main reason for this is is allows you to read back the real address string in the case that port 0 is used and the OS has auto-assigned a free port.
Diffstat (limited to 'gr-zeromq/lib')
-rw-r--r--gr-zeromq/lib/base_impl.cc9
-rw-r--r--gr-zeromq/lib/base_impl.h1
-rw-r--r--gr-zeromq/lib/pub_msg_sink_impl.h6
-rw-r--r--gr-zeromq/lib/pub_sink_impl.h1
-rw-r--r--gr-zeromq/lib/pull_msg_source_impl.h7
-rw-r--r--gr-zeromq/lib/pull_source_impl.h1
-rw-r--r--gr-zeromq/lib/push_msg_sink_impl.h6
-rw-r--r--gr-zeromq/lib/push_sink_impl.h2
-rw-r--r--gr-zeromq/lib/rep_msg_sink_impl.h7
-rw-r--r--gr-zeromq/lib/rep_sink_impl.h1
-rw-r--r--gr-zeromq/lib/req_msg_source_impl.h7
-rw-r--r--gr-zeromq/lib/req_source_impl.h1
-rw-r--r--gr-zeromq/lib/sub_msg_source_impl.h7
-rw-r--r--gr-zeromq/lib/sub_source_impl.h2
14 files changed, 58 insertions, 0 deletions
diff --git a/gr-zeromq/lib/base_impl.cc b/gr-zeromq/lib/base_impl.cc
index 20c5d3845d..cd1825141b 100644
--- a/gr-zeromq/lib/base_impl.cc
+++ b/gr-zeromq/lib/base_impl.cc
@@ -54,6 +54,15 @@ namespace gr {
delete d_context;
}
+ std::string
+ base_impl::last_endpoint()
+ {
+ size_t addr_len = 256;
+ char addr[addr_len];
+ d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
+ return std::string(addr, addr_len-1);
+ }
+
base_sink_impl::base_sink_impl(int type, size_t itemsize, size_t vlen, char *address, int timeout, bool pass_tags, int hwm)
: base_impl(type, itemsize, vlen, timeout, pass_tags)
diff --git a/gr-zeromq/lib/base_impl.h b/gr-zeromq/lib/base_impl.h
index ed1695102e..e09e652768 100644
--- a/gr-zeromq/lib/base_impl.h
+++ b/gr-zeromq/lib/base_impl.h
@@ -37,6 +37,7 @@ namespace gr {
virtual ~base_impl();
protected:
+ std::string last_endpoint();
zmq::context_t *d_context;
zmq::socket_t *d_socket;
size_t d_vsize;
diff --git a/gr-zeromq/lib/pub_msg_sink_impl.h b/gr-zeromq/lib/pub_msg_sink_impl.h
index 747ac7ee85..c421361e18 100644
--- a/gr-zeromq/lib/pub_msg_sink_impl.h
+++ b/gr-zeromq/lib/pub_msg_sink_impl.h
@@ -41,6 +41,12 @@ namespace gr {
~pub_msg_sink_impl();
void handler(pmt::pmt_t msg);
+ std::string last_endpoint() override {
+ size_t addr_len = 256;
+ char addr[addr_len];
+ d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
+ return std::string(addr, addr_len-1);
+ }
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/pub_sink_impl.h b/gr-zeromq/lib/pub_sink_impl.h
index 8637c3565a..78b5c1e1bd 100644
--- a/gr-zeromq/lib/pub_sink_impl.h
+++ b/gr-zeromq/lib/pub_sink_impl.h
@@ -39,6 +39,7 @@ namespace gr {
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
+ std::string last_endpoint() override {return base_sink_impl::last_endpoint();}
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/pull_msg_source_impl.h b/gr-zeromq/lib/pull_msg_source_impl.h
index 972dab5aff..4c28a65e56 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.h
+++ b/gr-zeromq/lib/pull_msg_source_impl.h
@@ -48,6 +48,13 @@ namespace gr {
bool start();
bool stop();
+
+ std::string last_endpoint() override {
+ size_t addr_len = 256;
+ char addr[addr_len];
+ d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
+ return std::string(addr, addr_len-1);
+ }
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/pull_source_impl.h b/gr-zeromq/lib/pull_source_impl.h
index 7d8ab53bd0..c08ab0521b 100644
--- a/gr-zeromq/lib/pull_source_impl.h
+++ b/gr-zeromq/lib/pull_source_impl.h
@@ -39,6 +39,7 @@ namespace gr {
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
+ std::string last_endpoint() override {return base_source_impl::last_endpoint();}
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/push_msg_sink_impl.h b/gr-zeromq/lib/push_msg_sink_impl.h
index d669d327cb..2cd487d743 100644
--- a/gr-zeromq/lib/push_msg_sink_impl.h
+++ b/gr-zeromq/lib/push_msg_sink_impl.h
@@ -41,6 +41,12 @@ namespace gr {
~push_msg_sink_impl();
void handler(pmt::pmt_t msg);
+ std::string last_endpoint() override {
+ size_t addr_len = 256;
+ char addr[addr_len];
+ d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
+ return std::string(addr, addr_len-1);
+ }
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/push_sink_impl.h b/gr-zeromq/lib/push_sink_impl.h
index 0a5de10787..73480e1047 100644
--- a/gr-zeromq/lib/push_sink_impl.h
+++ b/gr-zeromq/lib/push_sink_impl.h
@@ -39,6 +39,8 @@ namespace gr {
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
+
+ std::string last_endpoint() override {return base_sink_impl::last_endpoint();}
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.h b/gr-zeromq/lib/rep_msg_sink_impl.h
index a8485304d7..7b13e93952 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.h
+++ b/gr-zeromq/lib/rep_msg_sink_impl.h
@@ -48,6 +48,13 @@ namespace gr {
bool start();
bool stop();
+
+ std::string last_endpoint() override {
+ size_t addr_len = 256;
+ char addr[addr_len];
+ d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
+ return std::string(addr, addr_len-1);
+ }
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/rep_sink_impl.h b/gr-zeromq/lib/rep_sink_impl.h
index 012fc45e7b..b9451cfeaf 100644
--- a/gr-zeromq/lib/rep_sink_impl.h
+++ b/gr-zeromq/lib/rep_sink_impl.h
@@ -39,6 +39,7 @@ namespace gr {
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
+ std::string last_endpoint() override {return base_sink_impl::last_endpoint();}
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/req_msg_source_impl.h b/gr-zeromq/lib/req_msg_source_impl.h
index 322ce4cf51..61d80104d1 100644
--- a/gr-zeromq/lib/req_msg_source_impl.h
+++ b/gr-zeromq/lib/req_msg_source_impl.h
@@ -48,6 +48,13 @@ namespace gr {
bool start();
bool stop();
+
+ std::string last_endpoint() override {
+ size_t addr_len = 256;
+ char addr[addr_len];
+ d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
+ return std::string(addr, addr_len-1);
+ }
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/req_source_impl.h b/gr-zeromq/lib/req_source_impl.h
index 8bdbd33459..ec87832518 100644
--- a/gr-zeromq/lib/req_source_impl.h
+++ b/gr-zeromq/lib/req_source_impl.h
@@ -40,6 +40,7 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
+ std::string last_endpoint() override {return base_source_impl::last_endpoint();}
private:
bool d_req_pending;
};
diff --git a/gr-zeromq/lib/sub_msg_source_impl.h b/gr-zeromq/lib/sub_msg_source_impl.h
index 4cf85d10ba..e1c2e07788 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.h
+++ b/gr-zeromq/lib/sub_msg_source_impl.h
@@ -48,6 +48,13 @@ namespace gr {
bool start();
bool stop();
+
+ std::string last_endpoint() override {
+ size_t addr_len = 256;
+ char addr[addr_len];
+ d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
+ return std::string(addr, addr_len-1);
+ }
};
} // namespace zeromq
diff --git a/gr-zeromq/lib/sub_source_impl.h b/gr-zeromq/lib/sub_source_impl.h
index 8f82a9ab94..727d76d6a2 100644
--- a/gr-zeromq/lib/sub_source_impl.h
+++ b/gr-zeromq/lib/sub_source_impl.h
@@ -39,6 +39,8 @@ namespace gr {
int work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
+
+ std::string last_endpoint() override {return base_source_impl::last_endpoint();}
};
} // namespace zeromq
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 02:42:54 +0000