<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16655">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_04_11_gsup.c: fix SM-RP-OA encoding for MO SMS over GSUP<br><br>We shall not include additional BCD length octet into the value part<br>of SM-RP-OA (Originating Address) IE. Instead, there should be<br>ToA/NPI header (1 octet).<br><br>Since we do not get ToN/NPI fields from the VLR/HLR, let's assume<br>the following default values:<br><br> 1... .... = Extension: No extension<br> .001 .... = Type of number: International (1)<br> .... 0001 = Numbering plan: ISDN/telephone (E.164/E.163) (1)<br><br>Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d<br>TTCN-3 test case: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9<br>Related: OS#4324<br>---<br>M src/libmsc/gsm_04_11_gsup.c<br>1 file changed, 13 insertions(+), 7 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/55/16655/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c</span><br><span>index 2abfc92..88c303e 100644</span><br><span>--- a/src/libmsc/gsm_04_11_gsup.c</span><br><span>+++ b/src/libmsc/gsm_04_11_gsup.c</span><br><span>@@ -1,5 +1,5 @@</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -53,7 +53,7 @@</span><br><span> int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg,</span><br><span> uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bcd_buf[GSM48_MI_SIZE] = { 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bcd_buf[GSM48_MI_SIZE];</span><br><span> struct osmo_gsup_message gsup_msg;</span><br><span> size_t bcd_len;</span><br><span> </span><br><span>@@ -65,22 +65,28 @@</span><br><span> /* Assign SM-RP-MR to transaction state */</span><br><span> trans->sms.sm_rp_mr = sm_rp_mr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Encode subscriber's MSISDN */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Encode subscriber's MSISDN as LHV */</span><br><span> bcd_len = gsm48_encode_bcd_number(bcd_buf, sizeof(bcd_buf),</span><br><span style="color: hsl(0, 100%, 40%);">- 0, trans->vsub->msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+ 1, trans->vsub->msisdn);</span><br><span> if (bcd_len <= 0 || bcd_len > sizeof(bcd_buf)) {</span><br><span> LOG_TRANS(trans, LOGL_ERROR, "Failed to encode subscriber's MSISDN\n");</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOTE: assuming default ToN/NPI values as we don't have this info */</span><br><span style="color: hsl(120, 100%, 40%);">+ bcd_buf[1] = 0x01 /* NPI: ISDN/Telephony Numbering (ITU-T Rec. E.164 / ITU-T Rec. E.163) */</span><br><span style="color: hsl(120, 100%, 40%);">+ | (0x01 << 4) /* ToN: International Number */</span><br><span style="color: hsl(120, 100%, 40%);">+ | (0x01 << 7); /* No Extension */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Initialize a new GSUP message */</span><br><span> gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST,</span><br><span> trans->vsub->imsi, &sm_rp_mr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* According to 12.2.3, the MSISDN from VLR is inserted here */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* According to 12.2.3, the MSISDN from VLR is inserted here.</span><br><span style="color: hsl(120, 100%, 40%);">+ * NOTE: redundant BCD length octet is not included. */</span><br><span> gsup_msg.sm_rp_oa_type = OSMO_GSUP_SMS_SM_RP_ODA_MSISDN;</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_msg.sm_rp_oa_len = bcd_len;</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_msg.sm_rp_oa = bcd_buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_oa_len = bcd_len - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_oa = bcd_buf + 1;</span><br><span> </span><br><span> /* SM-RP-DA should (already) contain SMSC address */</span><br><span> gsup_msg.sm_rp_da_type = OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16655">change 16655</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/osmo-msc/+/16655"/><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-Change-Id: I0f32e2af0ed2d2fea6addf45efbdfee120c2425d </div>
<div style="display:none"> Gerrit-Change-Number: 16655 </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>