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
diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c
index 9b63f16..d6349eb 100644
--- a/src/libmsc/ran_conn.c
+++ b/src/libmsc/ran_conn.c
@@ -363,7 +363,7 @@
trans_conn_closed(conn);
switch (conn->via_ran) {
- case RAN_GERAN_A:
+ case OSMO_RAT_GERAN_A:
a_iface_tx_clear_cmd(conn);
if (conn->a.waiting_for_clear_complete) {
LOGPFSML(fi, LOGL_ERROR,
@@ -372,7 +372,7 @@
}
conn->a.waiting_for_clear_complete = true;
break;
- case RAN_UTRAN_IU:
+ case OSMO_RAT_UTRAN_IU:
ranap_iu_tx_release(conn->iu.ue_ctx, NULL);
if (conn->iu.waiting_for_release_complete) {
LOGPFSML(fi, LOGL_ERROR,
@@ -496,10 +496,10 @@
char *id;
switch (conn->via_ran) {
- case RAN_GERAN_A:
+ case OSMO_RAT_GERAN_A:
id = talloc_asprintf(conn, "GERAN_A-%08x", conn->a.conn_id);
break;
- case RAN_UTRAN_IU:
+ case OSMO_RAT_UTRAN_IU:
id = talloc_asprintf(conn, "UTRAN_IU-%08x", iu_get_conn_id(conn->iu.ue_ctx));
break;
default:
@@ -627,7 +627,7 @@
* conn. As long as the FSM is waiting for responses from the subscriber, it will itself hold a use count
* on the conn. */
struct ran_conn *ran_conn_alloc(struct gsm_network *network,
- enum ran_type via_ran, uint16_t lac)
+ enum osmo_rat_type via_ran, uint16_t lac)
{
struct ran_conn *conn;
struct osmo_fsm_inst *fi;