Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12039


Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN
......................................................................

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
---
M include/osmocom/msc/common_cs.h
M include/osmocom/msc/gsm_data.h
2 files changed, 2 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/12039/1

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..1231327 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 encr;
 
 	/* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still
 	 * wants to request a Classmark Update first. */

-- 
To view, visit https://gerrit.osmocom.org/12039
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820
Gerrit-Change-Number: 12039
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181130/39fdd3f7/attachment.htm>