<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14188">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use GSM23003_MSISDN_MAX_DIGITS from libosmogsm<br><br>Change-Id: If9eb46b83b6ad45f210b86b46dd416352adcc3ff<br>Depends on: Idc74f4d94ad44b9fc1b6d43178f5f33d551ebfb1<br>---<br>M include/osmocom/msc/vlr.h<br>M src/libmsc/msc_t.c<br>M src/libmsc/sms_queue.c<br>M tests/sms_queue/sms_queue_test.c<br>4 files changed, 5 insertions(+), 6 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/88/14188/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index b1c0d5d..56314b7 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -113,7 +113,6 @@</span><br><span> struct vlr_instance;</span><br><span> </span><br><span> #define VLR_NAME_LENGTH 160</span><br><span style="color: hsl(0, 100%, 40%);">-#define VLR_MSISDN_LENGTH 15</span><br><span> </span><br><span> /* The VLR subscriber is the part of the GSM subscriber state in VLR (CS) or</span><br><span> * SGSN (PS), particularly while interacting with the HLR via GSUP */</span><br><span>@@ -127,7 +126,7 @@</span><br><span> /* Data from HLR */ /* 3GPP TS 23.008 */</span><br><span> /* Always use vlr_subscr_set_imsi() to write to imsi[] */</span><br><span> char imsi[GSM23003_IMSI_MAX_DIGITS+1]; /* 2.1.1.1 */</span><br><span style="color: hsl(0, 100%, 40%);">- char msisdn[VLR_MSISDN_LENGTH+1]; /* 2.1.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ char msisdn[GSM23003_MSISDN_MAX_DIGITS+1]; /* 2.1.2 */</span><br><span> char name[VLR_NAME_LENGTH+1]; /* proprietary */</span><br><span> OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */</span><br><span> uint32_t periodic_lu_timer; /* 2.4.24 */</span><br><span>diff --git a/src/libmsc/msc_t.c b/src/libmsc/msc_t.c</span><br><span>index 8eefccc..6b96c26 100644</span><br><span>--- a/src/libmsc/msc_t.c</span><br><span>+++ b/src/libmsc/msc_t.c</span><br><span>@@ -75,7 +75,7 @@</span><br><span> int rc;</span><br><span> uint64_t started_at;</span><br><span> uint64_t ho_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- char ho_nr_str[VLR_MSISDN_LENGTH+1];</span><br><span style="color: hsl(120, 100%, 40%);">+ char ho_nr_str[GSM23003_MSISDN_MAX_DIGITS+1];</span><br><span> struct gsm_network *net = msc_t_net(msc_t);</span><br><span> bool usable = false;</span><br><span> </span><br><span>@@ -417,7 +417,7 @@</span><br><span> struct rtp_stream *rtp_cn = msc_t->inter_msc.call_leg? msc_t->inter_msc.call_leg->rtp[RTP_TO_CN] : NULL;</span><br><span> /* Since it's BCD, it needs rounded-up half the char* length of an MSISDN plus a type byte.</span><br><span> * But no need to introduce obscure math to save a few stack bytes, just have more. */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t msisdn_enc_buf[VLR_MSISDN_LENGTH + 1];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t msisdn_enc_buf[GSM23003_MSISDN_MAX_DIGITS+1];</span><br><span> /* Copy an_apdu and an_apdu->e_info in "copy-on-write" method, because they are const and we</span><br><span> * need to add the Handover Number to e_info. */</span><br><span> const struct ran_handover_request_ack *r = &ran_dec->handover_request_ack;</span><br><span>diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c</span><br><span>index 2c380b2..6346c1d 100644</span><br><span>--- a/src/libmsc/sms_queue.c</span><br><span>+++ b/src/libmsc/sms_queue.c</span><br><span>@@ -66,7 +66,7 @@</span><br><span> </span><br><span> struct llist_head pending_sms;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- char last_msisdn[VLR_MSISDN_LENGTH+1];</span><br><span style="color: hsl(120, 100%, 40%);">+ char last_msisdn[GSM23003_MSISDN_MAX_DIGITS+1];</span><br><span> };</span><br><span> </span><br><span> static int sms_subscr_cb(unsigned int, unsigned int, void *, void *);</span><br><span>diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c</span><br><span>index 25fc312..4918be2 100644</span><br><span>--- a/tests/sms_queue/sms_queue_test.c</span><br><span>+++ b/tests/sms_queue/sms_queue_test.c</span><br><span>@@ -158,7 +158,7 @@</span><br><span> static void test_next_sms()</span><br><span> {</span><br><span> int i;</span><br><span style="color: hsl(0, 100%, 40%);">- char last_msisdn[VLR_MSISDN_LENGTH+1] = "";</span><br><span style="color: hsl(120, 100%, 40%);">+ char last_msisdn[GSM23003_MSISDN_MAX_DIGITS+1] = "";</span><br><span> </span><br><span> printf("Testing smsq_take_next_sms()\n");</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14188">change 14188</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/14188"/><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: If9eb46b83b6ad45f210b86b46dd416352adcc3ff </div>
<div style="display:none"> Gerrit-Change-Number: 14188 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>