<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11215">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/l1ctl.c: keep L1 header, drop L1CTL header<br><br>There is no need to keep the L1CTL header in messages being sent<br>towards the upper layers, but the L1 info header can be used by<br>L2&3 to obtain some information, e.g. TDMA frame number.<br><br>Change-Id: Id64249f1b7a1c2be578263ba62aa195c452ab7e8<br>---<br>M src/host/layer23/src/common/l1ctl.c<br>1 file changed, 5 insertions(+), 16 deletions(-)<br><br></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 eedfb93..39b7f3c 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>@@ -244,10 +244,6 @@</span><br><span> else</span><br><span> le = &ms->lapdm_channel.lapdm_dcch;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* pull the L1 header from the msgb */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr)));</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l1h = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA,</span><br><span> PRIM_OP_INDICATION, msg);</span><br><span> pp.u.data.chan_nr = dl->chan_nr;</span><br><span>@@ -638,8 +634,8 @@</span><br><span> /* just forward the SIM response to the SIM handler */</span><br><span> static int rx_l1_sim_conf(struct osmocom_ms *ms, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t len = msg->len - sizeof(struct l1ctl_hdr);</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *data = msg->data + sizeof(struct l1ctl_hdr);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t len = msgb_l2len(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *data = msg->data;</span><br><span> </span><br><span> if (apdu_len > -1 && apdu_len + len <= sizeof(apdu_data)) {</span><br><span> memcpy(apdu_data + apdu_len, data, len);</span><br><span>@@ -649,10 +645,6 @@</span><br><span> }</span><br><span> </span><br><span> LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len));</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- /* pull the L1 header from the msgb */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_pull(msg, sizeof(struct l1ctl_hdr));</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l1h = NULL;</span><br><span> </span><br><span> sim_apdu_resp(ms, msg);</span><br><span> </span><br><span>@@ -784,13 +776,8 @@</span><br><span> DEBUGP(DL1C, "TRAFFIC IND (%s)\n", osmo_hexdump(ti->data, 33));</span><br><span> </span><br><span> /* distribute or drop */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ms->l1_entity.l1_traffic_ind) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* pull the L1 header from the msgb */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr)));</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l1h = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->l1_entity.l1_traffic_ind)</span><br><span> return ms->l1_entity.l1_traffic_ind(ms, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> msgb_free(msg);</span><br><span> return 0;</span><br><span>@@ -895,7 +882,9 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Pull the L1CTL header from the msgb */</span><br><span> l1h = (struct l1ctl_hdr *) msg->l1h;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_pull(msg, sizeof(struct l1ctl_hdr));</span><br><span> </span><br><span> /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr,</span><br><span> as the l1ctl header is of no interest to subsequent code */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11215">change 11215</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/11215"/><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: Id64249f1b7a1c2be578263ba62aa195c452ab7e8 </div>
<div style="display:none"> Gerrit-Change-Number: 11215 </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>