diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 04:35:50 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 22:44:23 +0100 |
commit | f41658d52e0ee26283d6f2c67d369473ab671ed9 (patch) | |
tree | 310ae0426d11d9920d58be31d41b56c4d8fb7e2b /include | |
parent | b0779bbcab69f4a42a9b8f522a3d2697cb9f44c7 (diff) |
rename gsm_encr to geran_encr, it is only applicable on GERAN
On UTRAN, Security Mode is used instead of Ciphering Command, which does not
feature an A5 algorithm id.
Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820
Diffstat (limited to 'include')
-rw-r--r-- | include/osmocom/msc/common_cs.h | 2 | ||||
-rw-r--r-- | include/osmocom/msc/gsm_data.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h index fddc6ece1..410f1022a 100644 --- a/include/osmocom/msc/common_cs.h +++ b/include/osmocom/msc/common_cs.h @@ -9,7 +9,7 @@ typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); #define MAX_A5_KEY_LEN (128/8) -struct gsm_encr { +struct geran_encr { uint8_t alg_id; uint8_t key_len; uint8_t key[MAX_A5_KEY_LEN]; diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 94a6ffdc9..864bc0ab9 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -125,7 +125,7 @@ struct gsm_subscriber_connection { enum ran_type via_ran; uint16_t lac; - struct gsm_encr encr; + struct geran_encr geran_encr; /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still * wants to request a Classmark Update first. */ |