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
diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h
index fddc6ec..410f102 100644
--- a/include/osmocom/msc/common_cs.h
+++ b/include/osmocom/msc/common_cs.h
@@ -9,7 +9,7 @@
#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 94a6ffd..864bc0a 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -125,7 +125,7 @@
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. */
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 7dd303f..6569a9a 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -1663,12 +1663,12 @@
memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc));
ei.key_len = sizeof(tuple->vec.kc);
- conn->encr = (struct gsm_encr){};
- if (ei.key_len <= sizeof(conn->encr.key)) {
- memcpy(conn->encr.key, ei.key, ei.key_len);
- conn->encr.key_len = ei.key_len;
+ conn->geran_encr = (struct geran_encr){};
+ if (ei.key_len <= sizeof(conn->geran_encr.key)) {
+ memcpy(conn->geran_encr.key, ei.key, ei.key_len);
+ conn->geran_encr.key_len = ei.key_len;
}
- /* conn->encr.alg_id remains unknown until we receive a Cipher Mode Complete from the BSC */
+ /* conn->geran_encr.alg_id remains unknown until we receive a Cipher Mode Complete from the BSC */
return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv);
}
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 4f3ac04..401586e 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -499,7 +499,7 @@
conn->use_count,
conn->use_tokens,
conn->received_cm_service_request ? 'C' : '-',
- conn->encr.alg_id,
+ conn->geran_encr.alg_id,
conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-",
VTY_NEWLINE);
}
diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
index e3d7055..88a3dbb 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -222,7 +222,7 @@
}
}
- conn->encr.alg_id = alg_id;
+ conn->geran_encr.alg_id = alg_id;
ciph_res.cause = VLR_CIPH_COMPL;
vlr_subscr_rx_ciph_res(conn->vsub, &ciph_res);