From b271e460490131f7d9c4873057b7ebe0826803b8 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 5 Jul 2017 15:19:52 +0200 Subject: move libiu to osmo-iuh/libosmo-ranap 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 --- configure.ac | 1 - include/openbsc/Makefile.am | 1 - include/openbsc/gprs_sgsn.h | 4 +- include/openbsc/gsm_data.h | 2 +- include/openbsc/iu.h | 83 ----- include/openbsc/iucs.h | 2 +- include/openbsc/iucs_ranap.h | 4 +- include/openbsc/sgsn.h | 3 +- src/Makefile.am | 7 - src/gprs/Makefile.am | 1 - src/gprs/gprs_gmm.c | 34 +- src/gprs/gprs_sgsn.c | 2 +- src/gprs/sgsn_libgtp.c | 6 +- src/gprs/sgsn_main.c | 7 +- src/gprs/sgsn_vty.c | 6 +- src/libiu/Makefile.am | 28 -- src/libiu/iu.c | 768 ------------------------------------------ src/libiu/iu_vty.c | 130 ------- src/libmsc/a_iface_bssap.c | 2 +- src/libmsc/gsm_04_08.c | 4 +- src/libmsc/gsm_subscriber.c | 11 +- src/libmsc/iucs.c | 14 +- src/libmsc/iucs_ranap.c | 12 +- src/libmsc/msc_ifaces.c | 16 +- src/libmsc/msc_vty.c | 6 +- src/libmsc/osmo_msc.c | 3 +- src/libmsc/subscr_conn.c | 4 +- src/osmo-msc/Makefile.am | 1 - src/osmo-msc/msc_main.c | 8 +- tests/libiudummy/iudummy.c | 21 +- tests/msc_vlr/Makefile.am | 4 +- tests/msc_vlr/msc_vlr_tests.c | 20 +- tests/sgsn/Makefile.am | 1 - 33 files changed, 100 insertions(+), 1116 deletions(-) delete mode 100644 include/openbsc/iu.h delete mode 100644 src/libiu/Makefile.am delete mode 100644 src/libiu/iu.c delete mode 100644 src/libiu/iu_vty.c diff --git a/configure.ac b/configure.ac index de472099e..f7f22fe8c 100644 --- a/configure.ac +++ b/configure.ac @@ -230,7 +230,6 @@ AC_OUTPUT( src/libmgcp/Makefile src/libcommon/Makefile src/libfilter/Makefile - src/libiu/Makefile src/libcommon-cs/Makefile src/osmo-msc/Makefile src/osmo-bsc/Makefile diff --git a/include/openbsc/Makefile.am b/include/openbsc/Makefile.am index 4a5223666..7c0e453c0 100644 --- a/include/openbsc/Makefile.am +++ b/include/openbsc/Makefile.am @@ -48,7 +48,6 @@ noinst_HEADERS = \ handover.h \ handover_decision.h \ ipaccess.h \ - iu.h \ iucs.h \ iucs_ranap.h \ meas_feed.h \ diff --git a/include/openbsc/gprs_sgsn.h b/include/openbsc/gprs_sgsn.h index fd86174be..52fba66d5 100644 --- a/include/openbsc/gprs_sgsn.h +++ b/include/openbsc/gprs_sgsn.h @@ -117,7 +117,7 @@ struct service_info { uint16_t pdp_status; }; -struct ue_conn_ctx; +struct ranap_ue_conn_ctx; /* According to TS 03.60, Table 5: SGSN MM and PDP Contexts */ /* Extended by 3GPP TS 23.060, Table 6: SGSN MM and PDP Contexts */ @@ -159,7 +159,7 @@ struct sgsn_mm_ctx { /* CSG Subscription Data */ /* LIPA Allowed */ /* Voice Support Match Indicator */ - struct ue_conn_ctx *ue_ctx; + struct ranap_ue_conn_ctx *ue_ctx; struct service_info service; } iu; /* VLR number */ diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h index 283b5498c..813164dbd 100644 --- a/include/openbsc/gsm_data.h +++ b/include/openbsc/gsm_data.h @@ -202,7 +202,7 @@ struct gsm_subscriber_connection { /* which Iu-CS connection, if any. */ struct { - struct ue_conn_ctx *ue_ctx; + struct ranap_ue_conn_ctx *ue_ctx; int integrity_protection; unsigned int mgcp_rtp_endpoint; uint8_t rab_id; diff --git a/include/openbsc/iu.h b/include/openbsc/iu.h deleted file mode 100644 index 65d41ad74..000000000 --- a/include/openbsc/iu.h +++ /dev/null @@ -1,83 +0,0 @@ -#pragma once - -#include -#include - -#include -#include -#include - -#include - -struct sgsn_pdp_ctx; -struct msgb; -struct gsm_auth_tuple; -struct osmo_sccp_addr; -struct osmo_ss7_instance; - -struct RANAP_RAB_SetupOrModifiedItemIEs_s; -struct RANAP_GlobalRNC_ID; -struct RANAP_Cause; - -/* Debugging switches from asn1c and osmo-iuh */ -extern int asn_debug; -extern int asn1_xer_print; - -struct ue_conn_ctx { - struct llist_head list; - /* TODO: It's not needed to store the full SCCP address for each - * UE. Rather than that, a pointer to the RNC should be far - * sufficient */ - struct osmo_sccp_addr sccp_addr; - uint32_t conn_id; - int integrity_active; - struct gprs_ra_id ra_id; - enum nsap_addr_enc rab_assign_addr_enc; -}; - -enum iu_event_type { - IU_EVENT_RAB_ASSIGN, - IU_EVENT_SECURITY_MODE_COMPLETE, - IU_EVENT_IU_RELEASE, /* An actual Iu Release message was received */ - IU_EVENT_LINK_INVALIDATED, /* A SUA link was lost or closed down */ - /* FIXME: maybe IU_EVENT_IU_RELEASE and IU_EVENT_LINK_INVALIDATED - * should be combined to one generic event that simply means the - * ue_conn_ctx should no longer be used, for whatever reason. */ -}; - -extern const struct value_string iu_event_type_names[]; -static inline const char *iu_event_type_str(enum iu_event_type e) -{ - return get_value_string(iu_event_type_names, e); -} - -/* Implementations of iu_recv_cb_t shall find the ue_conn_ctx in msg->dst. */ -typedef int (* iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id, - /* TODO "gprs_" in generic CS+PS domain ^ */ - uint16_t *sai); - -typedef int (* iu_event_cb_t )(struct ue_conn_ctx *ue_ctx, - enum iu_event_type type, void *data); - -typedef int (* iu_rab_ass_resp_cb_t )(struct ue_conn_ctx *ue_ctx, uint8_t rab_id, - struct RANAP_RAB_SetupOrModifiedItemIEs_s *setup_ies); - -int iu_init(void *ctx, struct osmo_sccp_instance *sccp, - iu_recv_cb_t iu_recv_cb, iu_event_cb_t iu_event_cb); - -int iu_tx(struct msgb *msg, uint8_t sapi); - -int iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac); -int iu_page_ps(const char *imsi, const uint32_t *ptmsi, uint16_t lac, uint8_t rac); - -int iu_rab_act(struct ue_conn_ctx *ue_ctx, struct msgb *msg); -int iu_rab_deact(struct ue_conn_ctx *ue_ctx, uint8_t rab_id); -int iu_tx_sec_mode_cmd(struct ue_conn_ctx *uectx, struct gsm_auth_tuple *tp, - int send_ck, int new_key); -int iu_tx_common_id(struct ue_conn_ctx *ue_ctx, const char *imsi); -int iu_tx_release(struct ue_conn_ctx *ctx, const struct RANAP_Cause *cause); - -void iu_vty_init(int iu_parent_node, enum nsap_addr_enc *rab_assign_addr_enc); -int iu_vty_config_write(struct vty *vty, const char *indent); - -struct ue_conn_ctx *ue_conn_ctx_alloc(struct osmo_sccp_addr *addr, uint32_t conn_id); diff --git a/include/openbsc/iucs.h b/include/openbsc/iucs.h index fb61a5cf1..b7d60645d 100644 --- a/include/openbsc/iucs.h +++ b/include/openbsc/iucs.h @@ -4,4 +4,4 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg, uint16_t *lac); struct gsm_subscriber_connection *subscr_conn_lookup_iu(struct gsm_network *network, - struct ue_conn_ctx *ue); + struct ranap_ue_conn_ctx *ue); diff --git a/include/openbsc/iucs_ranap.h b/include/openbsc/iucs_ranap.h index 748de23d7..c2ff5f90e 100644 --- a/include/openbsc/iucs_ranap.h +++ b/include/openbsc/iucs_ranap.h @@ -1,7 +1,7 @@ #pragma once struct gsm_network; -struct ue_conn_ctx; +struct ranap_ue_conn_ctx; 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); diff --git a/include/openbsc/sgsn.h b/include/openbsc/sgsn.h index 57b2978ff..6581ca1c4 100644 --- a/include/openbsc/sgsn.h +++ b/include/openbsc/sgsn.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -112,7 +113,7 @@ struct sgsn_config { } dcomp_v42bis; struct { - enum nsap_addr_enc rab_assign_addr_enc; + enum ranap_nsap_addr_enc rab_assign_addr_enc; } iu; }; diff --git a/src/Makefile.am b/src/Makefile.am index 7e9e1dca7..bd697385f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,13 +31,6 @@ SUBDIRS = \ libcommon-cs \ $(NULL) -# Conditional Libraries -if BUILD_IU -SUBDIRS += \ - libiu \ - $(NULL) -endif - # Programs SUBDIRS += \ osmo-msc \ diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index e05eb79ff..39a4c12a7 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -106,7 +106,6 @@ osmo_sgsn_LDADD = \ $(NULL) if BUILD_IU osmo_sgsn_LDADD += \ - $(top_builddir)/src/libiu/libiu.a \ $(LIBOSMOSIGTRAN_LIBS) \ $(LIBOSMORANAP_LIBS) \ $(LIBASN1C_LIBS) \ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 56e8c4fc8..a07f7ea79 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -52,6 +52,7 @@ #ifdef BUILD_IU #include #include +#include #endif #include @@ -67,7 +68,6 @@ #include #include #include -#include #include #include @@ -174,7 +174,7 @@ void mmctx_set_mm_state(struct sgsn_mm_ctx *ctx, enum gprs_pmm_state state) #ifdef BUILD_IU int sgsn_ranap_rab_ass_resp(struct sgsn_mm_ctx *ctx, RANAP_RAB_SetupOrModifiedItemIEs_t *setup_ies); -int sgsn_ranap_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type, void *data) +int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data) { struct sgsn_mm_ctx *mm; int rc = -1; @@ -188,14 +188,14 @@ int sgsn_ranap_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type, void * } switch (type) { - case IU_EVENT_RAB_ASSIGN: + case RANAP_IU_EVENT_RAB_ASSIGN: REQUIRE_MM rc = sgsn_ranap_rab_ass_resp(mm, (RANAP_RAB_SetupOrModifiedItemIEs_t *)data); break; - case IU_EVENT_IU_RELEASE: + case RANAP_IU_EVENT_IU_RELEASE: /* fall thru */ - case IU_EVENT_LINK_INVALIDATED: - /* Clean up ue_conn_ctx here */ + case RANAP_IU_EVENT_LINK_INVALIDATED: + /* Clean up ranap_ue_conn_ctx here */ if (mm) LOGMMCTXP(LOGL_INFO, mm, "IU release for imsi %s\n", mm->imsi); else @@ -205,7 +205,7 @@ int sgsn_ranap_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type, void * mmctx_set_pmm_state(mm, PMM_IDLE); rc = 0; break; - case IU_EVENT_SECURITY_MODE_COMPLETE: + case RANAP_IU_EVENT_SECURITY_MODE_COMPLETE: REQUIRE_MM /* Continue authentication here */ mm->iu.ue_ctx->integrity_active = 1; @@ -262,16 +262,16 @@ static int gsm48_gmm_sendmsg(struct msgb *msg, int command, rate_ctr_inc(&mm->ctrg->ctr[GMM_CTR_PKTS_SIG_OUT]); #ifdef BUILD_IU if (mm->ran_type == MM_CTX_T_UTRAN_Iu) - return iu_tx(msg, GPRS_SAPI_GMM); + return ranap_iu_tx(msg, GPRS_SAPI_GMM); #endif } #ifdef BUILD_IU - /* In Iu mode, msg->dst contains the ue_conn_ctx pointer, in Gb mode + /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb mode * dst is empty. */ /* FIXME: have a more explicit indicator for Iu messages */ if (msg->dst) - return iu_tx(msg, GPRS_SAPI_GMM); + return ranap_iu_tx(msg, GPRS_SAPI_GMM); #endif /* caller needs to provide TLLI, BVCI and NSEI */ @@ -1048,7 +1048,7 @@ static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx) /* The MS is authorized */ #ifdef BUILD_IU if (ctx->ran_type == MM_CTX_T_UTRAN_Iu && !ctx->iu.ue_ctx->integrity_active) { - rc = iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet, 0, ctx->iu.new_key); + rc = ranap_iu_tx_sec_mode_cmd(ctx->iu.ue_ctx, &ctx->auth_triplet.vec, 0, ctx->iu.new_key); ctx->iu.new_key = 0; return rc; } @@ -1259,14 +1259,14 @@ static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg, * with a foreign TLLI (P-TMSI that was allocated to the MS before), * or with random TLLI. */ - /* In Iu mode, msg->dst contains the ue_conn_ctx pointer, in Gb mode + /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb mode * dst is empty. */ /* FIXME: have a more explicit indicator for Iu messages */ if (!msg->dst) { /* Gb mode */ cid = bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); } else - ra_id = ((struct ue_conn_ctx*)msg->dst)->ra_id; + ra_id = ((struct ranap_ue_conn_ctx*)msg->dst)->ra_id; /* MS network capability 10.5.5.12 */ msnc_len = *cur++; @@ -1627,7 +1627,7 @@ static int gsm48_rx_gmm_ra_upd_req(struct sgsn_mm_ctx *mmctx, struct msgb *msg, * is an optimization to avoid the RA reject (impl detached) * below, which will cause a new attach cycle. */ /* Look-up the MM context based on old RA-ID and TLLI */ - /* In Iu mode, msg->dst contains the ue_conn_ctx pointer, in Gb + /* In Iu mode, msg->dst contains the ranap_ue_conn_ctx pointer, in Gb * mode dst is empty. */ /* FIXME: have a more explicit indicator for Iu messages */ if (!msg->dst) { @@ -2905,12 +2905,12 @@ int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp) { struct msgb *msg; struct sgsn_mm_ctx *mm = pdp->mm; - struct ue_conn_ctx *uectx; + struct ranap_ue_conn_ctx *uectx; uint32_t ggsn_ip; bool use_x213_nsap; uectx = mm->iu.ue_ctx; - 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); /* Get the IP address for ggsn user plane */ memcpy(&ggsn_ip, pdp->lib->gsnru.v, pdp->lib->gsnru.l); @@ -2923,6 +2923,6 @@ int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp) msg = ranap_new_msg_rab_assign_data(rab_id, ggsn_ip, pdp->lib->teid_gn, use_x213_nsap); msg->l2h = msg->data; - return iu_rab_act(uectx, msg); + return ranap_iu_rab_act(uectx, msg); } #endif diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 18625aefe..340fcb08d 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -39,7 +40,6 @@ #include #include #include "openbsc/gprs_llc.h" -#include #include diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 7595bf83c..1da31d292 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -52,7 +52,7 @@ #include #ifdef BUILD_IU -#include +#include #include #endif @@ -533,7 +533,7 @@ static int delete_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) } else { #ifdef BUILD_IU /* Deactivate radio bearer */ - iu_rab_deact(pctx->mm->iu.ue_ctx, 1); + ranap_iu_rab_deact(pctx->mm->iu.ue_ctx, 1); #else return -ENOTSUP; #endif @@ -672,7 +672,7 @@ static int cb_data_ind(struct pdp_t *lib, void *packet, unsigned int len) #ifdef BUILD_IU /* Ignore the packet for now and page the UE to get the RAB * reestablished */ - iu_page_ps(mm->imsi, &mm->p_tmsi, mm->ra.lac, mm->ra.rac); + ranap_iu_page_ps(mm->imsi, &mm->p_tmsi, mm->ra.lac, mm->ra.rac); return 0; #else diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c index 52c300cee..5af23321a 100644 --- a/src/gprs/sgsn_main.c +++ b/src/gprs/sgsn_main.c @@ -50,13 +50,14 @@ #include +#include + #include #include #include #include #include #include -#include #include #include @@ -318,7 +319,7 @@ static const struct log_info gprs_log_info = { .num_cat = ARRAY_SIZE(gprs_categories), }; -int sgsn_ranap_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type, void *data); +int sgsn_ranap_iu_event(struct ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data); int main(int argc, char **argv) { @@ -446,7 +447,7 @@ int main(int argc, char **argv) return 8; } - iu_init(tall_bsc_ctx, sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event); + ranap_iu_init(tall_bsc_ctx, DRANAP, "OsmoSGSN-IuPS", sccp, gsm0408_gprs_rcvmsg_iu, sgsn_ranap_iu_event); #endif if (daemonize) { diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 2ec200bd3..77eb32bb6 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -47,7 +47,7 @@ #include "../../bscconfig.h" #ifdef BUILD_IU -#include +#include #endif static struct sgsn_config *g_cfg = NULL; @@ -303,7 +303,7 @@ static int config_write_sgsn(struct vty *vty) } else vty_out(vty, " no compression v42bis%s", VTY_NEWLINE); - iu_vty_config_write(vty, " "); + ranap_iu_vty_config_write(vty, " "); return CMD_SUCCESS; } @@ -1294,7 +1294,7 @@ int sgsn_vty_init(struct sgsn_config *cfg) install_element(SGSN_NODE, &cfg_comp_v42bisp_cmd); #ifdef BUILD_IU - iu_vty_init(SGSN_NODE, &g_cfg->iu.rab_assign_addr_enc); + ranap_iu_vty_init(SGSN_NODE, &g_cfg->iu.rab_assign_addr_enc); #endif return 0; } diff --git a/src/libiu/Makefile.am b/src/libiu/Makefile.am deleted file mode 100644 index e5f9e2751..000000000 --- a/src/libiu/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(COVERAGE_CFLAGS) \ - $(LIBCRYPTO_CFLAGS) \ - $(LIBASN1C_CFLAGS) \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOVTY_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(LIBOSMOSIGTRAN_CFLAGS) \ - $(LIBOSMORANAP_CFLAGS) \ - $(NULL) - -noinst_LIBRARIES = \ - libiu.a \ - $(NULL) - -libiu_a_SOURCES = \ - iu.c \ - iu_vty.c \ - $(NULL) - diff --git a/src/libiu/iu.c b/src/libiu/iu.c deleted file mode 100644 index 1bb530584..000000000 --- a/src/libiu/iu.c +++ /dev/null @@ -1,768 +0,0 @@ -/* Common parts of IuCS and IuPS interfaces implementation */ - -/* (C) 2016 by sysmocom s.f.m.c. GmbH - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include - -/* Parsed global RNC id. See also struct RANAP_GlobalRNC_ID, and note that the - * PLMN identity is a BCD representation of the MCC and MNC. - * See iu_grnc_id_parse(). */ -struct iu_grnc_id { - uint16_t mcc; - uint16_t mnc; - uint16_t rnc_id; -}; - -/* A remote RNC (Radio Network Controller, like BSC but for UMTS) that has - * called us and is currently reachable at the given osmo_sccp_addr. So, when we - * know a LAC for a subscriber, we can page it at the RNC matching that LAC or - * RAC. An HNB-GW typically presents itself as if it were a single RNC, even - * though it may have several RNCs in hNodeBs connected to it. Those will then - * share the same RNC id, which they actually receive and adopt from the HNB-GW - * in the HNBAP HNB REGISTER ACCEPT message. */ -struct iu_rnc { - struct llist_head entry; - - uint16_t rnc_id; - uint16_t lac; /* Location Area Code (used for CS and PS) */ - uint8_t rac; /* Routing Area Code (used for PS only) */ - struct osmo_sccp_addr sccp_addr; -}; - -void *talloc_iu_ctx; - -/* Implement the extern asn_debug from libasn1c to indicate whether to print - * asn.1 debug messages (see libasn1c). */ -int asn_debug = 0; - -/* Implement the extern asn1_xer_print to indicate whether the ASN.1 binary - * code decoded and encoded during Iu communication should be logged to stderr - * (see asn.1 generated code in osmo-iuh). */ -int asn1_xer_print = 0; - -void *talloc_asn1_ctx; - -iu_recv_cb_t global_iu_recv_cb = NULL; -iu_event_cb_t global_iu_event_cb = NULL; - -static LLIST_HEAD(ue_conn_ctx_list); -static LLIST_HEAD(rnc_list); - -static struct osmo_sccp_instance *g_sccp; -static struct osmo_sccp_user *g_scu; - -const struct value_string iu_event_type_names[] = { - OSMO_VALUE_STRING(IU_EVENT_RAB_ASSIGN), - OSMO_VALUE_STRING(IU_EVENT_SECURITY_MODE_COMPLETE), - OSMO_VALUE_STRING(IU_EVENT_IU_RELEASE), - OSMO_VALUE_STRING(IU_EVENT_LINK_INVALIDATED), - { 0, NULL } -}; - -struct ue_conn_ctx *ue_conn_ctx_alloc(struct osmo_sccp_addr *addr, uint32_t conn_id) -{ - struct ue_conn_ctx *ctx = talloc_zero(talloc_iu_ctx, struct ue_conn_ctx); - - ctx->sccp_addr = *addr; - ctx->conn_id = conn_id; - llist_add(&ctx->list, &ue_conn_ctx_list); - - return ctx; -} - -struct ue_conn_ctx *ue_conn_ctx_find(uint32_t conn_id) -{ - struct ue_conn_ctx *ctx; - - llist_for_each_entry(ctx, &ue_conn_ctx_list, list) { - if (ctx->conn_id == conn_id) - return ctx; - } - return NULL; -} - -static struct iu_rnc *iu_rnc_alloc(uint16_t rnc_id, uint16_t lac, uint8_t rac, - struct osmo_sccp_addr *addr) -{ - struct iu_rnc *rnc = talloc_zero(talloc_iu_ctx, struct iu_rnc); - - rnc->rnc_id = rnc_id; - rnc->lac = lac; - rnc->rac = rac; - rnc->sccp_addr = *addr; - llist_add(&rnc->entry, &rnc_list); - - LOGP(DRANAP, LOGL_NOTICE, "New RNC %d (LAC=%d RAC=%d)\n", - rnc->rnc_id, rnc->lac, rnc->rac); - - return rnc; -} - -static struct iu_rnc *iu_rnc_register(uint16_t rnc_id, uint16_t lac, - uint8_t rac, struct osmo_sccp_addr *addr) -{ - struct iu_rnc *rnc; - llist_for_each_entry(rnc, &rnc_list, entry) { - if (rnc->rnc_id != rnc_id) - continue; - - /* We have this RNC Id registered already. Make sure that the - * details match. */ - - /* TODO should a mismatch be an error? */ - if (rnc->lac != lac || rnc->rac != rac) - LOGP(DRANAP, LOGL_NOTICE, "RNC %d changes its details:" - " LAC=%d RAC=%d --> LAC=%d RAC=%d\n", - rnc->rnc_id, rnc->lac, rnc->rac, - lac, rac); - rnc->lac = lac; - rnc->rac = rac; - - if (addr && memcmp(&rnc->sccp_addr, addr, sizeof(*addr))) - LOGP(DRANAP, LOGL_NOTICE, "RNC %d on New SCCP Addr %s" - " (LAC=%d RAC=%d)\n", - rnc->rnc_id, osmo_sccp_addr_dump(addr), rnc->lac, rnc->rac); - rnc->sccp_addr = *addr; - return rnc; - } - - /* Not found, make a new one. */ - return iu_rnc_alloc(rnc_id, lac, rac, addr); -} - -/*********************************************************************** - * RANAP handling - ***********************************************************************/ - -int iu_rab_act(struct ue_conn_ctx *ue_ctx, struct msgb *msg) -{ - struct osmo_scu_prim *prim; - - /* wrap RANAP message in SCCP N-DATA.req */ - prim = (struct osmo_scu_prim *) msgb_push(msg, sizeof(*prim)); - prim->u.data.conn_id = ue_ctx->conn_id; - osmo_prim_init(&prim->oph, - SCCP_SAP_USER, - OSMO_SCU_PRIM_N_DATA, - PRIM_OP_REQUEST, - msg); - return osmo_sccp_user_sap_down(g_scu, &prim->oph); -} - -int iu_rab_deact(struct ue_conn_ctx *ue_ctx, uint8_t rab_id) -{ - /* FIXME */ - return -1; -} - -int iu_tx_sec_mode_cmd(struct ue_conn_ctx *uectx, struct gsm_auth_tuple *tp, - int send_ck, int new_key) -{ - struct osmo_scu_prim *prim; - struct msgb *msg; - - /* create RANAP message */ - msg = ranap_new_msg_sec_mod_cmd(tp->vec.ik, send_ck? tp->vec.ck : NULL, - new_key ? RANAP_KeyStatus_new : RANAP_KeyStatus_old); - msg->l2h = msg->data; - /* wrap RANAP message in SCCP N-DATA.req */ - prim = (struct osmo_scu_prim *) msgb_push(msg, sizeof(*prim)); - prim->u.data.conn_id = uectx->conn_id; - osmo_prim_init(&prim->oph, SCCP_SAP_USER, - OSMO_SCU_PRIM_N_DATA, - PRIM_OP_REQUEST, msg); - osmo_sccp_user_sap_down(g_scu, &prim->oph); - - return 0; -} - -int iu_tx_common_id(struct ue_conn_ctx *uectx, const char *imsi) -{ - struct msgb *msg; - struct osmo_scu_prim *prim; - - LOGP(DRANAP, LOGL_INFO, "Transmitting RANAP CommonID (SCCP conn_id %u)\n", - uectx->conn_id); - - msg = ranap_new_msg_common_id(imsi); - msg->l2h = msg->data; - prim = (struct osmo_scu_prim *) msgb_push(msg, sizeof(*prim)); - prim->u.data.conn_id = uectx->conn_id; - osmo_prim_init(&prim->oph, SCCP_SAP_USER, - OSMO_SCU_PRIM_N_DATA, - PRIM_OP_REQUEST, msg); - osmo_sccp_user_sap_down(g_scu, &prim->oph); - return 0; -} - -static int iu_grnc_id_parse(struct iu_grnc_id *dst, - struct RANAP_GlobalRNC_ID *src) -{ - /* The size is coming from arbitrary sender, check it gracefully */ - if (src->pLMNidentity.size != 3) { - LOGP(DRANAP, LOGL_ERROR, "Invalid PLMN Identity size:" - " should be 3, is %d\n", src->pLMNidentity.size); - return -1; - } - gsm48_mcc_mnc_from_bcd(&src->pLMNidentity.buf[0], - &dst->mcc, &dst->mnc); - dst->rnc_id = (uint16_t)src->rNC_ID; - return 0; -} - -#if 0 - -- not used at present -- -static int iu_grnc_id_compose(struct iu_grnc_id *src, - struct RANAP_GlobalRNC_ID *dst) -{ - /* The caller must ensure proper size */ - OSMO_ASSERT(dst->pLMNidentity.size == 3); - gsm48_mcc_mnc_to_bcd(&dst->pLMNidentity.buf[0], - src->mcc, src->mnc); - dst->rNC_ID = src->rnc_id; - return 0; -} -#endif - -static int ranap_handle_co_initial_ue(void *ctx, RANAP_InitialUE_MessageIEs_t *ies) -{ - struct ue_conn_ctx *ue_conn = ctx; - struct gprs_ra_id ra_id; - struct iu_grnc_id grnc_id; - uint16_t sai; - struct msgb *msg = msgb_alloc(256, "RANAP->NAS"); - - if (ranap_parse_lai(&ra_id, &ies->lai) != 0) { - LOGP(DRANAP, LOGL_ERROR, "Failed to parse RANAP LAI IE\n"); - return -1; - } - - if (ies->presenceMask & INITIALUE_MESSAGEIES_RANAP_RAC_PRESENT) { - ra_id.rac = asn1str_to_u8(&ies->rac); - } - - if (iu_grnc_id_parse(&grnc_id, &ies->globalRNC_ID) != 0) { - LOGP(DRANAP, LOGL_ERROR, - "Failed to parse RANAP Global-RNC-ID IE\n"); - return -1; - } - - sai = asn1str_to_u16(&ies->sai.sAC); - msgb_gmmh(msg) = msgb_put(msg, ies->nas_pdu.size); - memcpy(msgb_gmmh(msg), ies->nas_pdu.buf, ies->nas_pdu.size); - - /* Make sure we know the RNC Id and LAC+RAC coming in on this connection. */ - iu_rnc_register(grnc_id.rnc_id, ra_id.lac, ra_id.rac, &ue_conn->sccp_addr); - ue_conn->ra_id = ra_id; - - /* Feed into the MM layer */ - msg->dst = ctx; - global_iu_recv_cb(msg, &ra_id, &sai); - - msgb_free(msg); - - return 0; -} - -static int ranap_handle_co_dt(void *ctx, RANAP_DirectTransferIEs_t *ies) -{ - struct gprs_ra_id _ra_id, *ra_id = NULL; - uint16_t _sai, *sai = NULL; - struct msgb *msg = msgb_alloc(256, "RANAP->NAS"); - - if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_LAI_PRESENT) { - if (ranap_parse_lai(&_ra_id, &ies->lai) != 0) { - LOGP(DRANAP, LOGL_ERROR, "Failed to parse RANAP LAI IE\n"); - return -1; - } - ra_id = &_ra_id; - if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_RAC_PRESENT) { - _ra_id.rac = asn1str_to_u8(&ies->rac); - } - if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_SAI_PRESENT) { - _sai = asn1str_to_u16(&ies->sai.sAC); - sai = &_sai; - } - } - - msgb_gmmh(msg) = msgb_put(msg, ies->nas_pdu.size); - memcpy(msgb_gmmh(msg), ies->nas_pdu.buf, ies->nas_pdu.size); - - /* Feed into the MM/CC/SMS-CP layer */ - msg->dst = ctx; - global_iu_recv_cb(msg, ra_id, sai); - - msgb_free(msg); - - return 0; -} - -static int ranap_handle_co_err_ind(void *ctx, RANAP_ErrorIndicationIEs_t *ies) -{ - if (ies->presenceMask & ERRORINDICATIONIES_RANAP_CAUSE_PRESENT) - LOGP(DRANAP, LOGL_ERROR, "Rx Error Indication (%s)\n", - ranap_cause_str(&ies->cause)); - else - LOGP(DRANAP, LOGL_ERROR, "Rx Error Indication\n"); - - return 0; -} - -int iu_tx(struct msgb *msg_nas, uint8_t sapi) -{ - struct ue_conn_ctx *uectx = msg_nas->dst; - struct msgb *msg; - struct osmo_scu_prim *prim; - - LOGP(DRANAP, LOGL_INFO, "Transmitting L3 Message as RANAP DT (SCCP conn_id %u)\n", - uectx->conn_id); - - msg = ranap_new_msg_dt(sapi, msg_nas->data, msgb_length(msg_nas)); - msgb_free(msg_nas); - msg->l2h = msg->data; - prim = (struct osmo_scu_prim *) msgb_push(msg, sizeof(*prim)); - prim->u.data.conn_id = uectx->conn_id; - osmo_prim_init(&prim->oph, SCCP_SAP_USER, - OSMO_SCU_PRIM_N_DATA, - PRIM_OP_REQUEST, msg); - osmo_sccp_user_sap_down(g_scu, &prim->oph); - return 0; -} - -/* Send Iu Release for the given UE connection. - * If cause is NULL, the standard "No remaining RAB" cause is sent, otherwise - * the provided cause. */ -int iu_tx_release(struct ue_conn_ctx *ctx, const struct RANAP_Cause *cause) -{ - struct msgb *msg; - struct osmo_scu_prim *prim; - static const struct RANAP_Cause default_cause = { - .present = RANAP_Cause_PR_radioNetwork, - .choice.radioNetwork = RANAP_CauseRadioNetwork_no_remaining_rab, - }; - - if (!cause) - cause = &default_cause; - - msg = ranap_new_msg_iu_rel_cmd(cause); - msg->l2h = msg->data; - prim = (struct osmo_scu_prim *) msgb_push(msg, sizeof(*prim)); - prim->u.data.conn_id = ctx->conn_id; - osmo_prim_init(&prim->oph, SCCP_SAP_USER, - OSMO_SCU_PRIM_N_DATA, - PRIM_OP_REQUEST, msg); - return osmo_sccp_user_sap_down(g_scu, &prim->oph); -} - -static int ranap_handle_co_iu_rel_req(struct ue_conn_ctx *ctx, RANAP_Iu_ReleaseRequestIEs_t *ies) -{ - LOGP(DRANAP, LOGL_INFO, "Received Iu Release Request, Sending Release Command\n"); - iu_tx_release(ctx, &ies->cause); - return 0; -} - -static int ranap_handle_co_rab_ass_resp(struct ue_conn_ctx *ctx, RANAP_RAB_AssignmentResponseIEs_t *ies) -{ - int rc = -1; - - LOGP(DRANAP, LOGL_INFO, - "Rx RAB Assignment Response for UE conn_id %u\n", ctx->conn_id); - if (ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT) { - /* TODO: Iterate over list of SetupOrModifiedList IEs and handle each one */ - RANAP_IE_t *ranap_ie = ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[0]; - RANAP_RAB_SetupOrModifiedItemIEs_t setup_ies; - - rc = ranap_decode_rab_setupormodifieditemies_fromlist(&setup_ies, &ranap_ie->value); - if (rc) { - LOGP(DRANAP, LOGL_ERROR, "Error in ranap_decode_rab_setupormodifieditemies()\n"); - return rc; - } - - rc = global_iu_event_cb(ctx, IU_EVENT_RAB_ASSIGN, &setup_ies); - - ranap_free_rab_setupormodifieditemies(&setup_ies); - } - /* FIXME: handle RAB Ass failure? */ - - return rc; -} - -/* Entry point for connection-oriented RANAP message */ -static void cn_ranap_handle_co(void *ctx, ranap_message *message) -{ - int rc; - - LOGP(DRANAP, LOGL_NOTICE, "handle_co(dir=%u, proc=%u)\n", message->direction, message->procedureCode); - - switch (message->direction) { - case RANAP_RANAP_PDU_PR_initiatingMessage: - switch (message->procedureCode) { - case RANAP_ProcedureCode_id_InitialUE_Message: - rc = ranap_handle_co_initial_ue(ctx, &message->msg.initialUE_MessageIEs); - break; - case RANAP_ProcedureCode_id_DirectTransfer: - rc = ranap_handle_co_dt(ctx, &message->msg.directTransferIEs); - break; - case RANAP_ProcedureCode_id_ErrorIndication: - rc = ranap_handle_co_err_ind(ctx, &message->msg.errorIndicationIEs); - break; - case RANAP_ProcedureCode_id_Iu_ReleaseRequest: - /* Iu Release Request */ - rc = ranap_handle_co_iu_rel_req(ctx, &message->msg.iu_ReleaseRequestIEs); - break; - default: - LOGP(DRANAP, LOGL_ERROR, "Received Initiating Message: unknown Procedure Code %d\n", - message->procedureCode); - rc = -1; - break; - } - break; - case RANAP_RANAP_PDU_PR_successfulOutcome: - switch (message->procedureCode) { - case RANAP_ProcedureCode_id_SecurityModeControl: - /* Security Mode Complete */ - rc = global_iu_event_cb(ctx, IU_EVENT_SECURITY_MODE_COMPLETE, NULL); - break; - case RANAP_ProcedureCode_id_Iu_Release: - /* Iu Release Complete */ - rc = global_iu_event_cb(ctx, IU_EVENT_IU_RELEASE, NULL); - if (rc) { - LOGP(DRANAP, LOGL_ERROR, "Iu Release event: Iu Event callback returned %d\n", - rc); - } - break; - default: - LOGP(DRANAP, LOGL_ERROR, "Received Successful Outcome: unknown Procedure Code %d\n", - message->procedureCode); - rc = -1; - break; - } - break; - case RANAP_RANAP_PDU_PR_outcome: - switch (message->procedureCode) { - case RANAP_ProcedureCode_id_RAB_Assignment: - /* RAB Assignment Response */ - rc = ranap_handle_co_rab_ass_resp(ctx, &message->msg.raB_AssignmentResponseIEs); - break; - default: - LOGP(DRANAP, LOGL_ERROR, "Received Outcome: unknown Procedure Code %d\n", - message->procedureCode); - rc = -1; - break; - } - break; - case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - default: - LOGP(DRANAP, LOGL_ERROR, "Received Unsuccessful Outcome: Procedure Code %d\n", - message->procedureCode); - rc = -1; - break; - } - - if (rc) { - LOGP(DRANAP, LOGL_ERROR, "Error in cn_ranap_handle_co (%d)\n", - rc); - /* TODO handling of the error? */ - } -} - -static int ranap_handle_cl_reset_req(void *ctx, RANAP_ResetIEs_t *ies) -{ - /* FIXME: send reset response */ - return -1; -} - -static int ranap_handle_cl_err_ind(void *ctx, RANAP_ErrorIndicationIEs_t *ies) -{ - if (ies->presenceMask & ERRORINDICATIONIES_RANAP_CAUSE_PRESENT) - LOGP(DRANAP, LOGL_ERROR, "Rx Error Indication (%s)\n", - ranap_cause_str(&ies->cause)); - else - LOGP(DRANAP, LOGL_ERROR, "Rx Error Indication\n"); - - return 0; -} - -/* Entry point for connection-less RANAP message */ -static void cn_ranap_handle_cl(void *ctx, ranap_message *message) -{ - int rc; - - switch (message->direction) { - case RANAP_RANAP_PDU_PR_initiatingMessage: - switch (message->procedureCode) { - case RANAP_ProcedureCode_id_Reset: - /* received reset.req, send reset.resp */ - rc = ranap_handle_cl_reset_req(ctx, &message->msg.resetIEs); - break; - case RANAP_ProcedureCode_id_ErrorIndication: - rc = ranap_handle_cl_err_ind(ctx, &message->msg.errorIndicationIEs); - break; - default: - rc = -1; - break; - } - break; - case RANAP_RANAP_PDU_PR_successfulOutcome: - case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - case RANAP_RANAP_PDU_PR_outcome: - default: - rc = -1; - break; - } - - if (rc) { - LOGP(DRANAP, LOGL_ERROR, "Error in cn_ranap_handle_cl (%d)\n", - rc); - /* TODO handling of the error? */ - } -} - -/*********************************************************************** - * Paging - ***********************************************************************/ - -struct osmo_sccp_addr local_sccp_addr = { - .presence = OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC, - .ri = OSMO_SCCP_RI_SSN_PC, - .ssn = OSMO_SCCP_SSN_RANAP, - .pc = 1, -}; - -/* Send a paging command down a given SCCP User. tmsi and paging_cause are - * optional and may be passed NULL and 0, respectively, to disable their use. - * See enum RANAP_PagingCause. - * - * If TMSI is given, the IMSI is not sent over the air interface. Nevertheless, - * the IMSI is still required for resolution in the HNB-GW and/or(?) RNC. */ -static int iu_tx_paging_cmd(struct osmo_sccp_addr *called_addr, - const char *imsi, const uint32_t *tmsi, - bool is_ps, uint32_t paging_cause) -{ - struct msgb *msg; - msg = ranap_new_msg_paging_cmd(imsi, tmsi, is_ps? 1 : 0, paging_cause); - msg->l2h = msg->data; - osmo_sccp_tx_unitdata_msg(g_scu, &local_sccp_addr, called_addr, msg); - return 0; -} - -static int iu_page(const char *imsi, const uint32_t *tmsi_or_ptimsi, - uint16_t lac, uint8_t rac, bool is_ps) -{ - struct iu_rnc *rnc; - int pagings_sent = 0; - - if (tmsi_or_ptimsi) { - LOGP(DRANAP, LOGL_DEBUG, "%s: Looking for RNCs to page for IMSI %s" - " (paging will use %s %x)\n", - is_ps? "IuPS" : "IuCS", - imsi, - is_ps? "PTMSI" : "TMSI", - *tmsi_or_ptimsi); - } else { - LOGP(DRANAP, LOGL_DEBUG, "%s: Looking for RNCs to page for IMSI %s" - " (paging will use IMSI)\n", - is_ps? "IuPS" : "IuCS", - imsi - ); - } - - llist_for_each_entry(rnc, &rnc_list, entry) { - if (rnc->lac != lac) - continue; - if (is_ps && rnc->rac != rac) - continue; - - /* Found a match! */ - if (iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi_or_ptimsi, is_ps, 0) - == 0) { - LOGP(DRANAP, LOGL_DEBUG, - "%s: Paged for IMSI %s on RNC %d, on SCCP addr %s\n", - is_ps? "IuPS" : "IuCS", - imsi, rnc->rnc_id, osmo_sccp_addr_dump(&rnc->sccp_addr)); - pagings_sent ++; - } - } - - /* Some logging... */ - if (pagings_sent > 0) { - LOGP(DRANAP, LOGL_DEBUG, - "%s: %d RNCs were paged for IMSI %s.\n", - is_ps? "IuPS" : "IuCS", - pagings_sent, imsi); - } - else { - if (is_ps) { - LOGP(DRANAP, LOGL_ERROR, "IuPS: Found no RNC to page for" - " LAC %d RAC %d (would have paged IMSI %s)\n", - lac, rac, imsi); - } - else { - LOGP(DRANAP, LOGL_ERROR, "IuCS: Found no RNC to page for" - " LAC %d (would have paged IMSI %s)\n", - lac, imsi); - } - } - - return pagings_sent; -} - -int iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) -{ - return iu_page(imsi, tmsi, lac, 0, false); -} - -int iu_page_ps(const char *imsi, const uint32_t *ptmsi, uint16_t lac, uint8_t rac) -{ - return iu_page(imsi, ptmsi, lac, rac, true); -} - - -/*********************************************************************** - * - ***********************************************************************/ - -int tx_unitdata(struct osmo_sccp_user *scu); -int tx_conn_req(struct osmo_sccp_user *scu, uint32_t conn_id); - -struct osmo_prim_hdr *make_conn_req(uint32_t conn_id); -struct osmo_prim_hdr *make_dt1_req(uint32_t conn_id, const uint8_t *data, unsigned int len); - -struct osmo_prim_hdr *make_conn_resp(struct osmo_scu_connect_param *param) -{ - struct msgb *msg = msgb_alloc(1024, "conn_resp"); - struct osmo_scu_prim *prim; - - prim = (struct osmo_scu_prim *) msgb_put(msg, sizeof(*prim)); - osmo_prim_init(&prim->oph, SCCP_SAP_USER, - OSMO_SCU_PRIM_N_CONNECT, - PRIM_OP_RESPONSE, msg); - memcpy(&prim->u.connect, param, sizeof(prim->u.connect)); - return &prim->oph; -} - -static int sccp_sap_up(struct osmo_prim_hdr *oph, void *_scu) -{ - struct osmo_sccp_user *scu = _scu; - struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; - struct osmo_prim_hdr *resp = NULL; - int rc; - struct ue_conn_ctx *ue; - - DEBUGP(DRANAP, "sccp_sap_up(%s)\n", osmo_scu_prim_name(oph)); - - switch (OSMO_PRIM_HDR(oph)) { - case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): - /* confirmation of outbound connection */ - rc = -1; - break; - case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): - /* indication of new inbound connection request*/ - DEBUGP(DRANAP, "N-CONNECT.ind(X->%u)\n", prim->u.connect.conn_id); - if (/* prim->u.connect.called_addr.ssn != OSMO_SCCP_SSN_RANAP || */ - !msgb_l2(oph->msg) || msgb_l2len(oph->msg) == 0) { - LOGP(DRANAP, LOGL_NOTICE, - "Received invalid N-CONNECT.ind\n"); - return 0; - } - ue = ue_conn_ctx_alloc(&prim->u.connect.calling_addr, prim->u.connect.conn_id); - /* first ensure the local SCCP socket is ACTIVE */ - resp = make_conn_resp(&prim->u.connect); - osmo_sccp_user_sap_down(scu, resp); - /* then handle the RANAP payload */ - rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); - break; - case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): - /* indication of disconnect */ - DEBUGP(DRANAP, "N-DISCONNECT.ind(%u)\n", - prim->u.disconnect.conn_id); - ue = ue_conn_ctx_find(prim->u.disconnect.conn_id); - rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); - break; - case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): - /* connection-oriented data received */ - DEBUGP(DRANAP, "N-DATA.ind(%u, %s)\n", prim->u.data.conn_id, - osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg))); - /* resolve UE context */ - ue = ue_conn_ctx_find(prim->u.data.conn_id); - rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); - break; - case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): - /* connection-less data received */ - DEBUGP(DRANAP, "N-UNITDATA.ind(%s)\n", - osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg))); - rc = ranap_cn_rx_cl(cn_ranap_handle_cl, scu, msgb_l2(oph->msg), msgb_l2len(oph->msg)); - break; - default: - rc = -1; - break; - } - - msgb_free(oph->msg); - return rc; -} - -int iu_init(void *ctx, struct osmo_sccp_instance *sccp, - iu_recv_cb_t iu_recv_cb, iu_event_cb_t iu_event_cb) -{ - talloc_iu_ctx = talloc_named_const(ctx, 1, "iu"); - talloc_asn1_ctx = talloc_named_const(talloc_iu_ctx, 1, "asn1"); - - global_iu_recv_cb = iu_recv_cb; - global_iu_event_cb = iu_event_cb; - g_sccp = sccp; - g_scu = osmo_sccp_user_bind(g_sccp, "OsmoMSC-Iu", sccp_sap_up, OSMO_SCCP_SSN_RANAP); - - return 0; -} - diff --git a/src/libiu/iu_vty.c b/src/libiu/iu_vty.c deleted file mode 100644 index 0b42e3484..000000000 --- a/src/libiu/iu_vty.c +++ /dev/null @@ -1,130 +0,0 @@ -/* OpenBSC Iu related interface to quagga VTY */ -/* (C) 2016 by sysmocom s.m.f.c. GmbH - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include - -#include -#include -#include -#include -#include - -#include - -static enum nsap_addr_enc *g_rab_assign_addr_enc = NULL; - -DEFUN(logging_asn_debug, - logging_asn_debug_cmd, - "logging asn1-debug (1|0)", - LOGGING_STR - "Log ASN.1 debug messages to stderr\n" - "Log ASN.1 debug messages to stderr\n" - "Do not log ASN.1 debug messages to stderr\n") -{ - asn_debug = atoi(argv[0]); - return CMD_SUCCESS; -} - -DEFUN(logging_asn_xer_print, - logging_asn_xer_print_cmd, - "logging asn1-xer-print (1|0)", - LOGGING_STR - "Log human readable representations of all ASN.1 messages to stderr\n" - "Log decoded ASN.1 messages to stderr\n" - "Do not log decoded ASN.1 messages to stderr\n") -{ - asn1_xer_print = atoi(argv[0]); - return CMD_SUCCESS; -} - -#define IU_STR "Iu interface protocol options\n" -DEFUN(cfg_iu_rab_assign_addr_enc, cfg_iu_rab_assign_addr_enc_cmd, - "iu rab-assign-addr-enc (x213|v4raw)", - IU_STR - "Choose RAB Assignment's Transport Layer Address encoding\n" - "ITU-T X.213 compliant address encoding (default)\n" - "32bit length raw IPv4 address (for ip.access nano3G)\n") -{ - if (!g_rab_assign_addr_enc) { - vty_out(vty, "%%RAB Assignment Transport Layer Address" - " encoding not available%s", VTY_NEWLINE); - return CMD_WARNING; - } - - if (strcmp(argv[0], "v4raw") == 0) - *g_rab_assign_addr_enc = NSAP_ADDR_ENC_V4RAW; - else - *g_rab_assign_addr_enc = NSAP_ADDR_ENC_X213; - return CMD_SUCCESS; -} - -extern struct osmo_sccp_addr local_sccp_addr; - -DEFUN(cfg_iu_local_addr_pc, cfg_iu_local_addr_pc_cmd, - "iu local-address point-code PC", - IU_STR "Local SCCP Address\n") -{ - local_sccp_addr.presence = OSMO_SCCP_ADDR_T_PC | OSMO_SCCP_ADDR_T_SSN; - local_sccp_addr.ri = OSMO_SCCP_RI_SSN_PC; - local_sccp_addr.pc = osmo_ss7_pointcode_parse(NULL, argv[0]); - - return CMD_SUCCESS; -} - -/* TODO: GT address configuration, in line with 4.5.1.1.1 of TS 25.410 */ - -int iu_vty_config_write(struct vty *vty, const char *indent) -{ - if (!g_rab_assign_addr_enc) { - vty_out(vty, "%%RAB Assignment Transport Layer Address" - " encoding not available%s", VTY_NEWLINE); - return CMD_WARNING; - } - - switch (*g_rab_assign_addr_enc) { - case NSAP_ADDR_ENC_V4RAW: - vty_out(vty, "%siu rab-assign-addr-enc v4raw%s", indent, - VTY_NEWLINE); - break; - case NSAP_ADDR_ENC_X213: - /* default value, no need to write anything */ - break; - default: - LOGP(0, LOGL_ERROR, "Invalid value for" - " net.iu.rab_assign_addr_enc: %d\n", - *g_rab_assign_addr_enc); - return CMD_WARNING; - } - - vty_out(vty, "%siu local-address point-code %s%s", indent, - osmo_ss7_pointcode_print(NULL, local_sccp_addr.pc), VTY_NEWLINE); - - return CMD_SUCCESS; -} - -void iu_vty_init(int iu_parent_node, enum nsap_addr_enc *rab_assign_addr_enc) -{ - g_rab_assign_addr_enc = rab_assign_addr_enc; - - install_element(CFG_LOG_NODE, &logging_asn_debug_cmd); - install_element(CFG_LOG_NODE, &logging_asn_xer_print_cmd); - install_element(iu_parent_node, &cfg_iu_rab_assign_addr_enc_cmd); - install_element(iu_parent_node, &cfg_iu_local_addr_pc_cmd); -} 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 #include #include +#include #include #include #include #include -#include #include #include #include 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 #include #include +#include #include -#include #include #include @@ -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 +#include + #include #include #include @@ -40,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -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 #include +#include #include #include -#include #include #include #include /* 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 #include +#include #include #include #include -#include #include #include #include @@ -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 +#include #include #include #include -#include #include #include #include @@ -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 #include +#include #include #include #include #include -#include 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 + #include #include #include @@ -28,7 +30,6 @@ #include #include #include -#include #include 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 #include #include +#include #include #include #include #include #include -#include #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. */ diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am index 1e6a35b86..97bd999cf 100644 --- a/src/osmo-msc/Makefile.am +++ b/src/osmo-msc/Makefile.am @@ -35,7 +35,6 @@ osmo_msc_LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libvlr/libvlr.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libiu/libiu.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libmgcp/libmgcp.a \ diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 06e228aa2..6e3f20b6d 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -68,8 +68,8 @@ #include #include +#include #include -#include #include #include #include @@ -329,11 +329,11 @@ static int rcvmsg_iu_cs(struct msgb *msg, struct gprs_ra_id *ra_id, /* FIXME gpr return gsm0408_rcvmsg_iucs(msc_network, msg, ra_id? &ra_id->lac : NULL); } -static int rx_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type, +static int rx_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data) { DEBUGP(DIUCS, "got IuCS event %u: %s\n", type, - iu_event_type_str(type)); + ranap_iu_event_type_str(type)); return iucs_rx_ranap_event(msc_network, ctx, type, data); } @@ -508,7 +508,7 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i } /* Set up IuCS */ - iu_init(tall_msc_ctx, msc_network->sccp, rcvmsg_iu_cs, rx_iu_event); + ranap_iu_init(tall_msc_ctx, DRANAP, "OsmoMSC-IuCS", msc_network->sccp, rcvmsg_iu_cs, rx_iu_event); /* Set up A interface */ a_init(msc_network->sccp, msc_network); diff --git a/tests/libiudummy/iudummy.c b/tests/libiudummy/iudummy.c index f764253b0..d42368744 100644 --- a/tests/libiudummy/iudummy.c +++ b/tests/libiudummy/iudummy.c @@ -6,32 +6,33 @@ #include struct msgb; -struct ue_conn_ctx; +struct ranap_ue_conn_ctx; struct gsm_auth_tuple; struct RANAP_Cause; struct osmo_sccp_addr; +struct osmo_auth_vector; -int iu_tx(struct msgb *msg, uint8_t sapi) +int ranap_iu_tx(struct msgb *msg, uint8_t sapi) { LOGP(DLGLOBAL, LOGL_INFO, "iu_tx() dummy called, NOT transmitting %d bytes: %s\n", msg->len, osmo_hexdump(msg->data, msg->len)); return 0; } -int iu_tx_sec_mode_cmd(struct ue_conn_ctx *uectx, struct gsm_auth_tuple *tp, - int send_ck) +int ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, + int send_ck) { LOGP(DLGLOBAL, LOGL_INFO, "iu_tx_sec_mode_cmd() dummy called, NOT transmitting Security Mode Command\n"); return 0; } -int iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) +int ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) { LOGP(DLGLOBAL, LOGL_INFO, "iu_page_cs() dummy called, NOT paging\n"); return 23; } -int iu_page_ps(const char *imsi, const uint32_t *ptmsi, uint16_t lac, uint8_t rac) +int ranap_iu_page_ps(const char *imsi, const uint32_t *ptmsi, uint16_t lac, uint8_t rac) { LOGP(DLGLOBAL, LOGL_INFO, "iu_page_ps() dummy called, NOT paging\n"); return 0; @@ -45,25 +46,25 @@ struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, return NULL; } -int iu_rab_act(struct ue_conn_ctx *ue_ctx, struct msgb *msg) +int ranap_iu_rab_act(struct ranap_ue_conn_ctx *ue_ctx, struct msgb *msg) { LOGP(DLGLOBAL, LOGL_INFO, "iu_rab_act() dummy called, NOT activating RAB\n"); return 0; } -int iu_tx_common_id(struct ue_conn_ctx *uectx, const char *imsi) +int ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *uectx, const char *imsi) { LOGP(DLGLOBAL, LOGL_INFO, "iu_tx_common_id() dummy called, NOT sending CommonID\n"); return 0; } -int iu_tx_release(struct ue_conn_ctx *ctx, const struct RANAP_Cause *cause) +int ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause) { LOGP(DLGLOBAL, LOGL_INFO, "iu_tx_release() dummy called, NOT sending Release\n"); return 0; } -struct ue_conn_ctx *ue_conn_ctx_alloc(struct osmo_sccp_addr *addr, uint32_t conn_id) +struct ranap_ue_conn_ctx *ranap_ue_conn_ctx_alloc(struct osmo_sccp_addr *addr, uint32_t conn_id) { LOGP(DLGLOBAL, LOGL_INFO, "ue_conn_ctx_alloc() dummy called, NOT allocating UE context\n"); return NULL; diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index ab0714ebf..a2b0f0889 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -65,8 +65,8 @@ LDFLAGS = \ -Wl,--wrap=gsup_client_send \ -Wl,--wrap=a_iface_tx_dtap \ -Wl,--wrap=a_iface_tx_paging \ - -Wl,--wrap=iu_tx \ - -Wl,--wrap=iu_page_cs \ + -Wl,--wrap=ranap_iu_tx \ + -Wl,--wrap=ranap_iu_page_cs \ -Wl,--wrap=msc_stop_paging \ -Wl,--wrap=gsm340_gen_scts \ -Wl,--wrap=RAND_bytes \ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 75786bac4..0a485b4a9 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -30,11 +30,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include "msc_vlr_tests.h" @@ -147,8 +147,8 @@ struct gsm_subscriber_connection *conn_new(void) conn->bts = the_bts; conn->via_ran = rx_from_ran; if (conn->via_ran == RAN_UTRAN_IU) { - struct ue_conn_ctx *ue_ctx = talloc_zero(conn, struct ue_conn_ctx); - *ue_ctx = (struct ue_conn_ctx){ + struct ranap_ue_conn_ctx *ue_ctx = talloc_zero(conn, struct ranap_ue_conn_ctx); + *ue_ctx = (struct ranap_ue_conn_ctx){ .conn_id = 42, }; conn->iu.ue_ctx = ue_ctx; @@ -290,9 +290,9 @@ int _paging_sent(enum ran_type via_ran, const char *imsi, uint32_t tmsi, uint32_ return 1; } -/* override, requires '-Wl,--wrap=iu_page_cs' */ -int __real_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac); -int __wrap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) +/* override, requires '-Wl,--wrap=ranap_iu_page_cs' */ +int __real_ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac); +int __wrap_ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) { return _paging_sent(RAN_UTRAN_IU, imsi, tmsi ? *tmsi : GSM_RESERVED_TMSI, lac); } @@ -461,9 +461,9 @@ int _validate_dtap(struct msgb *msg, enum ran_type to_ran) return 0; } -/* override, requires '-Wl,--wrap=iu_tx' */ -int __real_iu_tx(struct msgb *msg, uint8_t sapi); -int __wrap_iu_tx(struct msgb *msg, uint8_t sapi) +/* override, requires '-Wl,--wrap=ranap_iu_tx' */ +int __real_ranap_iu_tx(struct msgb *msg, uint8_t sapi); +int __wrap_ranap_iu_tx(struct msgb *msg, uint8_t sapi) { return _validate_dtap(msg, RAN_UTRAN_IU); } @@ -604,7 +604,7 @@ void ms_sends_security_mode_complete() OSMO_ASSERT(g_conn->iu.ue_ctx); /* TODO mock IEs or call vlr callback directly */ iucs_rx_ranap_event(g_conn->network, g_conn->iu.ue_ctx, - IU_EVENT_SECURITY_MODE_COMPLETE, + RANAP_IU_EVENT_SECURITY_MODE_COMPLETE, NULL); } diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index f1606cb96..ccb8f44f4 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -74,7 +74,6 @@ sgsn_test_LDADD = \ if BUILD_IU sgsn_test_LDADD += \ - $(top_builddir)/src/libiu/libiu.a \ $(LIBOSMORANAP_LIBS) \ $(LIBOSMOSIGTRAN_LIBS) \ $(LIBASN1C_LIBS) \ -- cgit v1.2.3