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/msc_mgcp.c b/src/libmsc/msc_mgcp.c
index 5b4ee26..703bb0b 100644
--- a/src/libmsc/msc_mgcp.c
+++ b/src/libmsc/msc_mgcp.c
@@ -316,7 +316,7 @@
* trick the hNodeB into doing the IuUP negotiation with itself.
* This is a hack we need because osmo-mgw does not support IuUP yet, see OS#2459. */
#ifdef BUILD_IU
- if (conn->via_ran == RAN_UTRAN_IU)
+ if (conn->via_ran == OSMO_RAT_UTRAN_IU)
mgcp_msg.conn_mode = MGCP_CONN_LOOPBACK;
#endif
@@ -506,7 +506,7 @@
}
/* Forward assignment request to A/RANAP */
- if (conn->via_ran == RAN_UTRAN_IU) {
+ if (conn->via_ran == OSMO_RAT_UTRAN_IU) {
#ifdef BUILD_IU
/* Assign a voice channel via RANAP on 3G */
if (iu_rab_act_cs(trans))
@@ -515,7 +515,7 @@
LOGPFSML(fi, LOGL_ERROR, "Cannot send Iu RAB Assignment: built without Iu support\n");
goto error;
#endif
- } else if (conn->via_ran == RAN_GERAN_A) {
+ } else if (conn->via_ran == OSMO_RAT_GERAN_A) {
/* Assign a voice channel via A on 2G */
if (a_iface_tx_assignment(trans))
goto error;
@@ -1005,7 +1005,7 @@
#ifdef BUILD_IU
/* FIXME: HACK. where to scope the RAB Id? At the conn / subscriber / ranap_ue_conn_ctx? */
static uint8_t next_iu_rab_id = 1;
- if (conn->via_ran == RAN_UTRAN_IU)
+ if (conn->via_ran == OSMO_RAT_UTRAN_IU)
conn->iu.rab_id = next_iu_rab_id++;
#endif