kirr has uploaded this change for review.

View Change

trx_toolkit/udp_link: Factor code to describe remote into .desc_remote() function

And use that utility everywhere where remote of UDPLink is logged.

The reason we are doing this is that with upcoming switch to Cython the
way remote address is stored will change to `struct sockaddr_in` and
instead of updating all users, we will need to only change
UDPLink.desc_remote() in one place.

Add .desc_local() for symmetry.

Change-Id: I1e2fa560ada7a8de4c9b9150058c2a1c73874fbe
---
M src/target/trx_toolkit/data_if.py
M src/target/trx_toolkit/udp_link.py
2 files changed, 9 insertions(+), 5 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/40046/1

diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py
index 5bc243f..f59ca17 100644
--- a/src/target/trx_toolkit/data_if.py
+++ b/src/target/trx_toolkit/data_if.py
@@ -70,7 +70,7 @@
 			msg.parse_msg(data)
 		except:
 			log.error("Failed to parse a TRXD Tx message "
-				"from R:%s:%u" % (self.remote_addr, self.remote_port))
+				"from R:%s" % self.desc_remote())
 			return None
 
 		# Make sure the header version matches
@@ -90,7 +90,7 @@
 			msg.parse_msg(bytearray(data))
 		except:
 			log.error("Failed to parse a TRXD Rx message "
-				"from R:%s:%u" % (self.remote_addr, self.remote_port))
+				"from R:%s" % self.desc_remote())
 			return None
 
 		# Make sure the header version matches
diff --git a/src/target/trx_toolkit/udp_link.py b/src/target/trx_toolkit/udp_link.py
index c3f1476..53a0bfb 100644
--- a/src/target/trx_toolkit/udp_link.py
+++ b/src/target/trx_toolkit/udp_link.py
@@ -33,11 +33,15 @@
 	def __del__(self):
 		self.sock.close()
 
-	def desc_link(self):
+	def desc_local(self):
 		(bind_addr, bind_port) = self.sock.getsockname()
+		return "%s:%u" % (bind_addr, bind_port)
 
-		return "L:%s:%u <-> R:%s:%u" \
-			% (bind_addr, bind_port, self.remote_addr, self.remote_port)
+	def desc_remote(self):
+		return "%s:%u" % (self.remote_addr, self.remote_port)
+
+	def desc_link(self):
+		return "L:%s <-> R:%s" % (self.desc_local(), self.desc_remote())
 
 	def send(self, data):
 		if type(data) not in [bytearray, bytes]:

To view, visit change 40046. To unsubscribe, or for help writing mail filters, visit settings.