diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-05-26 03:33:24 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2020-06-16 14:56:57 +0200 |
| commit | 2c61245935ed997ad64a9a50a5b76e9a026e2a28 (patch) | |
| tree | b5f4a537fd82dcad700f960cbcd3a4f4575fcef9 /include | |
| parent | 83bba52b5c05a7a387675a48309b2a14eeafb188 (diff) | |
remove extract_sub(), add bsc_subscr_find_or_create_by_mi()
Use the new osmo_mobile_identity API to shed some code dup and simplify.
gsm48_paging_extract_mi() is now unused, drop.
(More refactoring to use osmo_mobile_identity follows in subsequent patch.)
Depends: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 (libosmocore)
Change-Id: Id6cccaac64392b737b3bba8f3a22a88009adb23b
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/bsc/bsc_subscriber.h | 3 | ||||
| -rw-r--r-- | include/osmocom/bsc/gsm_04_08_rr.h | 2 | ||||
| -rw-r--r-- | include/osmocom/bsc/gsm_data.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index 93b353935..53fa7be5c 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -6,6 +6,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/protocol/gsm_23_003.h> +#include <osmocom/gsm/gsm48.h> struct log_target; @@ -25,11 +26,13 @@ struct bsc_subscr *bsc_subscr_find_or_create_by_imsi(struct llist_head *list, const char *imsi); struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, uint32_t tmsi); +struct bsc_subscr *bsc_subscr_find_or_create_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi); struct bsc_subscr *bsc_subscr_find_by_imsi(struct llist_head *list, const char *imsi); struct bsc_subscr *bsc_subscr_find_by_tmsi(struct llist_head *list, uint32_t tmsi); +struct bsc_subscr *bsc_subscr_find_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi); void bsc_subscr_set_imsi(struct bsc_subscr *bsub, const char *imsi); diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 06cefa9de..d34e69559 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -40,8 +40,6 @@ int gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn, struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value); int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_t *mi_type); -int gsm48_paging_extract_mi(struct gsm48_pag_resp *resp, int length, - char *mi_string, uint8_t *mi_type); struct msgb *gsm48_create_loc_upd_rej(uint8_t cause); struct msgb *gsm48_create_rr_status(uint8_t cause); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index be7c57540..bc4c01771 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -52,8 +52,6 @@ struct handover; #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] -#define tmsi_from_string(str) strtoul(str, NULL, 10) - /* 3-bit long values */ #define EARFCN_PRIO_INVALID 8 #define EARFCN_MEAS_BW_INVALID 8 |