Merge branch 'master' of https://github.com/Oros42/IMSI-catcher

scan-and-livemon

@@ -93,7 +93,9 @@ def main(options = None):
 			"-f", str(freq)])
 		procs.append(proc)
 		serverport = serverport + 1
-	#proc.terminate()
+	# Keep the processes in our process group, to make sure they all die when scan-and-livemon is killed
+	for proc in procs:
+		proc.wait()
 
 if __name__ == '__main__':
 	main()

simple_IMSI-catcher.py

@@ -556,9 +556,11 @@ if __name__ == '__main__':
 	imsi_to_track=""
 	if options.imsi:
 		imsi="9"+options.imsi.replace(" ", "")
+		imsi_to_track_len=len(imsi)
 		if imsi_to_track_len%2 == 0 and imsi_to_track_len > 0 and imsi_to_track_len <17:
 			for i in range(0, imsi_to_track_len-1, 2):
 				imsi_to_track+=chr(int(imsi[i+1])*16+int(imsi[i]))
+			imsi_to_track_len=len(imsi_to_track)
 		else:
 			print("Wrong size for the IMSI to track!")
 			print("Valid sizes :")