<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12036">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH<br><br>gsm_subscriber.h contains some legacy cruft, part of which is that the VLR's<br>max MSISDN length should rather be defined in vlr.h. Same for GSM_NAME_LENGTH<br>-> VLR_NAME_LENGTH.<br><br>Adjust some sms_queue stuff that anyway includes vlr.h already.<br><br>Drop gsm_subscriber.h from vlr.h.<br><br>Add other (more concise) includes that thus become necessary, since the include<br>chain vlr.h->gsm_subscriber.h->gsm_data.h is no longer in place.<br><br>Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8<br>---<br>M include/osmocom/msc/gsm_subscriber.h<br>M include/osmocom/msc/vlr.h<br>M src/libmsc/sms_queue.c<br>M tests/sms_queue/sms_queue_test.c<br>4 files changed, 9 insertions(+), 9 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/36/12036/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h</span><br><span>index 428b889..00d7b98 100644</span><br><span>--- a/include/osmocom/msc/gsm_subscriber.h</span><br><span>+++ b/include/osmocom/msc/gsm_subscriber.h</span><br><span>@@ -10,9 +10,6 @@</span><br><span> </span><br><span> struct ran_conn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define GSM_NAME_LENGTH 160</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define GSM_EXTENSION_LENGTH 15 /* MSISDN can only be 15 digits length */</span><br><span> #define GSM_MIN_EXTEN 20000</span><br><span> #define GSM_MAX_EXTEN 49999</span><br><span> </span><br><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index 1865618..c0e4864 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -10,8 +10,7 @@</span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span> #include <osmocom/gsm/gsup.h></span><br><span> #include <osmocom/msc/ran_conn.h></span><br><span style="color: hsl(0, 100%, 40%);">-// for GSM_NAME_LENGTH</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/msc/gsm_subscriber.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/msc_common.h></span><br><span> #include <osmocom/gsupclient/gsup_client.h></span><br><span> </span><br><span> #define LOGGSUPP(level, gsup, fmt, args...) \</span><br><span>@@ -111,6 +110,9 @@</span><br><span> struct sgsn_mm_ctx;</span><br><span> struct vlr_instance;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define VLR_NAME_LENGTH 160</span><br><span style="color: hsl(120, 100%, 40%);">+#define VLR_MSISDN_LENGTH 15</span><br><span style="color: hsl(120, 100%, 40%);">+</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> struct vlr_subscr {</span><br><span>@@ -123,8 +125,8 @@</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[GSM_EXTENSION_LENGTH+1]; /* 2.1.2 */</span><br><span style="color: hsl(0, 100%, 40%);">- char name[GSM_NAME_LENGTH+1]; /* proprietary */</span><br><span style="color: hsl(120, 100%, 40%);">+ char msisdn[VLR_MSISDN_LENGTH+1]; /* 2.1.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> uint32_t age_indicator; /* 2.17.1 */</span><br><span>diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c</span><br><span>index fd38d50..c7fe5f4 100644</span><br><span>--- a/src/libmsc/sms_queue.c</span><br><span>+++ b/src/libmsc/sms_queue.c</span><br><span>@@ -64,7 +64,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[GSM_EXTENSION_LENGTH+1];</span><br><span style="color: hsl(120, 100%, 40%);">+ char last_msisdn[VLR_MSISDN_LENGTH+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 e9443e0..b31824b 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>@@ -24,6 +24,7 @@</span><br><span> #include <osmocom/core/application.h></span><br><span> </span><br><span> #include <osmocom/msc/vlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/gsm_data.h></span><br><span> </span><br><span> static void *talloc_ctx = NULL;</span><br><span> </span><br><span>@@ -128,7 +129,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[GSM_EXTENSION_LENGTH+1] = "";</span><br><span style="color: hsl(120, 100%, 40%);">+ char last_msisdn[VLR_MSISDN_LENGTH+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/12036">change 12036</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/12036"/><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: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 </div>
<div style="display:none"> Gerrit-Change-Number: 12036 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>