Use GSM23003_MSISDN_MAX_DIGITS from libosmogsm
Change-Id: If9eb46b83b6ad45f210b86b46dd416352adcc3ff Depends on: Idc74f4d94ad44b9fc1b6d43178f5f33d551ebfb1
This commit is contained in:
parent
483cea889c
commit
8b0737fa71
|
@ -113,7 +113,6 @@ struct sgsn_mm_ctx;
|
||||||
struct vlr_instance;
|
struct vlr_instance;
|
||||||
|
|
||||||
#define VLR_NAME_LENGTH 160
|
#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
|
/* 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 */
|
* SGSN (PS), particularly while interacting with the HLR via GSUP */
|
||||||
|
@ -127,7 +126,7 @@ struct vlr_subscr {
|
||||||
/* Data from HLR */ /* 3GPP TS 23.008 */
|
/* Data from HLR */ /* 3GPP TS 23.008 */
|
||||||
/* Always use vlr_subscr_set_imsi() to write to imsi[] */
|
/* Always use vlr_subscr_set_imsi() to write to imsi[] */
|
||||||
char imsi[GSM23003_IMSI_MAX_DIGITS+1]; /* 2.1.1.1 */
|
char imsi[GSM23003_IMSI_MAX_DIGITS+1]; /* 2.1.1.1 */
|
||||||
char msisdn[VLR_MSISDN_LENGTH+1]; /* 2.1.2 */
|
char msisdn[GSM23003_MSISDN_MAX_DIGITS+1]; /* 2.1.2 */
|
||||||
char name[VLR_NAME_LENGTH+1]; /* proprietary */
|
char name[VLR_NAME_LENGTH+1]; /* proprietary */
|
||||||
OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */
|
OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */
|
||||||
uint32_t periodic_lu_timer; /* 2.4.24 */
|
uint32_t periodic_lu_timer; /* 2.4.24 */
|
||||||
|
|
|
@ -75,7 +75,7 @@ static int msc_t_assign_handover_number(struct msc_t *msc_t)
|
||||||
int rc;
|
int rc;
|
||||||
uint64_t started_at;
|
uint64_t started_at;
|
||||||
uint64_t ho_nr;
|
uint64_t ho_nr;
|
||||||
char ho_nr_str[VLR_MSISDN_LENGTH+1];
|
char ho_nr_str[GSM23003_MSISDN_MAX_DIGITS+1];
|
||||||
struct gsm_network *net = msc_t_net(msc_t);
|
struct gsm_network *net = msc_t_net(msc_t);
|
||||||
bool usable = false;
|
bool usable = false;
|
||||||
|
|
||||||
|
@ -417,7 +417,7 @@ static int msc_t_patch_and_send_ho_request_ack(struct msc_t *msc_t, const struct
|
||||||
struct rtp_stream *rtp_cn = msc_t->inter_msc.call_leg? msc_t->inter_msc.call_leg->rtp[RTP_TO_CN] : NULL;
|
struct rtp_stream *rtp_cn = msc_t->inter_msc.call_leg? msc_t->inter_msc.call_leg->rtp[RTP_TO_CN] : NULL;
|
||||||
/* Since it's BCD, it needs rounded-up half the char* length of an MSISDN plus a type byte.
|
/* Since it's BCD, it needs rounded-up half the char* length of an MSISDN plus a type byte.
|
||||||
* But no need to introduce obscure math to save a few stack bytes, just have more. */
|
* But no need to introduce obscure math to save a few stack bytes, just have more. */
|
||||||
uint8_t msisdn_enc_buf[VLR_MSISDN_LENGTH + 1];
|
uint8_t msisdn_enc_buf[GSM23003_MSISDN_MAX_DIGITS+1];
|
||||||
/* Copy an_apdu and an_apdu->e_info in "copy-on-write" method, because they are const and we
|
/* Copy an_apdu and an_apdu->e_info in "copy-on-write" method, because they are const and we
|
||||||
* need to add the Handover Number to e_info. */
|
* need to add the Handover Number to e_info. */
|
||||||
const struct ran_handover_request_ack *r = &ran_dec->handover_request_ack;
|
const struct ran_handover_request_ack *r = &ran_dec->handover_request_ack;
|
||||||
|
|
|
@ -66,7 +66,7 @@ struct gsm_sms_queue {
|
||||||
|
|
||||||
struct llist_head pending_sms;
|
struct llist_head pending_sms;
|
||||||
|
|
||||||
char last_msisdn[VLR_MSISDN_LENGTH+1];
|
char last_msisdn[GSM23003_MSISDN_MAX_DIGITS+1];
|
||||||
};
|
};
|
||||||
|
|
||||||
static int sms_subscr_cb(unsigned int, unsigned int, void *, void *);
|
static int sms_subscr_cb(unsigned int, unsigned int, void *, void *);
|
||||||
|
|
|
@ -158,7 +158,7 @@ void show_fake_sms_db()
|
||||||
static void test_next_sms()
|
static void test_next_sms()
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
char last_msisdn[VLR_MSISDN_LENGTH+1] = "";
|
char last_msisdn[GSM23003_MSISDN_MAX_DIGITS+1] = "";
|
||||||
|
|
||||||
printf("Testing smsq_take_next_sms()\n");
|
printf("Testing smsq_take_next_sms()\n");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue