cosmetic / linking: move str_to_imsi() out of abis_rsl.c

Move to gsm_04_08_utils.c so that it's possible to use it without
linking/stubbing all of RSL.

Change-Id: I6e90831d7e618ce3c8e7417082a82c97f6681668
changes/65/9665/1
Neels Hofmeyr 5 years ago
parent f0ff9a6711
commit d0d204aaa2
  1. 1
      include/osmocom/bsc/abis_rsl.h
  2. 2
      include/osmocom/bsc/gsm_04_08_utils.h
  3. 10
      src/osmo-bsc/abis_rsl.c
  4. 10
      src/osmo-bsc/gsm_04_08_utils.c
  5. 1
      src/osmo-bsc/paging.c
  6. 1
      src/osmo-bsc/pcu_sock.c

@ -68,7 +68,6 @@ int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act);
int abis_rsl_rcvmsg(struct msgb *msg);
uint64_t str_to_imsi(const char *imsi_str);
int rsl_release_request(struct gsm_lchan *lchan, uint8_t link_id,
enum rsl_rel_mode release_mode);

@ -39,3 +39,5 @@ static inline struct msgb *gsm48_msgb_alloc_name(const char *name)
return msgb_alloc_headroom(GSM48_ALLOC_SIZE, GSM48_ALLOC_HEADROOM,
name);
}
uint64_t str_to_imsi(const char *imsi_str);

@ -167,16 +167,6 @@ static struct gsm_lchan *lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
return lchan;
}
/* As per TS 03.03 Section 2.2, the IMSI has 'not more than 15 digits' */
uint64_t str_to_imsi(const char *imsi_str)
{
uint64_t ret;
ret = strtoull(imsi_str, NULL, 10);
return ret;
}
static struct msgb *rsl_msgb_alloc(void)
{
return msgb_alloc_headroom(RSL_ALLOC_SIZE, RSL_ALLOC_HEADROOM,

@ -703,3 +703,13 @@ int gsm48_paging_extract_mi(struct gsm48_pag_resp *resp, int length,
return gsm48_extract_mi(classmark2_lv, length - classmark_offset,
mi_string, mi_type);
}
/* As per TS 03.03 Section 2.2, the IMSI has 'not more than 15 digits' */
uint64_t str_to_imsi(const char *imsi_str)
{
uint64_t ret;
ret = strtoull(imsi_str, NULL, 10);
return ret;
}

@ -50,6 +50,7 @@
#include <osmocom/bsc/gsm_data.h>
#include <osmocom/bsc/chan_alloc.h>
#include <osmocom/bsc/bsc_api.h>
#include <osmocom/bsc/gsm_04_08_utils.h>
void *tall_paging_ctx = NULL;

@ -43,6 +43,7 @@
#include <osmocom/bsc/signal.h>
#include <osmocom/bsc/debug.h>
#include <osmocom/bsc/abis_rsl.h>
#include <osmocom/bsc/gsm_04_08_utils.h>
static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg);
uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx);

Loading…
Cancel
Save