diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-07-05 15:19:52 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-07-12 23:42:47 +0200 |
commit | b271e460490131f7d9c4873057b7ebe0826803b8 (patch) | |
tree | 47d48f4eb6ce2f47020e8ed0d36e446adc3be51d /src/libmsc | |
parent | e97d8754cae116469a7c6fc6c24eb5836dc5245d (diff) |
move libiu to osmo-iuh/libosmo-ranapaoip
Remove libiu here, use the functions from libosmo-ranap instead, by applying
the ranap_ / RANAP_ prefix.
Corresponding change-id in osmo-iuh.git is I6a3f7ad15be03fb94689b4af6ccfa828c25f45c0
Change-Id: Ib8c4fcdb4766c5e575618b95ce16dce51063206b
Diffstat (limited to 'src/libmsc')
-rw-r--r-- | src/libmsc/a_iface_bssap.c | 2 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08.c | 4 | ||||
-rw-r--r-- | src/libmsc/gsm_subscriber.c | 11 | ||||
-rw-r--r-- | src/libmsc/iucs.c | 14 | ||||
-rw-r--r-- | src/libmsc/iucs_ranap.c | 12 | ||||
-rw-r--r-- | src/libmsc/msc_ifaces.c | 16 | ||||
-rw-r--r-- | src/libmsc/msc_vty.c | 6 | ||||
-rw-r--r-- | src/libmsc/osmo_msc.c | 3 | ||||
-rw-r--r-- | src/libmsc/subscr_conn.c | 4 |
9 files changed, 37 insertions, 35 deletions
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index d01210ed1..6d754883a 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -25,11 +25,11 @@ #include <osmocom/sccp/sccp_types.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/a_iface_bssap.h> #include <openbsc/a_iface.h> -#include <openbsc/iu.h> #include <openbsc/osmo_msc.h> #include <osmocom/core/byteswap.h> #include <openbsc/a_reset.h> diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 64c5a673d..ef20cbc91 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -71,9 +71,9 @@ #include <osmocom/core/utils.h> #include <osmocom/gsm/tlv.h> #include <osmocom/crypt/auth.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/msc_ifaces.h> -#include <openbsc/iu.h> #include <openbsc/a_iface.h> #include <assert.h> @@ -3810,7 +3810,7 @@ static int msc_vlr_set_ciph_mode(void *msc_conn_ref, case RAN_UTRAN_IU: DEBUGP(DMM, "-> SECURITY MODE CONTROL %s\n", vlr_subscr_name(conn->vsub)); - return iu_tx_sec_mode_cmd(conn->iu.ue_ctx, tuple, 0, 1); + return ranap_iu_tx_sec_mode_cmd(conn->iu.ue_ctx, &tuple->vec, 0, 1); default: break; diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index 5de96e7cf..4b3bbe35f 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -32,6 +32,8 @@ #include <osmocom/vty/vty.h> +#include <osmocom/ranap/iu_client.h> + #include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_04_08.h> #include <openbsc/debug.h> @@ -40,7 +42,6 @@ #include <openbsc/db.h> #include <openbsc/chan_alloc.h> #include <openbsc/vlr.h> -#include <openbsc/iu.h> #include <openbsc/osmo_msc.h> #include <openbsc/msc_ifaces.h> #include <openbsc/a_iface.h> @@ -114,10 +115,10 @@ int msc_paging_request(struct vlr_subscr *vsub) case RAN_GERAN_A: return a_iface_tx_paging(vsub->imsi, vsub->tmsi, vsub->lac); case RAN_UTRAN_IU: - return iu_page_cs(vsub->imsi, - vsub->tmsi == GSM_RESERVED_TMSI? - NULL : &vsub->tmsi, - vsub->lac); + return ranap_iu_page_cs(vsub->imsi, + vsub->tmsi == GSM_RESERVED_TMSI? + NULL : &vsub->tmsi, + vsub->lac); default: break; } diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index be026c857..04b9ece7d 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -25,17 +25,17 @@ #include <inttypes.h> #include <osmocom/core/logging.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> -#include <openbsc/iu.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/osmo_msc.h> #include <openbsc/vlr.h> /* For A-interface see libbsc/bsc_api.c subscr_con_allocate() */ static struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_network *network, - struct ue_conn_ctx *ue, + struct ranap_ue_conn_ctx *ue, uint16_t lac) { struct gsm_subscriber_connection *conn; @@ -57,7 +57,7 @@ static struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_netw return conn; } -static int same_ue_conn(struct ue_conn_ctx *a, struct ue_conn_ctx *b) +static int same_ue_conn(struct ranap_ue_conn_ctx *a, struct ranap_ue_conn_ctx *b) { if (a == b) return 1; @@ -103,7 +103,7 @@ static inline void log_subscribers(struct gsm_network *network) * connection IDs, or return NULL if not found. */ struct gsm_subscriber_connection *subscr_conn_lookup_iu( struct gsm_network *network, - struct ue_conn_ctx *ue) + struct ranap_ue_conn_ctx *ue) { struct gsm_subscriber_connection *conn; @@ -126,7 +126,7 @@ struct gsm_subscriber_connection *subscr_conn_lookup_iu( } /* Receive MM/CC/... message from IuCS (SCCP user SAP). - * msg->dst must reference a struct ue_conn_ctx, which identifies the peer that + * msg->dst must reference a struct ranap_ue_conn_ctx, which identifies the peer that * sent the msg. * * For A-interface see libbsc/bsc_api.c gsm0408_rcvmsg(). */ @@ -134,10 +134,10 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg, uint16_t *lac) { int rc; - struct ue_conn_ctx *ue_ctx; + struct ranap_ue_conn_ctx *ue_ctx; struct gsm_subscriber_connection *conn; - ue_ctx = (struct ue_conn_ctx*)msg->dst; + ue_ctx = (struct ranap_ue_conn_ctx*)msg->dst; /* TODO: are there message types that could allow us to skip this * search? */ diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index b69d52bc7..ba25f0378 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -24,11 +24,11 @@ #include <osmocom/core/logging.h> #include <osmocom/ranap/ranap_ies_defs.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> -#include <openbsc/iu.h> #include <openbsc/iucs.h> #include <openbsc/vlr.h> #include <openbsc/iucs_ranap.h> @@ -71,7 +71,7 @@ int iucs_rx_sec_mode_compl(struct gsm_subscriber_connection *conn, } int iucs_rx_ranap_event(struct gsm_network *network, - struct ue_conn_ctx *ue_ctx, int type, void *data) + struct ranap_ue_conn_ctx *ue_ctx, int type, void *data) { struct gsm_subscriber_connection *conn; @@ -83,19 +83,19 @@ int iucs_rx_ranap_event(struct gsm_network *network, } switch (type) { - case IU_EVENT_IU_RELEASE: - case IU_EVENT_LINK_INVALIDATED: + case RANAP_IU_EVENT_IU_RELEASE: + case RANAP_IU_EVENT_LINK_INVALIDATED: LOGP(DIUCS, LOGL_INFO, "IuCS release for %s\n", vlr_subscr_name(conn->vsub)); msc_subscr_conn_close(conn, 0); return 0; - case IU_EVENT_SECURITY_MODE_COMPLETE: + case RANAP_IU_EVENT_SECURITY_MODE_COMPLETE: LOGP(DIUCS, LOGL_INFO, "IuCS security mode complete for %s\n", vlr_subscr_name(conn->vsub)); return iucs_rx_sec_mode_compl(conn, (RANAP_SecurityModeCompleteIEs_t*)data); - case IU_EVENT_RAB_ASSIGN: + case RANAP_IU_EVENT_RAB_ASSIGN: return iucs_rx_rab_assign(conn, (RANAP_RAB_SetupOrModifiedItemIEs_t*)data); default: diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index 8eb688224..154f8a23e 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -19,11 +19,11 @@ */ #include <osmocom/core/logging.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/msc_ifaces.h> -#include <openbsc/iu.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/transaction.h> #include <openbsc/mgcp.h> @@ -50,7 +50,7 @@ static int msc_tx(struct gsm_subscriber_connection *conn, struct msgb *msg) case RAN_UTRAN_IU: msg->dst = conn->iu.ue_ctx; - return iu_tx(msg, 0); + return ranap_iu_tx(msg, 0); default: LOGP(DMSC, LOGL_ERROR, @@ -115,7 +115,7 @@ int msc_tx_common_id(struct gsm_subscriber_connection *conn) #ifdef BUILD_IU DEBUGP(DIUCS, "%s: tx CommonID %s\n", vlr_subscr_name(conn->vsub), conn->vsub->imsi); - return iu_tx_common_id(conn->iu.ue_ctx, conn->vsub->imsi); + return ranap_iu_tx_common_id(conn->iu.ue_ctx, conn->vsub->imsi); #else LOGP(DMM, LOGL_ERROR, "Cannot send CommonID: RAN_UTRAN_IU but IuCS support not built\n"); @@ -124,14 +124,14 @@ int msc_tx_common_id(struct gsm_subscriber_connection *conn) } #ifdef BUILD_IU -static void iu_rab_act_cs(struct ue_conn_ctx *uectx, uint8_t rab_id, +static void iu_rab_act_cs(struct ranap_ue_conn_ctx *uectx, uint8_t rab_id, uint32_t rtp_ip, uint16_t rtp_port) { struct msgb *msg; bool use_x213_nsap; uint32_t conn_id = uectx->conn_id; - use_x213_nsap = (uectx->rab_assign_addr_enc == NSAP_ADDR_ENC_X213); + use_x213_nsap = (uectx->rab_assign_addr_enc == RANAP_NSAP_ADDR_ENC_X213); LOGP(DIUCS, LOGL_DEBUG, "Assigning RAB: conn_id=%u, rab_id=%d," " rtp=%x:%u, use_x213_nsap=%d\n", conn_id, rab_id, rtp_ip, @@ -141,7 +141,7 @@ static void iu_rab_act_cs(struct ue_conn_ctx *uectx, uint8_t rab_id, use_x213_nsap); msg->l2h = msg->data; - if (iu_rab_act(uectx, msg)) + if (ranap_iu_rab_act(uectx, msg)) LOGP(DIUCS, LOGL_ERROR, "Failed to send RAB Assignment:" " conn_id=%d rab_id=%d rtp=%x:%u\n", conn_id, rab_id, rtp_ip, rtp_port); @@ -151,7 +151,7 @@ static void mgcp_response_rab_act_cs_crcx(struct mgcp_response *r, void *priv) { struct gsm_trans *trans = priv; struct gsm_subscriber_connection *conn = trans->conn; - struct ue_conn_ctx *uectx = conn->iu.ue_ctx; + struct ranap_ue_conn_ctx *uectx = conn->iu.ue_ctx; uint32_t rtp_ip; int rc; @@ -200,7 +200,7 @@ static int conn_iu_rab_act_cs(struct gsm_trans *trans) uint16_t bts_base; /* HACK. where to scope the RAB Id? At the conn / subscriber / - * ue_conn_ctx? */ + * ranap_ue_conn_ctx? */ static uint8_t next_rab_id = 1; conn->iu.rab_id = next_rab_id ++; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index b6fff56af..d193aef53 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -26,12 +26,12 @@ #include <inttypes.h> #include <osmocom/vty/command.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/vty.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/vlr.h> -#include <openbsc/iu.h> static struct cmd_node msc_node = { MSC_NODE, @@ -125,7 +125,7 @@ static int config_write_msc(struct vty *vty) gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE); mgcpgw_client_config_write(vty, " "); - iu_vty_config_write(vty, " "); + ranap_iu_vty_config_write(vty, " "); return CMD_SUCCESS; } @@ -177,5 +177,5 @@ void msc_vty_init(struct gsm_network *msc_network) install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); mgcpgw_client_vty_init(MSC_NODE, &msc_network->mgcpgw.conf); - iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); + ranap_iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); } diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index b9607e3ec..bc77f053e 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -21,6 +21,8 @@ * */ +#include <osmocom/ranap/iu_client.h> + #include <openbsc/osmo_msc.h> #include <openbsc/bsc_api.h> #include <openbsc/debug.h> @@ -28,7 +30,6 @@ #include <openbsc/db.h> #include <openbsc/vlr.h> #include <openbsc/osmo_msc.h> -#include <openbsc/iu.h> #include <openbsc/gsm_04_11.h> diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index 9d5dd5d2c..b2c7a4ca4 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -24,13 +24,13 @@ #include <osmocom/core/logging.h> #include <osmocom/core/fsm.h> #include <osmocom/core/signal.h> +#include <osmocom/ranap/iu_client.h> #include <openbsc/osmo_msc.h> #include <openbsc/vlr.h> #include <openbsc/debug.h> #include <openbsc/transaction.h> #include <openbsc/signal.h> -#include <openbsc/iu.h> #define SUBSCR_CONN_TIMEOUT 5 /* seconds */ @@ -233,7 +233,7 @@ static void subscr_conn_fsm_cleanup(struct osmo_fsm_inst *fi, trans_conn_closed(conn); if (conn->via_ran == RAN_UTRAN_IU) - iu_tx_release(conn->iu.ue_ctx, NULL); + ranap_iu_tx_release(conn->iu.ue_ctx, NULL); /* FIXME: keep the conn until the Iu Release Outcome is * received from the UE, or a timeout expires. For now, the log * says "unknown UE" for each release outcome. */ |