summaryrefslogtreecommitdiffstats
path: root/Src/PyCatcher/src/driverConnector.py
diff options
context:
space:
mode:
authorTom2012-04-23 18:13:08 +0200
committerTom2012-04-23 18:13:08 +0200
commit336286e4ddde5b963035a1d16252291181712416 (patch)
tree57366b8a4d89d6d42caa315a96706481a2ebf938 /Src/PyCatcher/src/driverConnector.py
parentfinished database implementation and documentation in thesis, incorporated ch... (diff)
downloadimsi-catcher-detection-336286e4ddde5b963035a1d16252291181712416.tar.gz
imsi-catcher-detection-336286e4ddde5b963035a1d16252291181712416.tar.xz
imsi-catcher-detection-336286e4ddde5b963035a1d16252291181712416.zip
implemented neighbourhood on all bads and csv exporter
Diffstat (limited to 'Src/PyCatcher/src/driverConnector.py')
-rw-r--r--Src/PyCatcher/src/driverConnector.py29
1 files changed, 24 insertions, 5 deletions
diff --git a/Src/PyCatcher/src/driverConnector.py b/Src/PyCatcher/src/driverConnector.py
index 2e990fd..dea253f 100644
--- a/Src/PyCatcher/src/driverConnector.py
+++ b/Src/PyCatcher/src/driverConnector.py
@@ -84,12 +84,12 @@ class ScanThread(threading.Thread):
if re.search('SysInfo', line):
base_station = BaseStationInformation()
#get country
- line = line = scan_process.stdout.readline()
+ line = scan_process.stdout.readline()
match = re.search(r'Country:\s(\w+)',line)
if match:
base_station.country = match.group(1)
#get provider
- line = line = scan_process.stdout.readline()
+ line = scan_process.stdout.readline()
match = re.search(r'Provider:\s(.+)',line)
if match:
base_station.provider = match.group(1)
@@ -118,19 +118,38 @@ class ScanThread(threading.Thread):
match = re.search(r'rxlev:\s(.\d+)',line)
if match:
base_station.rxlev = int(match.group(1))
+ line = scan_process.stdout.readline()
+ match = re.search(r'\s((\d+)\s)*',line)
+ if match:
+ base_station.neighbours = map(int,match.group(0).strip().split(' '))
+ #get si1
+ line = scan_process.stdout.readline()
+ match = re.search(r'SI1:\s(.+)',line)
+ if match:
+ base_station.system_info_t1 = match.group(1).split(' ')
+ #get si3
+ line = scan_process.stdout.readline()
+ match = re.search(r'SI3:\s(.+)',line)
+ if match:
+ base_station.system_info_t3 = match.group(1).split(' ')
+ #get si4
+ line = scan_process.stdout.readline()
+ match = re.search(r'SI4:\s(.+)',line)
+ if match:
+ base_station.system_info_t4 = match.group(1).split(' ')
#get si2
line = scan_process.stdout.readline()
- match = re.search(r'si2\s(.+)',line)
+ match = re.search(r'SI2:\s(.+)',line)
if match:
base_station.system_info_t2 = match.group(1).split(' ')
#get si2ter
line = scan_process.stdout.readline()
- match = re.search(r'si2ter\s(.+)',line)
+ match = re.search(r'SI2ter:\s(.+)',line)
if match:
base_station.system_info_t2ter = match.group(1).split(' ')
#get si2bis
line = scan_process.stdout.readline()
- match = re.search(r'si2bis\s(.+)',line)
+ match = re.search(r'SI2bis:\s(.+)',line)
if match:
base_station.system_info_t2bis = match.group(1).split(' ')
#endinfo