<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/18021">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mobile: traffic req check: support EFR<br><br>While at it, move to extra function and add a length check.<br><br>Related: SYS#4924<br>Change-Id: Iba84f5d60ff5b1a2db8fb6af5131e185965df7c9<br>---<br>M src/host/layer23/src/common/l1ctl.c<br>1 file changed, 37 insertions(+), 3 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/21/18021/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c</span><br><span>index b7d0ecd..37a29e6 100644</span><br><span>--- a/src/host/layer23/src/common/l1ctl.c</span><br><span>+++ b/src/host/layer23/src/common/l1ctl.c</span><br><span>@@ -888,6 +888,42 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOG_TRAFFIC_REQ(mode, level, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, level, "Traffic Request, mode=%s: " fmt, get_value_string(gsm48_chan_mode_names, mode), ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int traffic_req_frame_verify(enum gsm48_chan_mode mode, uint8_t *frame, size_t frame_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: this is FR only, check for TCH/F (FR) and TCH/H (HR) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RFC 3551, section 4.5.8 GSM */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (frame_len != 13) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRAFFIC_REQ(mode, LOGL_ERROR, "incorrect length (%zu != 13)\n", frame_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -2;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((frame[0] >> 4) != 0xd) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRAFFIC_REQ(mode, LOGL_ERROR, "incorrect magic (%u != 0xd)\n", frame[0] >> 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -3;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RFC 3551, section 4.5.9 GSM-EFR */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (frame_len != 31) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRAFFIC_REQ(mode, LOGL_ERROR, "incorrect length (%zu != 31)\n", frame_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -4;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((frame[0] >> 4) != 0xc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRAFFIC_REQ(mode, LOGL_ERROR, "incorrect magic (%u != 0xc)\n", frame[0] >> 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -5;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRAFFIC_REQ(mode, LOGL_ERROR, "not implemented\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Transmit L1CTL_TRAFFIC_REQ (Traffic Request to L1) */</span><br><span> int l1ctl_tx_traffic_req(struct osmocom_ms *ms, struct msgb *msg,</span><br><span> uint8_t chan_nr, uint8_t link_id)</span><br><span>@@ -909,9 +945,7 @@</span><br><span> DEBUGP(DL1C, "TRAFFIC REQ len=%zu (%s)\n", frame_len,</span><br><span> osmo_hexdump(frame, frame_len));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((frame[0] >> 4) != 0xd) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_ERROR, "Traffic Request has incorrect magic "</span><br><span style="color: hsl(0, 100%, 40%);">- "(%u != 0xd)\n", frame[0] >> 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (traffic_req_frame_verify(ms->rrlayer.cd_now.mode, frame, frame_len) < 0) {</span><br><span> msgb_free(msg);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/18021">change 18021</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/+/18021"/><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: Iba84f5d60ff5b1a2db8fb6af5131e185965df7c9 </div>
<div style="display:none"> Gerrit-Change-Number: 18021 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>