trx_toolkit/fake_trx.py: drop randomization related cmd options

The randomization of both UL/DL RSSI and ToA values is optional,
and can be configured from the control interface (see both
FAKE_RSSI and FAKE_TOA commands).

The command line options for enabling / disabling the randomization
were redundant, so let's get rid of them and check if the
corresponding treshold value is set.

Change-Id: I6adc13b8989ade2fab895673525c0ca17bf9b3f2

2 files changed, 6 insertions, 42 deletions

diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py
index 6e79d44f..31f882e9 100644
--- a/src/target/trx_toolkit/burst_fwd.py
+++ b/src/target/trx_toolkit/burst_fwd.py
@@ -74,7 +74,7 @@ class BurstForwarder:
 	            to (rssi_ul_base + rssi_ul_threshold).
 
 	Please note that the randomization of both RSSI and ToA
-	is optional, and should be enabled manually.
+	is optional, and can be enabled from the control interface.
 
 	=== Timing Advance handling
 
@@ -104,14 +104,6 @@ class BurstForwarder:
 		self.bts_link = bts_link
 		self.bb_link = bb_link
 
-		# Randomization of RSSI
-		randomize_dl_rssi = False
-		randomize_ul_rssi = False
-
-		# Randomization of ToA
-		randomize_dl_toa256 = False
-		randomize_ul_toa256 = False
-
 		# Init default parameters
 		self.reset_dl()
 		self.reset_ul()
@@ -164,7 +156,7 @@ class BurstForwarder:
 	# Calculates a random ToA value for Downlink bursts
 	def calc_dl_toa256(self):
 		# Check if randomization is required
-		if not self.randomize_dl_toa256:
+		if self.toa256_dl_threshold is 0:
 			return self.toa256_dl_base
 
 		# Calculate a range for randomization
@@ -179,7 +171,7 @@ class BurstForwarder:
 	# Calculates a random ToA value for Uplink bursts
 	def calc_ul_toa256(self):
 		# Check if randomization is required
-		if not self.randomize_ul_toa256:
+		if self.toa256_ul_threshold is 0:
 			return self.toa256_ul_base
 
 		# Calculate a range for randomization
@@ -194,7 +186,7 @@ class BurstForwarder:
 	# Calculates a random RSSI value for Downlink bursts
 	def calc_dl_rssi(self):
 		# Check if randomization is required
-		if not self.randomize_dl_rssi:
+		if self.rssi_dl_threshold is 0:
 			return self.rssi_dl_base
 
 		# Calculate a range for randomization
@@ -207,7 +199,7 @@ class BurstForwarder:
 	# Calculates a random RSSI value for Uplink bursts
 	def calc_ul_rssi(self):
 		# Check if randomization is required
-		if not self.randomize_ul_rssi:
+		if self.rssi_ul_threshold is 0:
 			return self.rssi_ul_base
 
 		# Calculate a range for randomization
diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py
index b818b2a9..d99186b3 100755
--- a/src/target/trx_toolkit/fake_trx.py
+++ b/src/target/trx_toolkit/fake_trx.py
@@ -46,12 +46,6 @@ class Application:
 	bts_base_port = 5700
 	bb_base_port = 6700
 
-	# BurstForwarder field randomization
-	randomize_dl_toa256 = False
-	randomize_ul_toa256 = False
-	randomize_dl_rssi = False
-	randomize_ul_rssi = False
-
 	def __init__(self):
 		print_copyright(CR_HOLDERS)
 		self.parse_argv()
@@ -85,10 +79,6 @@ class Application:
 
 		# BTS <-> BB burst forwarding
 		self.burst_fwd = BurstForwarder(self.bts_data, self.bb_data)
-		self.burst_fwd.randomize_dl_toa256 = self.randomize_dl_toa256
-		self.burst_fwd.randomize_ul_toa256 = self.randomize_ul_toa256
-		self.burst_fwd.randomize_dl_rssi = self.randomize_dl_rssi
-		self.burst_fwd.randomize_ul_rssi = self.randomize_ul_rssi
 
 		# Share a BurstForwarder instance between BTS and BB
 		self.bts_ctrl.burst_fwd = self.burst_fwd
@@ -144,13 +134,7 @@ class Application:
 			 "  -r --bb-addr        Set BB remote address (default %s)\n"    \
 			 "  -P --bts-base-port  Set BTS base port number (default %d)\n" \
 			 "  -p --bb-base-port   Set BB base port number (default %d)\n" \
-			 "  -b --trx-bind-addr  Set TRX bind address (default %s)\n\n"
-
-		s += " Simulation\n" \
-			 "  --rand-dl-rssi      Enable DL RSSI randomization\n"   \
-			 "  --rand-ul-rssi      Enable UL RSSI randomization\n"   \
-			 "  --rand-dl-toa       Enable DL ToA randomization\n"    \
-			 "  --rand-ul-toa       Enable UL ToA randomization\n"
+			 "  -b --trx-bind-addr  Set TRX bind address (default %s)\n"
 
 		print(s % (self.bts_addr, self.bb_addr,
 			self.bts_base_port, self.bb_base_port,
@@ -168,8 +152,6 @@ class Application:
 					"bts-addr=", "bb-addr=",
 					"bts-base-port=", "bb-base-port=",
 					"trx-bind-addr=",
-					"rand-dl-rssi", "rand-ul-rssi",
-					"rand-dl-toa", "rand-ul-toa",
 				])
 		except getopt.GetoptError as err:
 			self.print_help("[!] " + str(err))
@@ -193,16 +175,6 @@ class Application:
 			elif o in ("-b", "--trx-bind-addr"):
 				self.trx_bind_addr = v
 
-			# Message field randomization
-			elif o == "rand-dl-rssi":
-				self.randomize_dl_rssi = True
-			elif o == "rand-ul-rssi":
-				self.randomize_ul_rssi = True
-			elif o == "rand-dl-toa":
-				self.randomize_dl_toa256 = True
-			elif o == "rand-ul-toa":
-				self.randomize_ul_toa256 = True
-
 		# Ensure there is no overlap between ports
 		if self.bts_base_port == self.bb_base_port:
 			self.print_help("[!] BTS and BB base ports should be different")