<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12560">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit: use 'TRXC' and 'TRXD' in logging messages<br><br>One can confuse TRX control interface with libosmoctrl's one.<br>TRX toolkit is not using libosmoctrl, and will never do. But,<br>in order to avoid this confusion, and potential confusion of<br>DATA interface, let's call them 'TRXC' and 'TRXD' in logging.<br><br>Change-Id: I67b1e850094cf8e279777c45c7544886be42a009<br>---<br>M src/target/trx_toolkit/README<br>M src/target/trx_toolkit/ctrl_cmd.py<br>M src/target/trx_toolkit/ctrl_if.py<br>M src/target/trx_toolkit/data_if.py<br>M src/target/trx_toolkit/transceiver.py<br>5 files changed, 12 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/12560/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/README b/src/target/trx_toolkit/README</span><br><span>index 91b6099..09800b0 100644</span><br><span>--- a/src/target/trx_toolkit/README</span><br><span>+++ b/src/target/trx_toolkit/README</span><br><span>@@ -32,3 +32,8 @@</span><br><span> versa. Also provides some capabilities for filtering bursts</span><br><span> by direction, frame and timeslot numbers, and for recording</span><br><span> captured messages to a binary file.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Please note that TRX toolkit is not using libosmocore's CTRL</span><br><span style="color: hsl(120, 100%, 40%);">+interface, so 'CTRL' in scope of this code base actually means</span><br><span style="color: hsl(120, 100%, 40%);">+control interface of TRX or control protocol. In order to avoid</span><br><span style="color: hsl(120, 100%, 40%);">+possible confusion, we use 'TRXC' and 'TRXD' in logging.</span><br><span>diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py</span><br><span>index 28815c2..bdacb64 100755</span><br><span>--- a/src/target/trx_toolkit/ctrl_cmd.py</span><br><span>+++ b/src/target/trx_toolkit/ctrl_cmd.py</span><br><span>@@ -51,7 +51,7 @@</span><br><span> self.argv.bind_addr, self.argv.bind_port)</span><br><span> </span><br><span> # Debug print</span><br><span style="color: hsl(0, 100%, 40%);">- log.info("Init CTRL interface (%s)" \</span><br><span style="color: hsl(120, 100%, 40%);">+ log.info("Init TRXC interface (%s)" \</span><br><span> % self.ctrl_link.desc_link())</span><br><span> </span><br><span> def parse_argv(self):</span><br><span>@@ -109,7 +109,7 @@</span><br><span> self.ctrl_link.send("CMD %s\0" % cmd)</span><br><span> </span><br><span> def print_prompt(self):</span><br><span style="color: hsl(0, 100%, 40%);">- sys.stdout.write("CTRL# ")</span><br><span style="color: hsl(120, 100%, 40%);">+ sys.stdout.write("TRXC# ")</span><br><span> sys.stdout.flush()</span><br><span> </span><br><span> def sig_handler(self, signum, frame):</span><br><span>diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py</span><br><span>index a1c19f0..902af18 100644</span><br><span>--- a/src/target/trx_toolkit/ctrl_if.py</span><br><span>+++ b/src/target/trx_toolkit/ctrl_if.py</span><br><span>@@ -29,7 +29,7 @@</span><br><span> class CTRLInterface(UDPLink):</span><br><span> def __init__(self, *udp_link_args):</span><br><span> UDPLink.__init__(self, *udp_link_args)</span><br><span style="color: hsl(0, 100%, 40%);">- log.debug("Init CTRL interface (%s)" % self.desc_link())</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug("Init TRXC interface (%s)" % self.desc_link())</span><br><span> </span><br><span> def handle_rx(self):</span><br><span> # Read data from socket</span><br><span>@@ -37,7 +37,7 @@</span><br><span> data = data.decode()</span><br><span> </span><br><span> if not self.verify_req(data):</span><br><span style="color: hsl(0, 100%, 40%);">- log.error("Wrong data on CTRL interface")</span><br><span style="color: hsl(120, 100%, 40%);">+ log.error("Wrong data on TRXC interface")</span><br><span> return</span><br><span> </span><br><span> # Attempt to parse a command</span><br><span>diff --git a/src/target/trx_toolkit/data_if.py b/src/target/trx_toolkit/data_if.py</span><br><span>index b1ba1e5..027fd85 100644</span><br><span>--- a/src/target/trx_toolkit/data_if.py</span><br><span>+++ b/src/target/trx_toolkit/data_if.py</span><br><span>@@ -30,7 +30,7 @@</span><br><span> class DATAInterface(UDPLink):</span><br><span> def __init__(self, *udp_link_args):</span><br><span> UDPLink.__init__(self, *udp_link_args)</span><br><span style="color: hsl(0, 100%, 40%);">- log.debug("Init DATA interface (%s)" % self.desc_link())</span><br><span style="color: hsl(120, 100%, 40%);">+ log.debug("Init TRXD interface (%s)" % self.desc_link())</span><br><span> </span><br><span> def recv_raw_data(self):</span><br><span> data, _ = self.sock.recvfrom(512)</span><br><span>diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py</span><br><span>index 4eb210b..b15c10f 100644</span><br><span>--- a/src/target/trx_toolkit/transceiver.py</span><br><span>+++ b/src/target/trx_toolkit/transceiver.py</span><br><span>@@ -180,13 +180,13 @@</span><br><span> </span><br><span> # Make sure that transceiver is configured and running</span><br><span> if not self.running:</span><br><span style="color: hsl(0, 100%, 40%);">- log.warning("(%s) RX DATA message (%s), but transceiver "</span><br><span style="color: hsl(120, 100%, 40%);">+ log.warning("(%s) RX TRXD message (%s), but transceiver "</span><br><span> "is not running => dropping..." % (self, msg.desc_hdr()))</span><br><span> return None</span><br><span> </span><br><span> # Make sure that indicated timeslot is configured</span><br><span> if msg.tn not in self.ts_list:</span><br><span style="color: hsl(0, 100%, 40%);">- log.warning("(%s) RX DATA message (%s), but timeslot is not "</span><br><span style="color: hsl(120, 100%, 40%);">+ log.warning("(%s) RX TRXD message (%s), but timeslot is not "</span><br><span> "configured => dropping..." % (self, msg.desc_hdr()))</span><br><span> return None</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12560">change 12560</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12560"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I67b1e850094cf8e279777c45c7544886be42a009 </div>
<div style="display:none"> Gerrit-Change-Number: 12560 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>