Change in osmocom-bb[master]: trx_toolkit/ctrl_if.py: read data from socket in handle_rx()

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Vadim Yanitskiy gerrit-no-reply at lists.osmocom.org
Tue Dec 11 17:56:13 UTC 2018


Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12260


Change subject: trx_toolkit/ctrl_if.py: read data from socket in handle_rx()
......................................................................

trx_toolkit/ctrl_if.py: read data from socket in handle_rx()

It makes much more sense to read data from socket in handle_rx(),
instead of expecting a buffer with received data from caller.

Change-Id: I83479c60c54e36a2a7582714a6043090585957ae
---
M src/target/trx_toolkit/ctrl_if.py
M src/target/trx_toolkit/fake_trx.py
2 files changed, 7 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/12260/1

diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py
index b533746..45bfa2b 100644
--- a/src/target/trx_toolkit/ctrl_if.py
+++ b/src/target/trx_toolkit/ctrl_if.py
@@ -27,7 +27,11 @@
 from udp_link import UDPLink
 
 class CTRLInterface(UDPLink):
-	def handle_rx(self, data, remote):
+	def handle_rx(self):
+		# Read data from socket
+		data, remote = self.sock.recvfrom(128)
+		data = data.decode()
+
 		if not self.verify_req(data):
 			log.error("Wrong data on CTRL interface")
 			return
diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py
index d73b566..95261df 100755
--- a/src/target/trx_toolkit/fake_trx.py
+++ b/src/target/trx_toolkit/fake_trx.py
@@ -112,13 +112,11 @@
 
 			# CTRL commands from BTS
 			if self.bts_ctrl.sock in r_event:
-				data, addr = self.bts_ctrl.sock.recvfrom(128)
-				self.bts_ctrl.handle_rx(data.decode(), addr)
+				self.bts_ctrl.handle_rx()
 
 			# CTRL commands from BB
 			if self.bb_ctrl.sock in r_event:
-				data, addr = self.bb_ctrl.sock.recvfrom(128)
-				self.bb_ctrl.handle_rx(data.decode(), addr)
+				self.bb_ctrl.handle_rx()
 
 	def shutdown(self):
 		log.info("Shutting down...")

-- 
To view, visit https://gerrit.osmocom.org/12260
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83479c60c54e36a2a7582714a6043090585957ae
Gerrit-Change-Number: 12260
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181211/761ebe09/attachment.htm>


More information about the gerrit-log mailing list