From 31d4d5eb21655fba5081dae441cc1cfdffe857b9 Mon Sep 17 00:00:00 2001
From: Dieter Spaar <spaar@mirider.augusta.de>
Date: Thu, 29 Jul 2010 21:15:03 +0200
Subject: Implement support for TCH/FACCH on various TS including decryption

---
 gsm-receiver/src/python/go.sh          | 16 +++++++++++++++-
 gsm-receiver/src/python/gsm_receive.py |  4 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'gsm-receiver/src/python')

diff --git a/gsm-receiver/src/python/go.sh b/gsm-receiver/src/python/go.sh
index e0d1290..5fc37d4 100755
--- a/gsm-receiver/src/python/go.sh
+++ b/gsm-receiver/src/python/go.sh
@@ -2,6 +2,8 @@
 
 #echo "go.sh <file.cfile> [decim==112]"
 
+KEY=$4
+CONFIGURATION=$3
 DECIM=$2
 FILE=$1
 
@@ -9,4 +11,16 @@ if [ $DECIM"x" = x ]; then
 	DECIM=112
 fi
 
-./gsm_receive.py  -d "$DECIM" -I "$FILE" | ../../../gsmdecode/src/gsmdecode -i
+if [ $CONFIGURATION"x" = x ]; then
+	CONFIGURATION=""
+fi
+
+if [ "$KEY""x" = x ]; then
+	KEY="00 00 00 00 00 00 00 00"
+fi
+
+# Use GSMTAP with WireShark instead of gmsdecode !
+
+#./gsm_receive.py  -d "$DECIM" -I "$FILE" -c "$CONFIGURATION" -k "$KEY" | ../../../gsmdecode/src/gsmdecode -i
+
+./gsm_receive.py  -d "$DECIM" -I "$FILE" -c "$CONFIGURATION" -k "$KEY"
diff --git a/gsm-receiver/src/python/gsm_receive.py b/gsm-receiver/src/python/gsm_receive.py
index 130eb05..e66ddf9 100755
--- a/gsm-receiver/src/python/gsm_receive.py
+++ b/gsm-receiver/src/python/gsm_receive.py
@@ -82,7 +82,7 @@ class gsm_receiver_first_blood(gr.top_block):
         return interpolator
     
     def _set_receiver(self):
-        receiver = gsm.receiver_cf(self.tuner_callback, self.synchronizer_callback, self.options.osr, self.options.key.replace(' ', '').lower())
+        receiver = gsm.receiver_cf(self.tuner_callback, self.synchronizer_callback, self.options.osr, self.options.key.replace(' ', '').lower(), self.options.configuration.upper())
         return receiver
     
     def _process_options(self):
@@ -97,6 +97,8 @@ class gsm_receiver_first_blood(gr.top_block):
                           help="Output filename")
         parser.add_option("-k", "--key", type="string", default="AD 6A 3E C2 B4 42 E4 00",
                           help="KC session key")
+        parser.add_option("-c", "--configuration", type="string", default="",
+                          help="Decoder configuration")
 
         (options, args) = parser.parse_args ()
         return (options, args)
-- 
cgit v1.2.3