diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2014-02-16 01:42:21 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-02-16 14:35:22 -0500 |
| commit | 7f57cf7d5011ad33dfee1bbd2dcd31499ab40bf0 (patch) | |
| tree | 7a80b44887aad2cf2949e89b151256a9fb7661f1 /gr-blocks/lib/random_pdu_impl.cc | |
| parent | 246ec97757c69d5296ebf56a273bf8e0e782a0b4 (diff) | |
blocks: random_pdu (allow specifying the length modulo for random pdu lengths)
Diffstat (limited to 'gr-blocks/lib/random_pdu_impl.cc')
| -rw-r--r-- | gr-blocks/lib/random_pdu_impl.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc index 0ae800a167..6efed0664d 100644 --- a/gr-blocks/lib/random_pdu_impl.cc +++ b/gr-blocks/lib/random_pdu_impl.cc @@ -32,12 +32,12 @@ namespace gr { namespace blocks { random_pdu::sptr - random_pdu::make(int min_items, int max_items, char byte_mask) + random_pdu::make(int min_items, int max_items, char byte_mask, int length_modulo) { - return gnuradio::get_initial_sptr(new random_pdu_impl(min_items, max_items, byte_mask)); + return gnuradio::get_initial_sptr(new random_pdu_impl(min_items, max_items, byte_mask, length_modulo)); } - random_pdu_impl::random_pdu_impl(int min_items, int max_items, char byte_mask) + random_pdu_impl::random_pdu_impl(int min_items, int max_items, char byte_mask, int length_modulo) : block("random_pdu", io_signature::make (0, 0, 0), io_signature::make (0, 0, 0)), @@ -45,11 +45,16 @@ namespace gr { d_brange(0, 255), d_rvar(d_rng, d_urange), d_bvar(d_rng, d_brange), - d_mask(byte_mask) + d_mask(byte_mask), + d_length_modulo(length_modulo) { message_port_register_out(PDU_PORT_ID); message_port_register_in(pmt::mp("generate")); set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, _1)); + if(length_modulo < 1) + throw std::runtime_error("length_module must be >= 1"); + if(max_items < length_modulo) + throw std::runtime_error("max_items must be >= to length_modulo"); } bool @@ -64,6 +69,7 @@ namespace gr { { // pick a random vector length int len = d_rvar(); + len = std::max(d_length_modulo, len - len%d_length_modulo); // fill it with random bytes std::vector<unsigned char> vec(len); |