Added options to burst printer to have partial output compatibility to airprobe. See issue #86
This commit is contained in:
parent
42411c6ef0
commit
634449656e
|
@ -4,7 +4,7 @@
|
||||||
<key>gsm_bursts_printer</key>
|
<key>gsm_bursts_printer</key>
|
||||||
<import>import grgsm</import>
|
<import>import grgsm</import>
|
||||||
<import>import pmt</import>
|
<import>import pmt</import>
|
||||||
<make>grgsm.bursts_printer(pmt.intern($prepend_string), $prepend_fnr)</make>
|
<make>grgsm.bursts_printer(pmt.intern($prepend_string), $prepend_fnr, $prepend_frame_count, $print_payload_only)</make>
|
||||||
|
|
||||||
<param>
|
<param>
|
||||||
<name>Prepend String</name>
|
<name>Prepend String</name>
|
||||||
|
@ -27,6 +27,34 @@
|
||||||
<key>True</key>
|
<key>True</key>
|
||||||
</option>
|
</option>
|
||||||
</param>
|
</param>
|
||||||
|
<param>
|
||||||
|
<name>Prepend Frame Count</name>
|
||||||
|
<key>prepend_frame_count</key>
|
||||||
|
<value>False</value>
|
||||||
|
<type>bool</type>
|
||||||
|
<option>
|
||||||
|
<name>False</name>
|
||||||
|
<key>False</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>True</name>
|
||||||
|
<key>True</key>
|
||||||
|
</option>
|
||||||
|
</param>
|
||||||
|
<param>
|
||||||
|
<name>Print payload only</name>
|
||||||
|
<key>print_payload_only</key>
|
||||||
|
<value>False</value>
|
||||||
|
<type>bool</type>
|
||||||
|
<option>
|
||||||
|
<name>False</name>
|
||||||
|
<key>False</key>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>True</name>
|
||||||
|
<key>True</key>
|
||||||
|
</option>
|
||||||
|
</param>
|
||||||
|
|
||||||
<sink>
|
<sink>
|
||||||
<name>bursts</name>
|
<name>bursts</name>
|
||||||
|
|
|
@ -50,7 +50,8 @@ namespace gr {
|
||||||
* class. gsm::bursts_printer::make is the public interface for
|
* class. gsm::bursts_printer::make is the public interface for
|
||||||
* creating new instances.
|
* creating new instances.
|
||||||
*/
|
*/
|
||||||
static sptr make(pmt::pmt_t prepend_string, bool prepend_fnr=false);
|
static sptr make(pmt::pmt_t prepend_string, bool prepend_fnr=false,
|
||||||
|
bool prepend_frame_count=false, bool print_payload_only=false);
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace gsm
|
} // namespace gsm
|
||||||
|
|
|
@ -44,39 +44,77 @@ namespace gr {
|
||||||
gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_plus_burst);
|
gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_plus_burst);
|
||||||
int8_t * burst = (int8_t *)(pmt::blob_data(header_plus_burst))+sizeof(gsmtap_hdr);
|
int8_t * burst = (int8_t *)(pmt::blob_data(header_plus_burst))+sizeof(gsmtap_hdr);
|
||||||
size_t burst_len=pmt::blob_length(header_plus_burst)-sizeof(gsmtap_hdr);
|
size_t burst_len=pmt::blob_length(header_plus_burst)-sizeof(gsmtap_hdr);
|
||||||
uint32_t frame_nr;
|
uint32_t frame_nr = be32toh(header->frame_number);
|
||||||
|
|
||||||
std::cout << d_prepend_string;
|
std::cout << d_prepend_string;
|
||||||
if (d_prepend_fnr)
|
if (d_prepend_fnr)
|
||||||
{
|
{
|
||||||
frame_nr = be32toh(header->frame_number);
|
std::cout << frame_nr;
|
||||||
std::cout << frame_nr << ":";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for(int ii=0; ii<burst_len; ii++)
|
if (d_prepend_fnr && d_prepend_frame_count)
|
||||||
{
|
{
|
||||||
std::cout << std::setprecision(1) << static_cast<int>(burst[ii]) << "";
|
std::cout << " ";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (d_prepend_frame_count)
|
||||||
|
{
|
||||||
|
// calculate frame count for A5
|
||||||
|
uint16_t t1 = frame_nr/1326;
|
||||||
|
uint8_t t2 = frame_nr % 26;
|
||||||
|
uint8_t t3 = frame_nr % 51;
|
||||||
|
uint32_t frame_count = (t1<<11)|(t3<<5)|t2;
|
||||||
|
std::cout << frame_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (d_prepend_fnr || d_prepend_frame_count)
|
||||||
|
{
|
||||||
|
std::cout << ":";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (d_print_payload_only)
|
||||||
|
{
|
||||||
|
for (int ii=0; ii<57; ii++)
|
||||||
|
{
|
||||||
|
std::cout << std::setprecision(1) << static_cast<int>(burst[ii + 3]);
|
||||||
|
}
|
||||||
|
for (int ii=0; ii<57; ii++)
|
||||||
|
{
|
||||||
|
std::cout << std::setprecision(1) << static_cast<int>(burst[ii + 88]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for(int ii=0; ii<burst_len; ii++)
|
||||||
|
{
|
||||||
|
std::cout << std::setprecision(1) << static_cast<int>(burst[ii]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
bursts_printer::sptr
|
bursts_printer::sptr
|
||||||
bursts_printer::make(pmt::pmt_t prepend_string, bool prepend_fnr)
|
bursts_printer::make(pmt::pmt_t prepend_string, bool prepend_fnr,
|
||||||
|
bool prepend_frame_count, bool print_payload_only)
|
||||||
{
|
{
|
||||||
return gnuradio::get_initial_sptr
|
return gnuradio::get_initial_sptr
|
||||||
(new bursts_printer_impl(prepend_string, prepend_fnr));
|
(new bursts_printer_impl(prepend_string, prepend_fnr, prepend_frame_count, print_payload_only));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The private constructor
|
* The private constructor
|
||||||
*/
|
*/
|
||||||
bursts_printer_impl::bursts_printer_impl(pmt::pmt_t prepend_string, bool prepend_fnr)
|
bursts_printer_impl::bursts_printer_impl(pmt::pmt_t prepend_string, bool prepend_fnr,
|
||||||
|
bool prepend_frame_count, bool print_payload_only)
|
||||||
: gr::block("bursts_printer",
|
: gr::block("bursts_printer",
|
||||||
gr::io_signature::make(0, 0, 0),
|
gr::io_signature::make(0, 0, 0),
|
||||||
gr::io_signature::make(0, 0, 0))
|
gr::io_signature::make(0, 0, 0))
|
||||||
{
|
{
|
||||||
d_prepend_string = prepend_string;
|
d_prepend_string = prepend_string;
|
||||||
d_prepend_fnr = prepend_fnr;
|
d_prepend_fnr = prepend_fnr;
|
||||||
|
d_prepend_frame_count = prepend_frame_count;
|
||||||
|
d_print_payload_only = print_payload_only;
|
||||||
message_port_register_in(pmt::mp("bursts"));
|
message_port_register_in(pmt::mp("bursts"));
|
||||||
set_msg_handler(pmt::mp("bursts"), boost::bind(&bursts_printer_impl::bursts_print, this, _1));
|
set_msg_handler(pmt::mp("bursts"), boost::bind(&bursts_printer_impl::bursts_print, this, _1));
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,8 +35,11 @@ namespace gr {
|
||||||
void bursts_print(pmt::pmt_t burst);
|
void bursts_print(pmt::pmt_t burst);
|
||||||
pmt::pmt_t d_prepend_string;
|
pmt::pmt_t d_prepend_string;
|
||||||
bool d_prepend_fnr;
|
bool d_prepend_fnr;
|
||||||
|
bool d_prepend_frame_count;
|
||||||
|
bool d_print_payload_only;
|
||||||
public:
|
public:
|
||||||
bursts_printer_impl(pmt::pmt_t prepend_string, bool prepend_fnr=false);
|
bursts_printer_impl(pmt::pmt_t prepend_string, bool prepend_fnr=false,
|
||||||
|
bool prepend_frame_count=false, bool print_payload_only=false);
|
||||||
~bursts_printer_impl();
|
~bursts_printer_impl();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue