<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12035">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move gsm_auth_tuple to vlr.h as vlr_auth_tuple<br><br>Along goes GSM_KEYSEQ_INVAL as VLR_*.<br><br>It's where it logically belongs, and is almost the only reason why vlr.h<br>includes gsm_data.h. The remaining reason, GSM_EXTENSION_LENGTH, will be moved<br>by upcoming patch.<br><br>Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76<br>---<br>M include/osmocom/msc/gsm_data.h<br>M include/osmocom/msc/vlr.h<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/msc_vty.c<br>M src/libvlr/vlr.c<br>M src/libvlr/vlr_auth_fsm.c<br>M tests/msc_vlr/msc_vlr_tests.c<br>7 files changed, 27 insertions(+), 26 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 3ffa100..30a3c79 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -42,13 +42,6 @@</span><br><span> struct msgb *msg,</span><br><span> void *data, void *param);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_auth_tuple {</span><br><span style="color: hsl(0, 100%, 40%);">- int use_count;</span><br><span style="color: hsl(0, 100%, 40%);">- int key_seq;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_auth_vector vec;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-#define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum {</span><br><span> MSC_CTR_LOC_UPDATE_TYPE_ATTACH,</span><br><span> MSC_CTR_LOC_UPDATE_TYPE_NORMAL,</span><br><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index 1168c32..1865618 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -77,6 +77,14 @@</span><br><span> VLR_CIPH_COMPL,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct vlr_auth_tuple {</span><br><span style="color: hsl(120, 100%, 40%);">+ int use_count;</span><br><span style="color: hsl(120, 100%, 40%);">+ int key_seq;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_auth_vector vec;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+#define VLR_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct vlr_ciph_result {</span><br><span> enum vlr_ciph_result_cause cause;</span><br><span> char imeisv[GSM48_MI_SIZE];</span><br><span>@@ -122,8 +130,8 @@</span><br><span> uint32_t age_indicator; /* 2.17.1 */</span><br><span> </span><br><span> /* Authentication Data */</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *last_tuple;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *last_tuple;</span><br><span> enum vlr_subscr_security_context sec_ctx;</span><br><span> </span><br><span> /* Data local to VLR is below */</span><br><span>@@ -205,7 +213,7 @@</span><br><span> * \param[in] at auth tuple providing rand, key_seq and autn.</span><br><span> * \param[in] send_autn True to send AUTN, for r99 UMTS auth.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- int (*tx_auth_req)(void *msc_conn_ref, struct gsm_auth_tuple *at,</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*tx_auth_req)(void *msc_conn_ref, struct vlr_auth_tuple *at,</span><br><span> bool send_autn);</span><br><span> /* encode + transmit an AUTH REJECT towards the MS */</span><br><span> int (*tx_auth_rej)(void *msc_conn_ref);</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 38376d0..2962760 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -1514,7 +1514,7 @@</span><br><span> ***********************************************************************/</span><br><span> </span><br><span> /* VLR asks us to send an authentication request */</span><br><span style="color: hsl(0, 100%, 40%);">-static int msc_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at,</span><br><span style="color: hsl(120, 100%, 40%);">+static int msc_vlr_tx_auth_req(void *msc_conn_ref, struct vlr_auth_tuple *at,</span><br><span> bool send_autn)</span><br><span> {</span><br><span> struct ran_conn *conn = msc_conn_ref;</span><br><span>@@ -1600,7 +1600,7 @@</span><br><span> int i, j = 0;</span><br><span> int request_classmark = 0;</span><br><span> int request_classmark_for_a5_n = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *tuple = conn->vsub->last_tuple;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *tuple = conn->vsub->last_tuple;</span><br><span> </span><br><span> if (!conn || !conn->vsub || !conn->vsub->last_tuple) {</span><br><span> /* This should really never happen, because we checked this in msc_vlr_set_ciph_mode()</span><br><span>@@ -1680,7 +1680,7 @@</span><br><span> {</span><br><span> struct ran_conn *conn = msc_conn_ref;</span><br><span> struct vlr_subscr *vsub;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *tuple;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *tuple;</span><br><span> </span><br><span> if (!conn || !conn->vsub) {</span><br><span> LOGP(DMM, LOGL_ERROR, "Cannot send Ciphering Mode Command to"</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index b632117..aaefb0b 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -602,7 +602,7 @@</span><br><span> #endif</span><br><span> </span><br><span> if (vsub->last_tuple) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *t = vsub->last_tuple;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *t = vsub->last_tuple;</span><br><span> vty_out(vty, " A3A8 last tuple (used %d times):%s",</span><br><span> t->use_count, VTY_NEWLINE);</span><br><span> vty_out(vty, " seq # : %d%s",</span><br><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index 189cb66..76c84de 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -242,7 +242,7 @@</span><br><span> vsub->tmsi_new = GSM_RESERVED_TMSI;</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(vsub->auth_tuples); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- vsub->auth_tuples[i].key_seq = GSM_KEY_SEQ_INVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ vsub->auth_tuples[i].key_seq = VLR_KEY_SEQ_INVAL;</span><br><span> </span><br><span> INIT_LLIST_HEAD(&vsub->cs.requests);</span><br><span> INIT_LLIST_HEAD(&vsub->ps.pdp_list);</span><br><span>@@ -661,7 +661,7 @@</span><br><span> if (gsup->num_auth_vectors) {</span><br><span> memset(&vsub->auth_tuples, 0, sizeof(vsub->auth_tuples));</span><br><span> for (i = 0; i < ARRAY_SIZE(vsub->auth_tuples); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- vsub->auth_tuples[i].key_seq = GSM_KEY_SEQ_INVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ vsub->auth_tuples[i].key_seq = VLR_KEY_SEQ_INVAL;</span><br><span> }</span><br><span> </span><br><span> got_tuples = 0;</span><br><span>diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c</span><br><span>index d5a8555..8419696 100644</span><br><span>--- a/src/libvlr/vlr_auth_fsm.c</span><br><span>+++ b/src/libvlr/vlr_auth_fsm.c</span><br><span>@@ -65,13 +65,13 @@</span><br><span> * least used auth tuple without enforcing a maximum use count. If there are</span><br><span> * no auth tuples, return NULL.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_auth_tuple *</span><br><span style="color: hsl(120, 100%, 40%);">+static struct vlr_auth_tuple *</span><br><span> _vlr_subscr_next_auth_tuple(struct vlr_subscr *vsub, int max_reuse_count)</span><br><span> {</span><br><span> unsigned int count;</span><br><span> unsigned int idx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *at = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int key_seq = GSM_KEY_SEQ_INVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *at = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int key_seq = VLR_KEY_SEQ_INVAL;</span><br><span> </span><br><span> if (!vsub)</span><br><span> return NULL;</span><br><span>@@ -79,7 +79,7 @@</span><br><span> if (vsub->last_tuple)</span><br><span> key_seq = vsub->last_tuple->key_seq;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (key_seq == GSM_KEY_SEQ_INVAL)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (key_seq == VLR_KEY_SEQ_INVAL)</span><br><span> /* Start with 0 after increment modulo array size */</span><br><span> idx = ARRAY_SIZE(vsub->auth_tuples) - 1;</span><br><span> else</span><br><span>@@ -88,7 +88,7 @@</span><br><span> for (count = ARRAY_SIZE(vsub->auth_tuples); count > 0; count--) {</span><br><span> idx = (idx + 1) % ARRAY_SIZE(vsub->auth_tuples);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (vsub->auth_tuples[idx].key_seq == GSM_KEY_SEQ_INVAL)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vsub->auth_tuples[idx].key_seq == VLR_KEY_SEQ_INVAL)</span><br><span> continue;</span><br><span> </span><br><span> if (!at || vsub->auth_tuples[idx].use_count < at->use_count)</span><br><span>@@ -102,10 +102,10 @@</span><br><span> }</span><br><span> </span><br><span> /* Return an auth tuple and increment its use count. */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_auth_tuple *</span><br><span style="color: hsl(120, 100%, 40%);">+static struct vlr_auth_tuple *</span><br><span> vlr_subscr_get_auth_tuple(struct vlr_subscr *vsub, int max_reuse_count)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *at = _vlr_subscr_next_auth_tuple(vsub,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *at = _vlr_subscr_next_auth_tuple(vsub,</span><br><span> max_reuse_count);</span><br><span> if (!at)</span><br><span> return NULL;</span><br><span>@@ -124,7 +124,7 @@</span><br><span> bool is_utran, const uint8_t *res,</span><br><span> uint8_t res_len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *at = vsub->last_tuple;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *at = vsub->last_tuple;</span><br><span> struct osmo_auth_vector *vec = &at->vec;</span><br><span> bool check_umts;</span><br><span> bool res_is_umts_aka;</span><br><span>@@ -263,7 +263,7 @@</span><br><span> {</span><br><span> struct auth_fsm_priv *afp = fi->priv;</span><br><span> struct vlr_subscr *vsub = afp->vsub;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_auth_tuple *at;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_auth_tuple *at;</span><br><span> bool use_umts_aka;</span><br><span> </span><br><span> /* Caller ensures we have vectors available */</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>index 2443e31..29ffdbf 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.c</span><br><span>@@ -714,7 +714,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int fake_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at,</span><br><span style="color: hsl(120, 100%, 40%);">+static int fake_vlr_tx_auth_req(void *msc_conn_ref, struct vlr_auth_tuple *at,</span><br><span> bool send_autn)</span><br><span> {</span><br><span> struct ran_conn *conn = msc_conn_ref;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12035">change 12035</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/12035"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 </div>
<div style="display:none"> Gerrit-Change-Number: 12035 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>