diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-05-29 03:27:50 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2020-06-19 03:58:13 +0200 |
| commit | 46d526a3dff7527ba23fde1df3d6243e7edf6486 (patch) | |
| tree | 66b854917d1cf76870919ece2bc14015e569ab95 /include/osmocom | |
| parent | 20a6641a3f331b35be7b3743e5c31c68a28af9d0 (diff) | |
use new osmo_mobile_identity API everywhere
Depends: Ic3f969e739654c1e8c387aedeeba5cce07fe2307 (libosmocore)
Change-Id: Idfc8e576e10756aeaacf5569f6178068313eb7ea
Diffstat (limited to 'include/osmocom')
| -rw-r--r-- | include/osmocom/msc/gsm_04_08.h | 2 | ||||
| -rw-r--r-- | include/osmocom/msc/msub.h | 4 | ||||
| -rw-r--r-- | include/osmocom/msc/vlr.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/osmocom/msc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h index 661da42b3..bfc8027db 100644 --- a/include/osmocom/msc/gsm_04_08.h +++ b/include/osmocom/msc/gsm_04_08.h @@ -54,8 +54,6 @@ int decode_bcd_number(char *output, int output_len, const uint8_t *bcd_lv, int h_len); int send_siemens_mrpci(struct gsm_lchan *lchan, uint8_t *classmark2_lv); -int gsm48_extract_mi(uint8_t *classmark2, int length, char *mi_string, uint8_t *mi_type); -int gsm48_paging_extract_mi(struct gsm48_pag_resp *pag, int length, char *mi_string, uint8_t *mi_type); int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t lchan_mode); int gsm48_rx_rr_modif_ack(struct msgb *msg); diff --git a/include/osmocom/msc/msub.h b/include/osmocom/msc/msub.h index 2418febcf..14f3e76ce 100644 --- a/include/osmocom/msc/msub.h +++ b/include/osmocom/msc/msub.h @@ -1,5 +1,7 @@ #pragma once +#include <osmocom/gsm/gsm48.h> + #include <osmocom/msc/debug.h> #include <osmocom/msc/msc_roles.h> @@ -64,7 +66,7 @@ int _msub_role_dispatch(struct msub *msub, enum msc_role to_role, uint32_t to_ro const char *file, int line); int msub_tx_an_apdu(struct msub *msub, enum msc_role from_role, enum msc_role to_role, struct an_apdu *an_apdu); -void msub_update_id_from_mi(struct msub *msub, const uint8_t mi[], uint8_t mi_len); +void msub_update_id_from_mi(struct msub *msub, const struct osmo_mobile_identity *mi); void msub_update_id(struct msub *msub); void msub_update_id_for_vsub(struct vlr_subscr *for_vsub); diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 615c6c874..83f83c717 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -23,6 +23,7 @@ LOGP(DVLR, level, "SUBSCR(%s) " fmt, vlr_subscr_name(vsub), ## args) struct log_target; +struct osmo_mobile_identity; #define VLR_SUBSCRIBER_NO_EXPIRATION 0 #define VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL 60 /* in seconds */ @@ -302,7 +303,7 @@ void vlr_loc_update_cancel(struct osmo_fsm_inst *fi, /* tell the VLR that the RAN connection is gone */ int vlr_subscr_disconnected(struct vlr_subscr *vsub); bool vlr_subscr_expire(struct vlr_subscr *vsub); -int vlr_subscr_rx_id_resp(struct vlr_subscr *vsub, const uint8_t *mi, size_t mi_len); +int vlr_subscr_rx_id_resp(struct vlr_subscr *vsub, const struct osmo_mobile_identity *mi); int vlr_subscr_rx_auth_resp(struct vlr_subscr *vsub, bool is_r99, bool is_utran, const uint8_t *res, uint8_t res_len); int vlr_subscr_rx_auth_fail(struct vlr_subscr *vsub, const uint8_t *auts); @@ -440,7 +441,7 @@ vlr_proc_acc_req(struct osmo_fsm_inst *parent, void *parent_event_data, struct vlr_instance *vlr, void *msc_conn_ref, enum vlr_parq_type type, enum osmo_cm_service_type cm_service_type, - const uint8_t *mi_lv, + const struct osmo_mobile_identity *mi, const struct osmo_location_area_id *lai, bool authentication_required, bool ciphering_required, |