op25
/
op25-legacy
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use correct SNAP type for WireShark sniffer. 

git-svn-id: http://op25.osmocom.org/svn/trunk@182 65a5c917-d112-43f1-993d-58c26a4786be
This commit is contained in:
stevie 2009-10-30 00:12:41 +00:00
parent 428cc9b99f
commit 0767c65c80
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
decoder/src/lib/op25_decoder_ff.cc
View File

@ -52,9 +52,8 @@ void
op25_decoder_ff::forecast(int nof_output_items, gr_vector_int &nof_input_items_reqd) op25_decoder_ff::forecast(int nof_output_items, gr_vector_int &nof_input_items_reqd)
{ {
/* This block consumes 4800 symbols/s and produces 8000 /* This block consumes 4800 symbols/s and produces 8000
* samples/s. That's a sampling rate of 3/5 or 0.6. If no output is * samples/s. That's a work rate of 3/5 or 0.6. If no audio output
* available we'll produce silence so it should be ok to stick with * is available we'll produce silence.
* this.
*/ */
const size_t nof_inputs = nof_input_items_reqd.size(); const size_t nof_inputs = nof_input_items_reqd.size();
const int nof_samples_reqd = .6 * nof_output_items; const int nof_samples_reqd = .6 * nof_output_items;

2
decoder/src/lib/sniffer_du_handler.cc
View File

@ -95,7 +95,7 @@ sniffer_du_handler::handle(data_unit_sptr du)
uint8_t tap[tap_sz]; uint8_t tap[tap_sz];
memset(&tap[0], 0x00, 6); memset(&tap[0], 0x00, 6);
memset(&tap[6], 0x00, 6); memset(&tap[6], 0x00, 6);
memset(&tap[12], 0x00, 2); memset(&tap[12], 0xff, 2);
du->decode_frame(du_sz, &tap[tap_hdr_sz]); du->decode_frame(du_sz, &tap[tap_hdr_sz]);
write(d_tap, tap, tap_sz); write(d_tap, tap, tap_sz);
} }