commit 7814a832980caa1206a3f217ef79f1a19831305a
author Neels Hofmeyr <neels@hofmeyr.de> Wed Dec 26 00:40:18 2018 +0100
committer Neels Hofmeyr <nhofmeyr@sysmocom.de> Fri Jan 04 17:26:14 2019 +0000
tree 7e2e1f71e3ba6966822027df5064e125d28c5024
parent 3a3ed9b704bf01792628d116056b565a67a2eaa6

use osmo_rat_type from libosmocore

Replace locally defined enum ran_type with libosmocore's new enum
osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names.

The string representations change, which has cosmetic effects on the test suite
expectations.

Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore)
Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b

src/libmsc/gsm_04_08.c

diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 81bda76..7ff8681 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -403,7 +403,7 @@
 	new_lai.lac = conn->lac;
 	DEBUGP(DMM, "LU/new-LAC: %u/%u\n", old_lai.lac, new_lai.lac);
 
-	is_utran = (conn->via_ran == RAN_UTRAN_IU);
+	is_utran = (conn->via_ran == OSMO_RAT_UTRAN_IU);
 	lu_fsm = vlr_loc_update(conn->fi,
 				RAN_CONN_E_ACCEPTED, RAN_CONN_E_CN_CLOSE, NULL,
 				net->vlr, conn, vlr_lu_type, tmsi, imsi,
@@ -785,7 +785,7 @@
 
 	osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, mi_p);
 
-	is_utran = (conn->via_ran == RAN_UTRAN_IU);
+	is_utran = (conn->via_ran == OSMO_RAT_UTRAN_IU);
 	vlr_proc_acc_req(conn->fi,
 			 RAN_CONN_E_ACCEPTED, RAN_CONN_E_CN_CLOSE, NULL,
 			 net->vlr, conn,
@@ -1005,7 +1005,7 @@
 	       osmo_hexdump_nospc(res, res_len));
 
 	return vlr_subscr_rx_auth_resp(conn->vsub, classmark_is_r99(&conn->vsub->classmark),
-				       conn->via_ran == RAN_UTRAN_IU,
+				       conn->via_ran == OSMO_RAT_UTRAN_IU,
 				       res, res_len);
 }
 
@@ -1185,7 +1185,7 @@
 
 	ran_conn_update_id(conn, COMPLETE_LAYER3_PAGING_RESP, mi_string);
 
-	is_utran = (conn->via_ran == RAN_UTRAN_IU);
+	is_utran = (conn->via_ran == OSMO_RAT_UTRAN_IU);
 	vlr_proc_acc_req(conn->fi,
 			 RAN_CONN_E_ACCEPTED, RAN_CONN_E_CN_CLOSE, NULL,
 			 net->vlr, conn,
@@ -1465,8 +1465,8 @@
 		     "%s: Illegal situation: RAN type mismatch:"
 		     " attached via %s, received message via %s\n",
 		     vlr_subscr_name(conn->vsub),
-		     ran_type_name(conn->vsub->cs.attached_via_ran),
-		     ran_type_name(conn->via_ran));
+		     osmo_rat_type_name(conn->vsub->cs.attached_via_ran),
+		     osmo_rat_type_name(conn->via_ran));
 		return -EACCES;
 	}
 
@@ -1700,16 +1700,16 @@
 	}
 
 	switch (conn->via_ran) {
-	case RAN_GERAN_A:
+	case OSMO_RAT_GERAN_A:
 		return ran_conn_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv);
 
-	case RAN_UTRAN_IU:
+	case OSMO_RAT_UTRAN_IU:
 #ifdef BUILD_IU
 		DEBUGP(DMM, "-> SECURITY MODE CONTROL %s\n",
 		       vlr_subscr_name(conn->vsub));
 		return ranap_iu_tx_sec_mode_cmd(conn->iu.ue_ctx, &tuple->vec, 0, 1);
 #else
-		LOGP(DMM, LOGL_ERROR, "Cannot send Security Mode Control over RAN_UTRAN_IU,"
+		LOGP(DMM, LOGL_ERROR, "Cannot send Security Mode Control over OSMO_RAT_UTRAN_IU,"
 		     " built without Iu support\n");
 		return -ENOTSUP;
 #endif