<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12016">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drop unused ran_conn->encr<br><br>The ran_conn->encr is never used. Drop completely.<br>Drop the definition of struct gsm_encr from common_cs.h.<br>Do not print the encr.alg_id in vty_dump_one_conn(), it always was zero anyway.<br><br>Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce<br>---<br>M include/osmocom/msc/common_cs.h<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/msc_vty.c<br>3 files changed, 1 insertion(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/12016/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h</span><br><span>index fddc6ec..14fe618 100644</span><br><span>--- a/include/osmocom/msc/common_cs.h</span><br><span>+++ b/include/osmocom/msc/common_cs.h</span><br><span>@@ -1,18 +1,8 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct msgb;</span><br><span> struct gsm_network;</span><br><span> </span><br><span> typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define MAX_A5_KEY_LEN  (128/8)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_encr {</span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t alg_id;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t key_len;</span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t key[MAX_A5_KEY_LEN];</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);</span><br><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 5c167e1..4a829bd 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -125,7 +125,6 @@</span><br><span>      enum ran_type via_ran;</span><br><span> </span><br><span>   uint16_t lac;</span><br><span style="color: hsl(0, 100%, 40%);">-   struct gsm_encr encr;</span><br><span> </span><br><span>    /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still</span><br><span>        * wants to request a Classmark Update first. */</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 9c82713..ba042e5 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -491,7 +491,7 @@</span><br><span> </span><br><span> static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s",</span><br><span style="color: hsl(120, 100%, 40%);">+  vty_out(vty, "%08x %22s %3s %5u %3u %08x %c %27s %s",</span><br><span>              conn->a.conn_id,</span><br><span>          conn->vsub ? vlr_subscr_name(conn->vsub) : "-",</span><br><span>              conn->via_ran == RAN_UTRAN_IU ? "Iu" : "A",</span><br><span>@@ -499,7 +499,6 @@</span><br><span>             conn->use_count,</span><br><span>          conn->use_tokens,</span><br><span>                 conn->received_cm_service_request ? 'C' : '-',</span><br><span style="color: hsl(0, 100%, 40%);">-               conn->encr.alg_id,</span><br><span>                conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-",</span><br><span>                 VTY_NEWLINE);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12016">change 12016</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12016"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce </div>
<div style="display:none"> Gerrit-Change-Number: 12016 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>