<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/16090">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/fake_trx.py: refactor L12TRX -> TRX2L1 burst transformation<br><br>The burst transformation in BurstForwarder.forward_msg() used to be<br>done only once, so then the resulting message was distributed over<br>the list of connected (and active) transceivers.<br><br>This approach limits the path loss simulation capabilities, because<br>a reference to the same message is passed to FakeTRX.send_data_msg().<br>If one transceiver changes (or removes) the burst bits, the other<br>transceivers would not receive the original message.<br><br>Let's do the transformation individually for each transceiver,<br>so the original message will always remain unchanged.<br><br>Change-Id: Ia016a3a9bb6e9f17182a7168aa5a501ae9b9978b<br>---<br>M src/target/trx_toolkit/burst_fwd.py<br>M src/target/trx_toolkit/fake_trx.py<br>2 files changed, 5 insertions(+), 12 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/90/16090/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/burst_fwd.py b/src/target/trx_toolkit/burst_fwd.py</span><br><span>index b418aef..fd6013b 100644</span><br><span>--- a/src/target/trx_toolkit/burst_fwd.py</span><br><span>+++ b/src/target/trx_toolkit/burst_fwd.py</span><br><span>@@ -65,12 +65,6 @@</span><br><span>                self.trx_list.remove(trx)</span><br><span> </span><br><span>        def forward_msg(self, src_trx, rx_msg):</span><br><span style="color: hsl(0, 100%, 40%);">-         # Transform from L12TRX to TRX2L1</span><br><span style="color: hsl(0, 100%, 40%);">-               tx_msg = rx_msg.gen_trx2l1()</span><br><span style="color: hsl(0, 100%, 40%);">-            if tx_msg is None:</span><br><span style="color: hsl(0, 100%, 40%);">-                      log.error("Forwarding failed, could not transform "</span><br><span style="color: hsl(0, 100%, 40%);">-                           "message (%s) => dropping..." % rx_msg.desc_hdr())</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>              # Iterate over all known transceivers</span><br><span>                for trx in self.trx_list:</span><br><span>                    if trx == src_trx:</span><br><span>@@ -81,7 +75,9 @@</span><br><span>                               continue</span><br><span>                     if trx.rx_freq != src_trx.tx_freq:</span><br><span>                           continue</span><br><span style="color: hsl(0, 100%, 40%);">-                        if tx_msg.tn not in trx.ts_list:</span><br><span style="color: hsl(120, 100%, 40%);">+                      if rx_msg.tn not in trx.ts_list:</span><br><span>                             continue</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                    trx.send_data_msg(src_trx, rx_msg, tx_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+                    # Transform from L12TRX to TRX2L1 and forward</span><br><span style="color: hsl(120, 100%, 40%);">+                 tx_msg = rx_msg.gen_trx2l1(ver = trx.data_if._hdr_ver)</span><br><span style="color: hsl(120, 100%, 40%);">+                        trx.handle_data_msg(src_trx, rx_msg, tx_msg)</span><br><span>diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py</span><br><span>index 8beee6e..5153722 100755</span><br><span>--- a/src/target/trx_toolkit/fake_trx.py</span><br><span>+++ b/src/target/trx_toolkit/fake_trx.py</span><br><span>@@ -199,10 +199,7 @@</span><br><span>     # Takes (partially initialized) TRX2L1 message,</span><br><span>      # simulates RF path parameters (such as RSSI),</span><br><span>       # and sends towards the L1</span><br><span style="color: hsl(0, 100%, 40%);">-      def send_data_msg(self, src_trx, src_msg, msg):</span><br><span style="color: hsl(0, 100%, 40%);">-         # Override header version</span><br><span style="color: hsl(0, 100%, 40%);">-               msg.ver = self.data_if._hdr_ver</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+       def handle_data_msg(self, src_trx, src_msg, msg):</span><br><span>            # Complete message header</span><br><span>            msg.toa256 = self.toa256</span><br><span>             msg.rssi = self.rssi</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/16090">change 16090</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/c/osmocom-bb/+/16090"/><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-Change-Id: Ia016a3a9bb6e9f17182a7168aa5a501ae9b9978b </div>
<div style="display:none"> Gerrit-Change-Number: 16090 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>