GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH

gsm_subscriber.h contains some legacy cruft, part of which is that the VLR's
max MSISDN length should rather be defined in vlr.h. Same for GSM_NAME_LENGTH
-> VLR_NAME_LENGTH.

Adjust some sms_queue stuff that anyway includes vlr.h already.

Drop gsm_subscriber.h from vlr.h.

Add other (more concise) includes that thus become necessary, since the include
chain vlr.h->gsm_subscriber.h->gsm_data.h is no longer in place.

Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8
changes/36/12036/7
Neels Hofmeyr 4 years ago
parent 8b6e536007
commit 7b61ffe69b
  1. 3
      include/osmocom/msc/gsm_subscriber.h
  2. 10
      include/osmocom/msc/vlr.h
  3. 2
      src/libmsc/sms_queue.c
  4. 3
      tests/sms_queue/sms_queue_test.c

@ -10,9 +10,6 @@
struct ran_conn;
#define GSM_NAME_LENGTH 160
#define GSM_EXTENSION_LENGTH 15 /* MSISDN can only be 15 digits length */
#define GSM_MIN_EXTEN 20000
#define GSM_MAX_EXTEN 49999

@ -10,8 +10,7 @@
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/gsm/gsup.h>
#include <osmocom/msc/ran_conn.h>
// for GSM_NAME_LENGTH
#include <osmocom/msc/gsm_subscriber.h>
#include <osmocom/msc/msc_common.h>
#include <osmocom/gsupclient/gsup_client.h>
#define LOGGSUPP(level, gsup, fmt, args...) \
@ -111,6 +110,9 @@ enum vlr_lu_type {
struct sgsn_mm_ctx;
struct vlr_instance;
#define VLR_NAME_LENGTH 160
#define VLR_MSISDN_LENGTH 15
/* The VLR subscriber is the part of the GSM subscriber state in VLR (CS) or
* SGSN (PS), particularly while interacting with the HLR via GSUP */
struct vlr_subscr {
@ -123,8 +125,8 @@ struct vlr_subscr {
/* Data from HLR */ /* 3GPP TS 23.008 */
/* Always use vlr_subscr_set_imsi() to write to imsi[] */
char imsi[GSM23003_IMSI_MAX_DIGITS+1]; /* 2.1.1.1 */
char msisdn[GSM_EXTENSION_LENGTH+1]; /* 2.1.2 */
char name[GSM_NAME_LENGTH+1]; /* proprietary */
char msisdn[VLR_MSISDN_LENGTH+1]; /* 2.1.2 */
char name[VLR_NAME_LENGTH+1]; /* proprietary */
OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */
uint32_t periodic_lu_timer; /* 2.4.24 */
uint32_t age_indicator; /* 2.17.1 */

@ -65,7 +65,7 @@ struct gsm_sms_queue {
struct llist_head pending_sms;
char last_msisdn[GSM_EXTENSION_LENGTH+1];
char last_msisdn[VLR_MSISDN_LENGTH+1];
};
static int sms_subscr_cb(unsigned int, unsigned int, void *, void *);

@ -25,6 +25,7 @@
#include <osmocom/msc/debug.h>
#include <osmocom/msc/vlr.h>
#include <osmocom/msc/gsm_data.h>
static void *talloc_ctx = NULL;
@ -129,7 +130,7 @@ void show_fake_sms_db()
static void test_next_sms()
{
int i;
char last_msisdn[GSM_EXTENSION_LENGTH+1] = "";
char last_msisdn[VLR_MSISDN_LENGTH+1] = "";
printf("Testing smsq_take_next_sms()\n");

Loading…
Cancel
Save