[PATCH] osmo-msc[master]: cosmetic: rename gsm_subscriber_connection->conn_fsm to ->fi

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Tue Apr 3 00:13:56 UTC 2018


Review at  https://gerrit.osmocom.org/7613

cosmetic: rename gsm_subscriber_connection->conn_fsm to ->fi

Match osmo-bsc's naming of the subscriber connection's FSM instance; 'conn->fi'
makes more sense anyway than 'conn->conn_fsm'.

BTW, an upcoming commit will do away with the legacy from libbsc/libmsc duality
and firmly glue the conn allocation to the fi.

Related: OS#3122
Change-Id: If442f2ba78d9722b1065ec30c9a13f372b6a8caa
---
M include/osmocom/msc/gsm_data.h
M src/libmsc/gsm_04_08.c
M src/libmsc/msc_vty.c
M src/libmsc/osmo_msc.c
M src/libmsc/subscr_conn.c
M src/libmsc/transaction.c
M tests/msc_vlr/msc_vlr_test_authen_reuse.c
M tests/msc_vlr/msc_vlr_test_call.c
M tests/msc_vlr/msc_vlr_test_gsm_authen.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.c
M tests/msc_vlr/msc_vlr_test_ms_timeout.c
M tests/msc_vlr/msc_vlr_test_no_authen.c
M tests/msc_vlr/msc_vlr_test_reject_concurrency.c
M tests/msc_vlr/msc_vlr_test_rest.c
M tests/msc_vlr/msc_vlr_test_umts_authen.c
15 files changed, 54 insertions(+), 53 deletions(-)


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

diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 1e5d567..df15eea 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -75,6 +75,9 @@
 	/* global linked list of subscriber_connections */
 	struct llist_head entry;
 
+	/* FSM instance to control the subscriber connection's permissions and lifetime. */
+	struct osmo_fsm_inst *fi;
+
 	/* usage count. If this drops to zero, we start the release
 	 * towards A/Iu */
 	uint32_t use_count;
@@ -91,8 +94,6 @@
 	uint8_t expire_timer_stopped;
 	/* SMS helpers for libmsc */
 	uint8_t next_rp_ref;
-
-	struct osmo_fsm_inst *conn_fsm;
 
 	/* Are we part of a special "silent" call */
 	int silent_call;
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 105bd1f..1bb6fa7 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -393,7 +393,7 @@
 	DEBUGP(DMM, "LU/new-LAC: %u/%u\n", old_lai.lac, new_lai.lac);
 
 	is_utran = (conn->via_ran == RAN_UTRAN_IU);
-	lu_fsm = vlr_loc_update(conn->conn_fsm,
+	lu_fsm = vlr_loc_update(conn->fi,
 				SUBSCR_CONN_E_ACCEPTED,
 				SUBSCR_CONN_E_CN_CLOSE,
 				(void*)&conn_from_lu,
@@ -759,7 +759,7 @@
 	memcpy(conn->classmark.classmark2, classmark2, classmark2_len);
 	conn->classmark.classmark2_len = classmark2_len;
 
-	if (conn->conn_fsm) {
+	if (conn->fi) {
 		if (msc_subscr_conn_is_accepted(conn))
 			return cm_serv_reuse_conn(conn, mi-1);
 		LOGP(DMM, LOGL_ERROR, "%s: connection already in use\n",
@@ -776,7 +776,7 @@
 	}
 
 	is_utran = (conn->via_ran == RAN_UTRAN_IU);
-	vlr_proc_acc_req(conn->conn_fsm,
+	vlr_proc_acc_req(conn->fi,
 			 SUBSCR_CONN_E_ACCEPTED,
 			 SUBSCR_CONN_E_CN_CLOSE,
 			 (void*)&conn_from_cm_service_req,
@@ -1181,7 +1181,7 @@
 	conn->classmark.classmark2_len = *classmark2_lv;
 
 	is_utran = (conn->via_ran == RAN_UTRAN_IU);
-	vlr_proc_acc_req(conn->conn_fsm,
+	vlr_proc_acc_req(conn->fi,
 			 SUBSCR_CONN_E_ACCEPTED,
 			 SUBSCR_CONN_E_CN_CLOSE,
 			 (void*)&conn_from_paging_resp,
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index b96f6cd..33613e9 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -481,7 +481,7 @@
 		conn->use_tokens,
 		conn->received_cm_service_request ? 'C' : '-',
 		conn->encr.alg_id,
-		conn->conn_fsm ? osmo_fsm_inst_state_name(conn->conn_fsm) : "-",
+		conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-",
 		VTY_NEWLINE);
 }
 
diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c
index 62a7e8a..34f705c 100644
--- a/src/libmsc/osmo_msc.c
+++ b/src/libmsc/osmo_msc.c
@@ -88,16 +88,16 @@
 {
 	if (!conn)
 		return;
-	if (!conn->conn_fsm)
+	if (!conn->fi)
 		return;
-	if (!(conn->conn_fsm->state == SUBSCR_CONN_S_ACCEPTED
-	      || conn->conn_fsm->state == SUBSCR_CONN_S_COMMUNICATING)) {
+	if (!(conn->fi->state == SUBSCR_CONN_S_ACCEPTED
+	      || conn->fi->state == SUBSCR_CONN_S_COMMUNICATING)) {
 		DEBUGP(DMM, "%s: %s: conn still being established (%s)\n",
 		       vlr_subscr_name(conn->vsub), __func__,
-		       osmo_fsm_inst_state_name(conn->conn_fsm));
+		       osmo_fsm_inst_state_name(conn->fi));
 		return;
 	}
-	osmo_fsm_inst_dispatch(conn->conn_fsm, SUBSCR_CONN_E_RELEASE_WHEN_UNUSED, NULL);
+	osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_RELEASE_WHEN_UNUSED, NULL);
 }
 
 /* receive a Level 3 Complete message and return MSC_CONN_ACCEPT or
@@ -110,7 +110,7 @@
 
 	subscr_conn_release_when_unused(conn);
 
-	/* If this should be kept, the conn->conn_fsm has placed a use_count */
+	/* If this should be kept, the conn->fi has placed a use_count */
 	msc_subscr_conn_put(conn, MSC_CONN_USE_COMPL_L3);
 
 	/* Always return acceptance, because even if the conn was not accepted,
@@ -268,11 +268,11 @@
 		DEBUGP(DRLL, "Freeing subscriber connection"
 		       " with NULL subscriber\n");
 
-	if (!conn->conn_fsm)
+	if (!conn->fi)
 		return;
 
-	osmo_fsm_inst_term(conn->conn_fsm,
-			   (conn->conn_fsm->state == SUBSCR_CONN_S_RELEASED)
+	osmo_fsm_inst_term(conn->fi,
+			   (conn->fi->state == SUBSCR_CONN_S_RELEASED)
 				? OSMO_FSM_TERM_REGULAR
 				: OSMO_FSM_TERM_ERROR,
 			   NULL);
@@ -322,8 +322,8 @@
 	}
 }
 
-/* If the conn->conn_fsm is still present, dispatch SUBSCR_CONN_E_CN_CLOSE
- * event to gracefully terminate the connection. If the conn_fsm is already
+/* If the conn->fi is still present, dispatch SUBSCR_CONN_E_CN_CLOSE
+ * event to gracefully terminate the connection. If the fi is already
  * cleared, call msc_subscr_conn_release_all() to take release actions.
  * \param cause  a GSM_CAUSE_* constant, e.g. GSM_CAUSE_AUTH_FAILED.
  */
@@ -338,22 +338,22 @@
 		       vlr_subscr_name(conn->vsub), cause);
 		return;
 	}
-	if (!conn->conn_fsm) {
+	if (!conn->fi) {
 		DEBUGP(DMM, "msc_subscr_conn_close(vsub=%s, cause=%u): no conn fsm,"
 		       " releasing directly without release event.\n",
 		       vlr_subscr_name(conn->vsub), cause);
-		/* In case of an IMSI Detach, we don't have conn_fsm. Release
+		/* In case of an IMSI Detach, we don't have fi. Release
 		 * anyway to ensure a timely Iu Release / BSSMAP Clear. */
 		msc_subscr_conn_release_all(conn, cause);
 		return;
 	}
-	if (conn->conn_fsm->state == SUBSCR_CONN_S_RELEASED) {
+	if (conn->fi->state == SUBSCR_CONN_S_RELEASED) {
 		DEBUGP(DMM, "msc_subscr_conn_close(vsub=%s, cause=%u):"
 		       " conn fsm already releasing, ignore.\n",
 		       vlr_subscr_name(conn->vsub), cause);
 		return;
 	}
-	osmo_fsm_inst_dispatch(conn->conn_fsm, SUBSCR_CONN_E_CN_CLOSE, &cause);
+	osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_CN_CLOSE, &cause);
 }
 
 /* increment the ref-count. Needs to be called by every user */
diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c
index ca93a03..248c463 100644
--- a/src/libmsc/subscr_conn.c
+++ b/src/libmsc/subscr_conn.c
@@ -225,7 +225,7 @@
 
 	if (!conn)
 		return;
-	conn->conn_fsm = NULL;
+	conn->fi = NULL;
  	msc_subscr_conn_close(conn, cause);
 	msc_subscr_conn_put(conn, MSC_CONN_USE_FSM);
 }
@@ -329,7 +329,7 @@
 	struct osmo_fsm_inst *fi;
 	OSMO_ASSERT(conn);
 
-	if (conn->conn_fsm) {
+	if (conn->fi) {
 		LOGP(DMM, LOGL_ERROR,
 		     "%s: Error: connection already in use\n", id);
 		return -EINVAL;
@@ -349,8 +349,8 @@
 		     "%s: Failed to allocate subscr conn master FSM\n", id);
 		return -ENOMEM;
 	}
-	conn->conn_fsm = fi;
-	osmo_fsm_inst_dispatch(conn->conn_fsm, SUBSCR_CONN_E_START, NULL);
+	conn->fi = fi;
+	osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_START, NULL);
 	return 0;
 }
 
@@ -360,10 +360,10 @@
 		return false;
 	if (!conn->vsub)
 		return false;
-	if (!conn->conn_fsm)
+	if (!conn->fi)
 		return false;
-	if (!(conn->conn_fsm->state == SUBSCR_CONN_S_ACCEPTED
-	      || conn->conn_fsm->state == SUBSCR_CONN_S_COMMUNICATING))
+	if (!(conn->fi->state == SUBSCR_CONN_S_ACCEPTED
+	      || conn->fi->state == SUBSCR_CONN_S_COMMUNICATING))
 		return false;
 	return true;
 }
@@ -374,8 +374,8 @@
 	/* This function is called to indicate that *some* communication is happening with the phone.
 	 * Late in the process, that may be a Release Confirm and the FSM and conn are already in
 	 * teardown. No need to signal SUBSCR_CONN_E_COMMUNICATING then. */
-	if (conn->conn_fsm)
-		osmo_fsm_inst_dispatch(conn->conn_fsm, SUBSCR_CONN_E_COMMUNICATING, NULL);
+	if (conn->fi)
+		osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_COMMUNICATING, NULL);
 }
 
 void msc_subscr_conn_init(void)
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c
index 4a3b064..5b033dc 100644
--- a/src/libmsc/transaction.c
+++ b/src/libmsc/transaction.c
@@ -158,8 +158,8 @@
 	trans->conn = NULL;
 	talloc_free(trans);
 
-	/* trans_free() should always happen while the conn_fsm is still around. */
-	OSMO_ASSERT(conn->conn_fsm);
+	/* trans_free() should always happen while the fi is still around. */
+	OSMO_ASSERT(conn->fi);
 
 	/* Possibly this was the last transaction used by this conn. */
 	subscr_conn_release_when_unused(conn);
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
index 6fd1e66..c9a9d09 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
@@ -166,7 +166,7 @@
 			     "03575886" /* classmark 2 */
 			     "089910070000106005" /* IMSI */);
 		OSMO_ASSERT(g_conn);
-		OSMO_ASSERT(g_conn->conn_fsm);
+		OSMO_ASSERT(g_conn->fi);
 		OSMO_ASSERT(g_conn->vsub);
 		VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 		VERBOSE_ASSERT(auth_request_sent, == true, "%d");
@@ -217,7 +217,7 @@
 			     "03575886" /* classmark 2 */
 			     "089910070000106005" /* IMSI */);
 		OSMO_ASSERT(g_conn);
-		OSMO_ASSERT(g_conn->conn_fsm);
+		OSMO_ASSERT(g_conn->fi);
 		OSMO_ASSERT(g_conn->vsub);
 		VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 		VERBOSE_ASSERT(auth_request_sent, == false, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index 7f97c35..6359865 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -172,7 +172,7 @@
 		     "03575886" /* classmark 2 */
 		     "089910070000106005" /* IMSI */);
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
@@ -355,7 +355,7 @@
 		     "03575886" /* classmark 2 */
 		     "089910070000106005" /* IMSI */);
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
@@ -434,7 +434,7 @@
 		     "03575886" /* classmark 2 */
 		     "089910070000106005" /* IMSI */);
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index dda84f6..5176306 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -99,7 +99,7 @@
 	cm_service_result_sent = RES_NONE;
 	ms_sends_msg("05247803305886089910070000006402");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
@@ -316,7 +316,7 @@
 	cm_service_result_sent = RES_NONE;
 	ms_sends_msg("05247803305886" "05f4" "03020100");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
@@ -804,7 +804,7 @@
 		     "03305886" /* classmark 2: GSM phase 2 */
 		     "089910070000106005" /* IMSI */);
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index d8ea6ba..8a05b3f 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -101,7 +101,7 @@
 	auth_request_expect_rand = "12aca96fb4ffdea5c985cbafa9b6e18b";
 	ms_sends_msg("05247803305886089910070000006402");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
@@ -340,7 +340,7 @@
 	auth_request_expect_autn = NULL;
 	ms_sends_msg("05247803305886" "05f4" "03020100");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
@@ -934,7 +934,7 @@
 		     "03575886" /* classmark 2 */
 		     "089910070000106005" /* IMSI */);
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
index c81f5b5..a36027c 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
@@ -148,7 +148,7 @@
 	cm_service_result_sent = RES_NONE;
 	ms_sends_msg("05247803305886089910070000006402");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c
index 59c5603..b20f9d7 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -65,7 +65,7 @@
 	cm_service_result_sent = RES_NONE;
 	ms_sends_msg("05247803305886089910070000006402");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 	EXPECT_ACCEPTED(true);
@@ -227,7 +227,7 @@
 	cm_service_result_sent = RES_NONE;
 	ms_sends_msg("05247803305886" "05f4" "03020100");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 	EXPECT_ACCEPTED(true);
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
index 08fc9e7..ceab109 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
@@ -109,7 +109,7 @@
 	cm_service_result_sent = RES_NONE;
 	ms_sends_msg("05247803305886089910070000006402");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 	EXPECT_ACCEPTED(true);
diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c
index 1a403c3..3f843f0 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.c
+++ b/tests/msc_vlr/msc_vlr_test_rest.c
@@ -36,8 +36,8 @@
 
 	btw("conn_fsm present, in state NEW");
 	OSMO_ASSERT(msc_create_conn_fsm(g_conn, "test") == 0);
-	OSMO_ASSERT(g_conn->conn_fsm);
-	OSMO_ASSERT(g_conn->conn_fsm->state == SUBSCR_CONN_S_NEW);
+	OSMO_ASSERT(g_conn->fi);
+	OSMO_ASSERT(g_conn->fi->state == SUBSCR_CONN_S_NEW);
 	EXPECT_ACCEPTED(false);
 
 	thwart_rx_non_initial_requests();
@@ -48,13 +48,13 @@
 	OSMO_ASSERT(g_conn->vsub);
 	/* mark as silent call so it sticks around */
 	g_conn->silent_call = 1;
-	osmo_fsm_inst_state_chg(g_conn->conn_fsm, SUBSCR_CONN_S_ACCEPTED, 0, 0);
+	osmo_fsm_inst_state_chg(g_conn->fi, SUBSCR_CONN_S_ACCEPTED, 0, 0);
 	EXPECT_CONN_COUNT(1);
 	EXPECT_ACCEPTED(true);
 
 	btw("CLOSE event marks conn_fsm as released and frees the conn");
 	expect_bssap_clear();
-	osmo_fsm_inst_dispatch(g_conn->conn_fsm, SUBSCR_CONN_E_CN_CLOSE, NULL);
+	osmo_fsm_inst_dispatch(g_conn->fi, SUBSCR_CONN_E_CN_CLOSE, NULL);
 	VERBOSE_ASSERT(bssap_clear_sent, == true, "%d");
 	EXPECT_CONN_COUNT(0);
 
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c
index b5a55fc..7b410df 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c
@@ -196,7 +196,7 @@
 		     "03575886" /* classmark 2 */
 		     "089910070000106005" /* IMSI */);
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->conn_fsm);
+	OSMO_ASSERT(g_conn->fi);
 	OSMO_ASSERT(g_conn->vsub);
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");

-- 
To view, visit https://gerrit.osmocom.org/7613
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If442f2ba78d9722b1065ec30c9a13f372b6a8caa
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>



More information about the gerrit-log mailing list