Added block for extracting assignment commands
diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml
index 85a89c2..c418fab 100644
--- a/grc/gsm_block_tree.xml
+++ b/grc/gsm_block_tree.xml
@@ -59,6 +59,7 @@
<block>gsm_extract_system_info</block>
<block>gsm_extract_immediate_assignment</block>
<block>gsm_extract_cmc</block>
+ <block>gsm_extract_assignment_cmd</block>
<block>gsm_controlled_rotator_cc</block>
<block>gsm_controlled_fractional_resampler_cc</block>
<block>gsm_message_printer</block>
diff --git a/grc/misc_utils/CMakeLists.txt b/grc/misc_utils/CMakeLists.txt
index adb90d3..da41d6c 100644
--- a/grc/misc_utils/CMakeLists.txt
+++ b/grc/misc_utils/CMakeLists.txt
@@ -22,6 +22,7 @@
gsm_extract_immediate_assignment.xml
gsm_collect_system_info.xml
gsm_extract_cmc.xml
+ gsm_extract_assignment_cmd.xml
gsm_controlled_rotator_cc.xml
gsm_message_printer.xml
gsm_bursts_printer.xml
diff --git a/grc/misc_utils/gsm_collect_system_info.xml b/grc/misc_utils/gsm_collect_system_info.xml
old mode 100755
new mode 100644
diff --git a/grc/misc_utils/gsm_extract_assignment_cmd.xml b/grc/misc_utils/gsm_extract_assignment_cmd.xml
new file mode 100644
index 0000000..8562e56
--- /dev/null
+++ b/grc/misc_utils/gsm_extract_assignment_cmd.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<block>
+ <name>Extract Assignment Command</name>
+ <key>gsm_extract_assignment_cmd</key>
+ <import>import grgsm</import>
+ <make>grgsm.extract_assignment_cmd()</make>
+ <sink>
+ <name>msgs</name>
+ <type>message</type>
+ </sink>
+ <doc>
+Extracts Assignemnt Commands.
+
+Input: decoded control channel messages
+
+The information can be retrieved using following function:
+get_assignment_commands()
+
+</doc>
+</block>
diff --git a/grc/misc_utils/gsm_extract_cmc.xml b/grc/misc_utils/gsm_extract_cmc.xml
old mode 100755
new mode 100644
diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/grgsm/misc_utils/CMakeLists.txt
index 878fcfd..2f7f4c3 100644
--- a/include/grgsm/misc_utils/CMakeLists.txt
+++ b/include/grgsm/misc_utils/CMakeLists.txt
@@ -30,6 +30,7 @@
extract_system_info.h
extract_immediate_assignment.h
extract_cmc.h
+ extract_assignment_cmd.h
controlled_rotator_cc.h
message_printer.h
tmsi_dumper.h
diff --git a/include/grgsm/misc_utils/extract_assignment_cmd.h b/include/grgsm/misc_utils/extract_assignment_cmd.h
new file mode 100644
index 0000000..59803fd
--- /dev/null
+++ b/include/grgsm/misc_utils/extract_assignment_cmd.h
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+/*
+ * @file
+ * @author (C) 2018 by Piotr Krysik <ptrkrysik@gmail.com>
+ * @section LICENSE
+ *
+ * Gr-gsm is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * Gr-gsm is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gr-gsm; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_H
+#define INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_H
+
+#include <grgsm/api.h>
+#include <gnuradio/block.h>
+#include <vector>
+
+namespace gr {
+ namespace gsm {
+
+ /*!
+ * \brief <+description of block+>
+ * \ingroup gsm
+ *
+ */
+ class GRGSM_API extract_assignment_cmd : virtual public gr::block
+ {
+ public:
+ typedef boost::shared_ptr<extract_assignment_cmd> sptr;
+
+ /*!
+ * \brief Return a shared_ptr to a new instance of gsm::extract_assignment_cmd.
+ *
+ * To avoid accidental use of raw pointers, gsm::extract_assignment_cmd's
+ * constructor is in a private implementation
+ * class. gsm::extract_assignment_cmd::make is the public interface for
+ * creating new instances.
+ */
+ static sptr make();
+ virtual std::vector<int> get_assignment_commands() = 0;
+ };
+
+ } // namespace gsm
+} // namespace gr
+#endif /* INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_H */
diff --git a/include/grgsm/misc_utils/extract_cmc.h b/include/grgsm/misc_utils/extract_cmc.h
index 82bd729..2b07bbe 100644
--- a/include/grgsm/misc_utils/extract_cmc.h
+++ b/include/grgsm/misc_utils/extract_cmc.h
@@ -53,7 +53,6 @@
virtual std::vector<int> get_framenumbers() = 0;
virtual std::vector<int> get_a5_versions() = 0;
virtual std::vector<int> get_start_ciphering() = 0;
- virtual std::vector<int> get_assignment_commands() = 0;
};
} // namespace gsm
diff --git a/lib/misc_utils/CMakeLists.txt b/lib/misc_utils/CMakeLists.txt
index 1c51fb6..720eee3 100644
--- a/lib/misc_utils/CMakeLists.txt
+++ b/lib/misc_utils/CMakeLists.txt
@@ -25,6 +25,7 @@
controlled_fractional_resampler_cc_impl.cc
controlled_rotator_cc_impl.cc
extract_cmc_impl.cc
+ extract_assignment_cmd_impl.cc
extract_immediate_assignment_impl.cc
extract_system_info_impl.cc
message_file_sink_impl.cc
diff --git a/lib/misc_utils/extract_assignment_cmd_impl.cc b/lib/misc_utils/extract_assignment_cmd_impl.cc
new file mode 100644
index 0000000..e4aa319
--- /dev/null
+++ b/lib/misc_utils/extract_assignment_cmd_impl.cc
@@ -0,0 +1,83 @@
+/* -*- c++ -*- */
+/*
+ * @file
+ * @author (C) 2018 by Piotr Krysik <ptrkrysik@gmail.com>
+ * @section LICENSE
+ *
+ * Gr-gsm is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * Gr-gsm is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gr-gsm; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/io_signature.h>
+#include <grgsm/gsmtap.h>
+//#include <unistd.h>
+#include <grgsm/endian.h>
+
+#include "extract_assignment_cmd_impl.h"
+
+namespace gr {
+ namespace gsm {
+ void extract_assignment_cmd_impl::process_messages(pmt::pmt_t msg)
+ {
+ pmt::pmt_t message_plus_header_blob = pmt::cdr(msg);
+ uint8_t * message_plus_header = (uint8_t *)pmt::blob_data(message_plus_header_blob);
+ gsmtap_hdr * header = (gsmtap_hdr *)message_plus_header;
+ uint8_t * msg_elements = (uint8_t *)(message_plus_header+sizeof(gsmtap_hdr));
+
+ if((msg_elements[3] & 0xFF) == 0x06 && msg_elements[4] == 0x2e)
+ {
+ int frame_nr = be32toh(header->frame_number);
+ d_assignment_commands.push_back(frame_nr);
+ }
+ }
+
+
+
+ std::vector<int> extract_assignment_cmd_impl::get_assignment_commands()
+ {
+ return d_assignment_commands;
+ }
+
+ extract_assignment_cmd::sptr
+ extract_assignment_cmd::make()
+ {
+ return gnuradio::get_initial_sptr
+ (new extract_assignment_cmd_impl());
+ }
+
+ /*
+ * The private constructor
+ */
+ extract_assignment_cmd_impl::extract_assignment_cmd_impl()
+ : gr::block("extract_assignment_cmd",
+ gr::io_signature::make(0, 0, 0),
+ gr::io_signature::make(0, 0, 0))
+ {
+ message_port_register_in(pmt::mp("msgs"));
+ set_msg_handler(pmt::mp("msgs"), boost::bind(&extract_assignment_cmd_impl::process_messages, this, _1));
+ }
+
+ /*
+ * Our virtual destructor.
+ */
+ extract_assignment_cmd_impl::~extract_assignment_cmd_impl()
+ {
+ }
+ } /* namespace gsm */
+} /* namespace gr */
diff --git a/lib/misc_utils/extract_assignment_cmd_impl.h b/lib/misc_utils/extract_assignment_cmd_impl.h
new file mode 100644
index 0000000..8f24b00
--- /dev/null
+++ b/lib/misc_utils/extract_assignment_cmd_impl.h
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+/*
+ * @file
+ * @author (C) 2018 by Piotr Krysik <ptrkrysik@gmail.com>
+ * @section LICENSE
+ *
+ * Gr-gsm is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * Gr-gsm is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gr-gsm; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_IMPL_H
+#define INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_IMPL_H
+
+#include <grgsm/misc_utils/extract_assignment_cmd.h>
+#include <vector>
+
+namespace gr {
+ namespace gsm {
+ class extract_assignment_cmd_impl : public extract_assignment_cmd
+ {
+ private:
+ void process_messages(pmt::pmt_t msg);
+ std::vector<int> d_assignment_commands;
+ public:
+ virtual std::vector<int> get_assignment_commands();
+ extract_assignment_cmd_impl();
+ ~extract_assignment_cmd_impl();
+ };
+ } // namespace gsm
+} // namespace gr
+#endif /* INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_IMPL_H */
diff --git a/lib/misc_utils/extract_cmc_impl.cc b/lib/misc_utils/extract_cmc_impl.cc
index c28e49f..04b0afc 100644
--- a/lib/misc_utils/extract_cmc_impl.cc
+++ b/lib/misc_utils/extract_cmc_impl.cc
@@ -50,11 +50,6 @@
d_framenumbers.push_back(frame_nr);
d_a5_versions.push_back(a5_version);
}
- if((msg_elements[3] & 0xFF) == 0x06 && msg_elements[4] == 0x2e)
- {
- int frame_nr = be32toh(header->frame_number);
- d_assignment_commands.push_back(frame_nr);
- }
}
std::vector<int> extract_cmc_impl::get_framenumbers()
@@ -72,11 +67,6 @@
return d_start_ciphering;
}
- std::vector<int> extract_cmc_impl::get_assignment_commands()
- {
- return d_assignment_commands;
- }
-
extract_cmc::sptr
extract_cmc::make()
{
diff --git a/lib/misc_utils/extract_cmc_impl.h b/lib/misc_utils/extract_cmc_impl.h
index 1dd02cb..b62cadc 100644
--- a/lib/misc_utils/extract_cmc_impl.h
+++ b/lib/misc_utils/extract_cmc_impl.h
@@ -35,12 +35,10 @@
std::vector<int> d_framenumbers;
std::vector<int> d_a5_versions;
std::vector<int> d_start_ciphering;
- std::vector<int> d_assignment_commands;
public:
virtual std::vector<int> get_framenumbers();
virtual std::vector<int> get_a5_versions();
virtual std::vector<int> get_start_ciphering();
- virtual std::vector<int> get_assignment_commands();
extract_cmc_impl();
~extract_cmc_impl();
};
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
index 57ed777..60779a6 100644
--- a/swig/grgsm_swig.i
+++ b/swig/grgsm_swig.i
@@ -56,6 +56,7 @@
#include "grgsm/misc_utils/burst_file_source.h"
#include "grgsm/misc_utils/collect_system_info.h"
#include "grgsm/misc_utils/extract_cmc.h"
+#include "grgsm/misc_utils/extract_assignment_cmd.h"
#include "grgsm/qa_utils/burst_sink.h"
#include "grgsm/qa_utils/burst_source.h"
#include "grgsm/qa_utils/message_source.h"
@@ -133,7 +134,8 @@
GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc);
%include "grgsm/misc_utils/extract_cmc.h"
GR_SWIG_BLOCK_MAGIC2(gsm, extract_cmc);
-
+%include "grgsm/misc_utils/extract_assignment_cmd.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, extract_assignment_cmd);
%include "grgsm/qa_utils/burst_sink.h"
GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink);