aboutsummaryrefslogtreecommitdiffstats
path: root/grc
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@users.noreply.github.com>2017-02-16 20:51:36 +0100
committerGitHub <noreply@github.com>2017-02-16 20:51:36 +0100
commit369bdb37c1ee512c15c609fa837e255643586334 (patch)
tree0a7223602f0cee0dca09df1725f8a351f28beb6e /grc
parent98581a8e921bb6c884d39c7b224b33ab5420d4b6 (diff)
parent654d652a730e579a770f9a9381c4da13659f6ff6 (diff)
Merge branch 'master' into collect-system-info
Diffstat (limited to 'grc')
-rw-r--r--grc/gsm_block_tree.xml1
-rw-r--r--grc/misc_utils/CMakeLists.txt1
-rwxr-xr-xgrc/misc_utils/gsm_extract_cmc.xml20
3 files changed, 22 insertions, 0 deletions
diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml
index bb705c9..c2e1ee7 100644
--- a/grc/gsm_block_tree.xml
+++ b/grc/gsm_block_tree.xml
@@ -59,6 +59,7 @@
<block>gsm_message_file_source</block>
<block>gsm_extract_system_info</block>
<block>gsm_extract_immediate_assignment</block>
+ <block>gsm_extract_cmc</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 43c3960..adb90d3 100644
--- a/grc/misc_utils/CMakeLists.txt
+++ b/grc/misc_utils/CMakeLists.txt
@@ -21,6 +21,7 @@ install(FILES
gsm_extract_system_info.xml
gsm_extract_immediate_assignment.xml
gsm_collect_system_info.xml
+ gsm_extract_cmc.xml
gsm_controlled_rotator_cc.xml
gsm_message_printer.xml
gsm_bursts_printer.xml
diff --git a/grc/misc_utils/gsm_extract_cmc.xml b/grc/misc_utils/gsm_extract_cmc.xml
new file mode 100755
index 0000000..66a6408
--- /dev/null
+++ b/grc/misc_utils/gsm_extract_cmc.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<block>
+ <name>Extract Cipher Mode Command</name>
+ <key>gsm_extract_cmc</key>
+ <import>import grgsm</import>
+ <make>grgsm.extract_cmc()</make>
+ <sink>
+ <name>msgs</name>
+ <type>message</type>
+ </sink>
+ <doc>
+Extracts the framenumber and the assigned encryption algorithm from Cipher Mode Commands.
+
+Input: decoded control channel messages
+
+The information can be retrieved using following functions:
+get_frame_numbers(), get_a5_versions()
+
+</doc>
+</block>