diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-01-25 00:26:59 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-01-25 00:38:06 +0100 |
commit | 4bd35d4460cc24f1c70e26b41ee5d804ba2ad7c4 (patch) | |
tree | 70845f48f9d9668b4ec61d0852ae99ea33f73cb8 | |
parent | 51c65e8230bf3df74077ba7d023cc6f5a12368f6 (diff) |
remove dead header files bsc_msc.h, bsc_msc_data.h and bsc_rll.h
Related: OS#2528
Change-Id: I13cc4513689af1d594952dd628738b1240560bb7
-rw-r--r-- | include/osmocom/msc/Makefile.am | 3 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_msc.h | 77 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_msc_data.h | 174 | ||||
-rw-r--r-- | include/osmocom/msc/bsc_rll.h | 19 | ||||
-rw-r--r-- | src/libcommon-cs/a_reset.c | 2 | ||||
-rw-r--r-- | src/libcommon/gsm_data.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_04_11.c | 1 | ||||
-rw-r--r-- | src/osmo-msc/msc_main.c | 1 |
8 files changed, 1 insertions, 277 deletions
diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index 9c82d2feb..7e86b1266 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -2,8 +2,6 @@ noinst_HEADERS = \ a_iface.h \ a_iface_bssap.h \ bsc_api.h \ - bsc_msc.h \ - bsc_rll.h \ common.h \ common_cs.h \ ctrl.h \ @@ -27,7 +25,6 @@ noinst_HEADERS = \ openbscdefines.h \ a_reset.h \ osmo_msc.h \ - bsc_msc_data.h \ rrlp.h \ signal.h \ silent_call.h \ diff --git a/include/osmocom/msc/bsc_msc.h b/include/osmocom/msc/bsc_msc.h deleted file mode 100644 index d649f76cd..000000000 --- a/include/osmocom/msc/bsc_msc.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Routines to talk to the MSC using the IPA Protocol */ -/* - * (C) 2010 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2010 by On-Waves - * 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 <http://www.gnu.org/licenses/>. - * - */ - -#ifndef BSC_MSC_H -#define BSC_MSC_H - -#include <osmocom/core/write_queue.h> -#include <osmocom/core/timer.h> -#include <osmocom/sigtran/sccp_sap.h> -#include <osmocom/msc/a_reset.h> - -#include <netinet/in.h> - -struct bsc_msc_dest { - struct llist_head list; - - char *ip; - int port; - int dscp; -}; - - -struct bsc_msc_connection { - /* FIXME: Remove stuff that is no longer needed! */ - struct osmo_wqueue write_queue; - int is_connected; - int is_authenticated; - int first_contact; - - struct llist_head *dests; - - const char *name; - - void (*connection_loss) (struct bsc_msc_connection *); - void (*connected) (struct bsc_msc_connection *); - struct osmo_timer_list reconnect_timer; - struct osmo_timer_list timeout_timer; - - struct msgb *pending_msg; - - /* Sigtran connection data */ - struct osmo_sccp_instance *sccp; - struct osmo_sccp_user *sccp_user; - struct osmo_sccp_addr g_calling_addr; - struct osmo_sccp_addr g_called_addr; - struct a_reset_ctx *reset; - - int conn_id_counter; -}; - -struct bsc_msc_connection *bsc_msc_create(void *ctx, struct llist_head *dest); -int bsc_msc_connect(struct bsc_msc_connection *); -void bsc_msc_schedule_connect(struct bsc_msc_connection *); - -void bsc_msc_lost(struct bsc_msc_connection *); - -struct msgb *bsc_msc_id_get_resp(int fixed, const char *token, const uint8_t *res, int len); - -#endif diff --git a/include/osmocom/msc/bsc_msc_data.h b/include/osmocom/msc/bsc_msc_data.h deleted file mode 100644 index 4a283d165..000000000 --- a/include/osmocom/msc/bsc_msc_data.h +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Data for the true BSC - * - * (C) 2010-2015 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2010-2015 by On-Waves - * 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 <http://www.gnu.org/licenses/>. - * - */ - -/* - * NOTE: This is about a *remote* MSC for OsmoBSC and is not part of libmsc. - */ - -#ifndef _OSMO_MSC_DATA_H -#define _OSMO_MSC_DATA_H - -#include "bsc_msc.h" - -#include <osmocom/core/timer.h> -#include <osmocom/gsm/protocol/gsm_04_08.h> - - -#include <osmocom/sigtran/osmo_ss7.h> -#include <osmocom/sigtran/sccp_sap.h> -#include <osmocom/sigtran/sccp_helpers.h> -#include <osmocom/sigtran/protocol/sua.h> -#include <osmocom/sigtran/protocol/m3ua.h> -#include <osmocom/core/fsm.h> - -#include <regex.h> - -struct osmo_bsc_rf; -struct gsm_network; - -struct gsm_audio_support { - uint8_t hr : 1, - ver : 7; -}; - -enum { - MSC_CON_TYPE_NORMAL, - MSC_CON_TYPE_LOCAL, -}; - -/*! /brief Information on a remote MSC for libbsc. - */ -struct bsc_msc_data { - struct llist_head entry; - - /* Back pointer */ - struct gsm_network *network; - - int allow_emerg; - int type; - - /* local call routing */ - char *local_pref; - regex_t local_pref_reg; - - - /* Connection data */ - char *bsc_token; - uint8_t bsc_key[16]; - uint8_t bsc_key_present; - - int ping_timeout; - int pong_timeout; - struct osmo_timer_list ping_timer; - struct osmo_timer_list pong_timer; - int advanced_ping; - struct bsc_msc_connection *msc_con; - int core_mnc; - int core_mcc; - int core_lac; - int core_ci; - int rtp_base; - - /* audio codecs */ - struct gsm48_multi_rate_conf amr_conf; - struct gsm_audio_support **audio_support; - int audio_length; - - /* destinations */ - struct llist_head dests; - - /* ussd welcome text */ - char *ussd_welcome_txt; - - /* mgcp agent */ - struct osmo_wqueue mgcp_agent; - - int nr; - - /* ussd msc connection lost text */ - char *ussd_msc_lost_txt; - - /* ussd text when MSC has entered the grace period */ - char *ussd_grace_txt; - - char *acc_lst_name; - - /* Sigtran connection data */ - struct { - uint32_t cs7_instance; - bool cs7_instance_valid; - struct osmo_sccp_instance *sccp; - struct osmo_sccp_user *sccp_user; - - /* Holds a copy of the our local MSC address, - * this will be the sccp-address that is associated - * with the A interface of this particular BSC, - * this address is filled up by the VTY interface */ - struct osmo_sccp_addr bsc_addr; - char *bsc_addr_name; - - /* Holds a copy of the MSC address. This is the - * address of the MSC that handles the calls of - * this BSC. The address is configured via the - * VTY interface */ - struct osmo_sccp_addr msc_addr; - char *msc_addr_name; - - struct a_reset_ctx *reset; - } a; -}; - -/* - * Per BSC data. - */ -struct osmo_bsc_data { - struct gsm_network *network; - - /* msc configuration */ - struct llist_head mscs; - - /* rf ctl related bits */ - char *mid_call_txt; - int mid_call_timeout; - char *rf_ctrl_name; - struct osmo_bsc_rf *rf_ctrl; - int auto_off_timeout; - - /* ussd text when there is no MSC available */ - char *ussd_no_msc_txt; - - char *acc_lst_name; -}; - - -int osmo_bsc_msc_init(struct bsc_msc_data *msc); -int osmo_bsc_sccp_init(struct gsm_network *gsmnet); -int msc_queue_write(struct bsc_msc_connection *conn, struct msgb *msg, int proto); -int msc_queue_write_with_ping(struct bsc_msc_connection *, struct msgb *msg, int proto); - -int osmo_bsc_audio_init(struct gsm_network *network); - -struct bsc_msc_data *osmo_msc_data_find(struct gsm_network *, int); -struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *, int); - - -#endif diff --git a/include/osmocom/msc/bsc_rll.h b/include/osmocom/msc/bsc_rll.h deleted file mode 100644 index 93c80e7a9..000000000 --- a/include/osmocom/msc/bsc_rll.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _BSC_RLL_H -#define _BSC_RLL_H - -#include <osmocom/msc/gsm_data.h> - -enum bsc_rllr_ind { - BSC_RLLR_IND_EST_CONF, - BSC_RLLR_IND_REL_IND, - BSC_RLLR_IND_ERR_IND, - BSC_RLLR_IND_TIMEOUT, -}; - -int rll_establish(struct gsm_lchan *lchan, uint8_t link_id, - void (*cb)(struct gsm_lchan *, uint8_t, void *, - enum bsc_rllr_ind), - void *data); -void rll_indication(struct gsm_lchan *lchan, uint8_t link_id, uint8_t type); - -#endif /* _BSC_RLL_H */ diff --git a/src/libcommon-cs/a_reset.c b/src/libcommon-cs/a_reset.c index d2f4f59be..072181d78 100644 --- a/src/libcommon-cs/a_reset.c +++ b/src/libcommon-cs/a_reset.c @@ -26,7 +26,7 @@ #include <errno.h> #include <string.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/bsc_msc_data.h> +#include <osmocom/msc/a_reset.h> #define RESET_RESEND_INTERVAL 2 /* sec */ #define RESET_RESEND_TIMER_NO 1234 /* FIXME: dig out the real timer number */ diff --git a/src/libcommon/gsm_data.c b/src/libcommon/gsm_data.c index bdcdf0247..66b6e293d 100644 --- a/src/libcommon/gsm_data.c +++ b/src/libcommon/gsm_data.c @@ -33,7 +33,6 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/msc/gsm_data.h> -#include <osmocom/msc/bsc_msc_data.h> void *tall_bsc_ctx; diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index e67531ec3..a6e8bf793 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -51,7 +51,6 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/db.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/bsc_rll.h> #include <osmocom/msc/msc_ifaces.h> #include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/vlr.h> diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index f41df01e1..9fa98f3f0 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -47,7 +47,6 @@ #include <osmocom/core/talloc.h> #include <osmocom/msc/signal.h> #include <osmocom/msc/osmo_msc.h> -#include <osmocom/msc/bsc_msc_data.h> #include <osmocom/msc/sms_queue.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/ports.h> |