diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 02:57:33 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 22:46:15 +0100 |
| commit | 8b6e536007815a0337fbae70917702c8e06b4bb5 (patch) | |
| tree | 90e2d7cba504d7c60b29874e0ec17def5a20f823 /include | |
| parent | df6d2e3838f9f47e36541fdfa7b88c6fdb0c8e6f (diff) | |
move gsm_auth_tuple to vlr.h as vlr_auth_tuple
Along goes GSM_KEYSEQ_INVAL as VLR_*.
It's where it logically belongs, and is almost the only reason why vlr.h
includes gsm_data.h. The remaining reason, GSM_EXTENSION_LENGTH, will be moved
by upcoming patch.
Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/msc/gsm_data.h | 7 | ||||
| -rw-r--r-- | include/osmocom/msc/vlr.h | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 3ffa100a2..30a3c795b 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -42,13 +42,6 @@ typedef int gsm_cbfn(unsigned int hooknum, struct msgb *msg, void *data, void *param); -struct gsm_auth_tuple { - int use_count; - int key_seq; - struct osmo_auth_vector vec; -}; -#define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ - enum { MSC_CTR_LOC_UPDATE_TYPE_ATTACH, MSC_CTR_LOC_UPDATE_TYPE_NORMAL, diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 1168c3242..1865618b7 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -77,6 +77,14 @@ enum vlr_ciph_result_cause { VLR_CIPH_COMPL, }; +struct vlr_auth_tuple { + int use_count; + int key_seq; + struct osmo_auth_vector vec; +}; +#define VLR_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ + + struct vlr_ciph_result { enum vlr_ciph_result_cause cause; char imeisv[GSM48_MI_SIZE]; @@ -122,8 +130,8 @@ struct vlr_subscr { uint32_t age_indicator; /* 2.17.1 */ /* Authentication Data */ - struct gsm_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */ - struct gsm_auth_tuple *last_tuple; + struct vlr_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */ + struct vlr_auth_tuple *last_tuple; enum vlr_subscr_security_context sec_ctx; /* Data local to VLR is below */ @@ -205,7 +213,7 @@ struct vlr_ops { * \param[in] at auth tuple providing rand, key_seq and autn. * \param[in] send_autn True to send AUTN, for r99 UMTS auth. */ - int (*tx_auth_req)(void *msc_conn_ref, struct gsm_auth_tuple *at, + int (*tx_auth_req)(void *msc_conn_ref, struct vlr_auth_tuple *at, bool send_autn); /* encode + transmit an AUTH REJECT towards the MS */ int (*tx_auth_rej)(void *msc_conn_ref); |