Change in osmo-msc[master]: drop unused ran_conn->encr

[Neels Hofmeyr]

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


Change subject: drop unused ran_conn->encr
......................................................................

drop unused ran_conn->encr

The ran_conn->encr is never used. Drop completely.
Drop the definition of struct gsm_encr from common_cs.h.
Do not print the encr.alg_id in vty_dump_one_conn(), it always was zero anyway.

Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce
---
M include/osmocom/msc/common_cs.h
M include/osmocom/msc/gsm_data.h
M src/libmsc/msc_vty.c
3 files changed, 1 insertion(+), 13 deletions(-)



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

diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h
index fddc6ec..14fe618 100644
--- a/include/osmocom/msc/common_cs.h
+++ b/include/osmocom/msc/common_cs.h
@@ -1,18 +1,8 @@
 #pragma once
 
-#include <stdint.h>
-
 struct msgb;
 struct gsm_network;
 
 typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
 
-#define MAX_A5_KEY_LEN	(128/8)
-
-struct gsm_encr {
-	uint8_t alg_id;
-	uint8_t key_len;
-	uint8_t key[MAX_A5_KEY_LEN];
-};
-
 struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 5c167e1..4a829bd 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -125,7 +125,6 @@
 	enum ran_type via_ran;
 
 	uint16_t lac;
-	struct gsm_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. */
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 9c82713..ba042e5 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -491,7 +491,7 @@
 
 static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn)
 {
-	vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s",
+	vty_out(vty, "%08x %22s %3s %5u %3u %08x %c %27s %s",
 		conn->a.conn_id,
 		conn->vsub ? vlr_subscr_name(conn->vsub) : "-",
 		conn->via_ran == RAN_UTRAN_IU ? "Iu" : "A",
@@ -499,7 +499,6 @@
 		conn->use_count,
 		conn->use_tokens,
 		conn->received_cm_service_request ? 'C' : '-',
-		conn->encr.alg_id,
 		conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-",
 		VTY_NEWLINE);
 }

-- 
To view, visit https://gerrit.osmocom.org/12016
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: Ice2c470c360612249f97301944c6fdf9443c7dce
Gerrit-Change-Number: 12016
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/20181129/fb7c8ca8/attachment.htm>