fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/40046?usp=email )
Change subject: trx_toolkit/udp_link: Factor code to describe remote into
.desc_remote() function
......................................................................
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(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
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 f0a8224..8690109 100644
--- a/src/target/trx_toolkit/udp_link.py
+++ b/src/target/trx_toolkit/udp_link.py
@@ -34,11 +34,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):
self.sendto(data, (self.remote_addr, self.remote_port))
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/40046?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I1e2fa560ada7a8de4c9b9150058c2a1c73874fbe
Gerrit-Change-Number: 40046
Gerrit-PatchSet: 2
Gerrit-Owner: kirr <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-CC: osmith <[email protected]>
Gerrit-CC: pespin <[email protected]>
