<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12342">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit/data_msg.py: add optional legacy message coding flag<br><br>Some transceivers (e.g. OsmoTRX) have inherited a rudiment from<br>OpenBTS - two dummy bytes at the end of TRX2L1 messages. Despite<br>they are absolutely useless, some L1 implementations, such as<br>trxcon and OpenBTS, still do expect them when checking<br>the message length.<br><br>Let's add an optional (disabled by default) argument to gen_msg(),<br>that would enable adding those two dummy bytes.<br><br>Change-Id: I0cf1314c399411886420176704cadd6e6d84787f<br>---<br>M src/target/trx_toolkit/data_msg.py<br>1 file changed, 14 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/data_msg.py b/src/target/trx_toolkit/data_msg.py</span><br><span>index bbc9d93..62fd29b 100644</span><br><span>--- a/src/target/trx_toolkit/data_msg.py</span><br><span>+++ b/src/target/trx_toolkit/data_msg.py</span><br><span>@@ -152,7 +152,7 @@</span><br><span> return struct.unpack(">L", buf)[0]</span><br><span> </span><br><span> # Generates a TRX DATA message</span><br><span style="color: hsl(0, 100%, 40%);">- def gen_msg(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ def gen_msg(self, legacy = False):</span><br><span> # Validate all the fields</span><br><span> if not self.validate():</span><br><span> raise ValueError("Message incomplete or incorrect")</span><br><span>@@ -174,6 +174,11 @@</span><br><span> # Generate burst</span><br><span> buf += self.gen_burst()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # This is a rudiment from (legacy) OpenBTS transceiver,</span><br><span style="color: hsl(120, 100%, 40%);">+ # some L1 implementations still expect two dummy bytes.</span><br><span style="color: hsl(120, 100%, 40%);">+ if legacy:</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += bytearray(2)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return buf</span><br><span> </span><br><span> # Parses a TRX DATA message</span><br><span>@@ -461,6 +466,9 @@</span><br><span> l12trx_raw = msg_l12trx_ref.gen_msg()</span><br><span> trx2l1_raw = msg_trx2l1_ref.gen_msg()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Encode a TRX2L1 message in legacy mode</span><br><span style="color: hsl(120, 100%, 40%);">+ trx2l1_raw_legacy = msg_trx2l1_ref.gen_msg(legacy = True)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> log.info("Parsing generated messages back")</span><br><span> </span><br><span> # Parse generated DATA messages</span><br><span>@@ -469,11 +477,16 @@</span><br><span> msg_l12trx_dec.parse_msg(l12trx_raw)</span><br><span> msg_trx2l1_dec.parse_msg(trx2l1_raw)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Parse generated TRX2L1 message in legacy mode</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_trx2l1_legacy_dec = DATAMSG_TRX2L1()</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_trx2l1_legacy_dec.parse_msg(trx2l1_raw_legacy)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> log.info("Comparing decoded messages with the reference")</span><br><span> </span><br><span> # Compare bursts</span><br><span> assert(msg_l12trx_dec.burst == burst_l12trx_ref)</span><br><span> assert(msg_trx2l1_dec.burst == burst_trx2l1_ref)</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(msg_trx2l1_legacy_dec.burst == burst_trx2l1_ref)</span><br><span> </span><br><span> log.info("Compare bursts: OK")</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12342">change 12342</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/12342"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0cf1314c399411886420176704cadd6e6d84787f </div>
<div style="display:none"> Gerrit-Change-Number: 12342 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>