<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11915">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_04_11.c: refactor RP-DATA header validation<br><br>It's much better to have both RP-DATA header parsing and validation<br>code in a single function. There is no need to pass all the header<br>fields (DA, OA, UI) to gsm411_rx_rp_ud() because they are not<br>used there.<br><br>Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15<br>---<br>M src/libmsc/gsm_04_11.c<br>1 file changed, 18 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/11915/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index 4d43b57..14f9f57 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -587,27 +587,10 @@</span><br><span> </span><br><span> /* Receive a 04.11 TPDU inside RP-DATA / user data */</span><br><span> static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm411_rp_hdr *rph,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t src_len, uint8_t *src,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t dst_len, uint8_t *dst,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tpdu_len, uint8_t *tpdu)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm411_rp_hdr *rph)</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (src_len && src)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!dst_len || !dst || !tpdu_len || !tpdu) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLSMS, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "RP-DATA (MO) without DST or TPDU ?!?\n");</span><br><span style="color: hsl(0, 100%, 40%);">- gsm411_send_rp_error(trans, rph->msg_ref,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM411_RP_CAUSE_INV_MAND_INF);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l4h = tpdu;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> rc = gsm340_rx_tpdu(trans, msg, rph->msg_ref);</span><br><span> if (rc == 0)</span><br><span> return gsm411_send_rp_ack(trans, rph->msg_ref);</span><br><span>@@ -639,8 +622,23 @@</span><br><span> </span><br><span> DEBUGP(DLSMS, "RX_RP-DATA: src_len=%u, dst_len=%u ud_len=%u\n",</span><br><span> src_len, dst_len, rpud_len);</span><br><span style="color: hsl(0, 100%, 40%);">- return gsm411_rx_rp_ud(msg, trans, rph, src_len, src, dst_len, dst,</span><br><span style="color: hsl(0, 100%, 40%);">- rpud_len, rp_ud);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (src_len && src)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!dst_len || !dst || !rpud_len || !rp_ud) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "RP-DATA (MO) without DST or TPDU ?!?\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm411_send_rp_error(trans, rph->msg_ref,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM411_RP_CAUSE_INV_MAND_INF);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l4h = rp_ud;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm411_rx_rp_ud(msg, trans, rph);</span><br><span> }</span><br><span> </span><br><span> static struct gsm_sms *sms_report_alloc(struct gsm_sms *sms)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11915">change 11915</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/11915"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15 </div>
<div style="display:none"> Gerrit-Change-Number: 11915 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>