t/gr-foo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wireshark connector: add timeout to blocking call

Browse Source
This commit is contained in:
Bastian Bloessl
2015-06-04 12:29:38 +02:00
parent 00beec517d
commit 6e00b66822
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/wireshark_connector_impl.cc
+7 -3
View File
@@ -17,6 +17,7 @@
#include "wireshark_connector_impl.h" #include "wireshark_connector_impl.h"
#include <foo/wireshark_connector.h> #include <foo/wireshark_connector.h>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <gnuradio/block_detail.h>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
@@ -160,8 +161,12 @@ wireshark_connector_impl::general_work(int noutput, gr_vector_int& ninput_items,
gr_complex *out = (gr_complex*)output_items[0]; gr_complex *out = (gr_complex*)output_items[0];
while(!d_msg_len) { if(!d_msg_len) {
pmt::pmt_t msg(delete_head_blocking(pmt::mp("in"))); pmt::pmt_t msg(delete_head_blocking(pmt::mp("in"), 100));
if(!msg) {
return 0;
}
if(pmt::is_eof_object(msg)) { if(pmt::is_eof_object(msg)) {
dout << "WIRESHARK: exiting" << std::endl; dout << "WIRESHARK: exiting" << std::endl;
@@ -170,7 +175,6 @@ wireshark_connector_impl::general_work(int noutput, gr_vector_int& ninput_items,
dout << "WIRESHARK: received new message" << std::endl; dout << "WIRESHARK: received new message" << std::endl;
dout << "message length " << pmt::blob_length(pmt::cdr(msg)) << std::endl; dout << "message length " << pmt::blob_length(pmt::cdr(msg)) << std::endl;
handle_pdu(msg); handle_pdu(msg);
break;
} else { } else {
throw std::invalid_argument("wireshark connector expects PDUs"); throw std::invalid_argument("wireshark connector expects PDUs");
} }