From 2da93fc05be36b4494f5903af727a044c2dccdd1 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 4 Oct 2017 08:14:16 +0800 Subject: [PATCH] Remove any references to RANAP and Iu This is a BSC, it has norelation to RANAP or Iu(h). Let's remove an references to it, and also the build dependency to libosmo-ranap-dev Change-Id: I517b9f69309b2ed0540dd6c186b3d4a2a03aed44 --- debian/control | 1 - include/osmocom/bsc/gsm_data.h | 14 ---------- include/osmocom/bsc/iu_dummy.h | 51 ---------------------------------- 3 files changed, 66 deletions(-) delete mode 100644 include/osmocom/bsc/iu_dummy.h diff --git a/debian/control b/debian/control index f931341fd..7b25ecce4 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,6 @@ Build-Depends: debhelper (>=9), libgtp-dev, libosmocore-dev, libosmo-sccp-dev, - libosmo-ranap-dev, libosmo-abis-dev, libosmo-netif-dev, libosmo-legacy-mgcp-dev diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4e56db56d..6814662b2 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -29,7 +29,6 @@ struct gsm_subscriber_group; struct bsc_subscr; struct vlr_instance; struct vlr_subscr; -struct ranap_ue_conn_ctx; struct gprs_ra_id; #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] @@ -201,12 +200,6 @@ struct gsm_subscriber_connection { uint16_t port_cn; } rtp; - /* which Iu-CS connection, if any. */ - struct { - struct ranap_ue_conn_ctx *ue_ctx; - uint8_t rab_id; - } iu; - struct { /* A pointer to the SCCP user that handles * the SCCP connections for this subscriber @@ -485,13 +478,6 @@ struct gsm_network { /* Periodic location update default value */ uint8_t t3212; - struct { - /* CS7 instance id number (set via VTY) */ - uint32_t cs7_instance; - int rab_assign_addr_enc; - struct osmo_sccp_instance *sccp; - } iu; - struct { /* CS7 instance id number (set via VTY) */ uint32_t cs7_instance; diff --git a/include/osmocom/bsc/iu_dummy.h b/include/osmocom/bsc/iu_dummy.h deleted file mode 100644 index d5e142801..000000000 --- a/include/osmocom/bsc/iu_dummy.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Trivial switch-off of external Iu dependencies, - * allowing to run full unit tests even when built without Iu support. */ - -/* - * (C) 2016,2017 by sysmocom s.f.m.c. GmbH - * - * Author: Neels Hofmeyr - * - * 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 - -struct msgb; -struct gsm_auth_tuple; -struct RANAP_Cause; -struct osmo_auth_vector; - -struct ranap_ue_conn_ctx { - struct llist_head list; - uint32_t conn_id; -}; - -int ranap_iu_tx(struct msgb *msg, uint8_t sapi); -int ranap_iu_tx_sec_mode_cmd(struct ranap_ue_conn_ctx *uectx, struct osmo_auth_vector *vec, - int send_ck); -int ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac); -int ranap_iu_page_ps(const char *imsi, const uint32_t *ptmsi, uint16_t lac, uint8_t rac); -struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, - uint16_t rtp_port, - bool use_x213_nsap); -int ranap_iu_rab_act(struct ranap_ue_conn_ctx *ue_ctx, struct msgb *msg); -int ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *uectx, const char *imsi); -int ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause);