diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-digital/lib/packet_headerparser_b_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-digital/lib/packet_headerparser_b_impl.cc')
| -rw-r--r-- | gr-digital/lib/packet_headerparser_b_impl.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gr-digital/lib/packet_headerparser_b_impl.cc b/gr-digital/lib/packet_headerparser_b_impl.cc index 17e5e85091..f7593d5fb2 100644 --- a/gr-digital/lib/packet_headerparser_b_impl.cc +++ b/gr-digital/lib/packet_headerparser_b_impl.cc @@ -24,7 +24,7 @@ #endif #include <boost/format.hpp> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "packet_headerparser_b_impl.h" #define msg_port_id pmt::mp("header_data") @@ -48,9 +48,9 @@ namespace gr { } packet_headerparser_b_impl::packet_headerparser_b_impl(const gr::digital::packet_header_default::sptr &header_formatter) - : gr_sync_block("packet_headerparser_b", - gr_make_io_signature(1, 1, sizeof (unsigned char)), - gr_make_io_signature(0, 0, 0)), + : sync_block("packet_headerparser_b", + io_signature::make(1, 1, sizeof (unsigned char)), + io_signature::make(0, 0, 0)), d_header_formatter(header_formatter) { message_port_register_out(msg_port_id); @@ -72,7 +72,13 @@ namespace gr { return 0; } - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; + get_tags_in_range( + tags, 0, + nitems_read(0), + nitems_read(0)+d_header_formatter->header_len() + ); + if (!d_header_formatter->header_parser(in, tags)) { GR_LOG_INFO(d_logger, boost::format("Detected an invalid packet at item %1%") % nitems_read(0)); message_port_pub(msg_port_id, pmt::PMT_F); |