<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/26108">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_04_08: refactor require ciphering into an own function<br><br>Make it more readable.<br><br>Change-Id: I9e407f65b282e645feabe714f7f4c3e44fae21e9<br>---<br>M include/osmocom/msc/gsm_data.h<br>M include/osmocom/msc/msc_a.h<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/msc_a.c<br>4 files changed, 16 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 2a64c53..34d42db 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -13,6 +13,7 @@</span><br><span> #include <osmocom/core/stat_item.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> #include <osmocom/crypt/auth.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/crypt/utran_cipher.h></span><br><span> </span><br><span> #include <osmocom/mgcp_client/mgcp_client.h></span><br><span> </span><br><span>diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h</span><br><span>index 18973f9..f94420a 100644</span><br><span>--- a/include/osmocom/msc/msc_a.h</span><br><span>+++ b/include/osmocom/msc/msc_a.h</span><br><span>@@ -180,6 +180,7 @@</span><br><span> void msc_a_pending_cm_service_req_add(struct msc_a *msc_a, enum osmo_cm_service_type type);</span><br><span> unsigned int msc_a_pending_cm_service_req_count(struct msc_a *msc_a, enum osmo_cm_service_type type);</span><br><span> void msc_a_pending_cm_service_req_del(struct msc_a *msc_a, enum osmo_cm_service_type type);</span><br><span style="color: hsl(120, 100%, 40%);">+bool msc_a_require_ciphering(const struct msc_a *msc_a);</span><br><span> </span><br><span> #define msc_a_ran_down(A,B,C) \</span><br><span> _msc_a_ran_down(A,B,C, __FILE__, __LINE__)</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 075ef0f..b5d46fd 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -415,7 +415,7 @@</span><br><span> net->vlr, msc_a, vlr_lu_type, tmsi, imsi,</span><br><span> &old_lai, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_a_require_ciphering(msc_a),</span><br><span> lu->key_seq,</span><br><span> osmo_gsm48_classmark1_is_r99(&lu->classmark1),</span><br><span> is_utran,</span><br><span>@@ -806,7 +806,7 @@</span><br><span> req->cm_service_type,</span><br><span> &mi, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_a_require_ciphering(msc_a),</span><br><span> req->cipher_key_seq,</span><br><span> osmo_gsm48_classmark2_is_r99(cm2, cm2_len),</span><br><span> is_utran);</span><br><span>@@ -932,7 +932,7 @@</span><br><span> VLR_PR_ARQ_T_CM_RE_ESTABLISH_REQ, 0,</span><br><span> &mi, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_a_require_ciphering(msc_a),</span><br><span> req->cipher_key_seq,</span><br><span> osmo_gsm48_classmark2_is_r99(cm2, cm2_len),</span><br><span> is_utran);</span><br><span>@@ -1294,7 +1294,7 @@</span><br><span> net->vlr, msc_a,</span><br><span> VLR_PR_ARQ_T_PAGING_RESP, 0, &mi, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_a_require_ciphering(msc_a),</span><br><span> pr->key_seq,</span><br><span> osmo_gsm48_classmark2_is_r99(cm2, classmark2_len),</span><br><span> is_utran);</span><br><span>diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c</span><br><span>index 583f9e7..74721d2 100644</span><br><span>--- a/src/libmsc/msc_a.c</span><br><span>+++ b/src/libmsc/msc_a.c</span><br><span>@@ -106,6 +106,16 @@</span><br><span> return fi->priv;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+bool msc_a_require_ciphering(const struct msc_a *msc_a)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = msc_a_net(msc_a);</span><br><span style="color: hsl(120, 100%, 40%);">+ bool is_utran = (msc_a->c.ran->type == OSMO_RAT_UTRAN_IU);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_utran)</span><br><span style="color: hsl(120, 100%, 40%);">+ return net->uea_encryption_mask > (1 << OSMO_UTRAN_UEA0);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return net->a5_encryption_mask > 0x1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void update_counters(struct osmo_fsm_inst *fi, bool conn_accepted)</span><br><span> {</span><br><span> struct msc_a *msc_a = fi->priv;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/26108">change 26108</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/c/osmo-msc/+/26108"/><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-Change-Id: I9e407f65b282e645feabe714f7f4c3e44fae21e9 </div>
<div style="display:none"> Gerrit-Change-Number: 26108 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>