diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-07-31 19:40:52 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-08-05 11:20:21 +0200 |
commit | 1ea6baf1ec8927d69c8787b282e07ed2f24c7525 (patch) | |
tree | 198b07f12c88afc814a03b90f020a7281b89574f /include | |
parent | 0622ef5308f1822c023d3d8312b621e3343bc7b9 (diff) |
Remove local libgsupclient; Use libosmo-gsup-client from osmo-hlr
osmo-hlr has recently (as of Change-Id
Iad227bb477d64da30dd6bfbbe1bd0c0a55be9474) a working shared library
implementation of libosmo-gsup-client.
We can remove the local implementation in osmo-msc and use the
system-installed shared library instead.
Change-Id: I6f542945403cf2e3ddac419186b09ec0e2d43b69
Diffstat (limited to 'include')
-rw-r--r-- | include/osmocom/msc/Makefile.am | 1 | ||||
-rw-r--r-- | include/osmocom/msc/gsup_client.h | 67 | ||||
-rw-r--r-- | include/osmocom/msc/vlr.h | 3 |
3 files changed, 2 insertions, 69 deletions
diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index b1a4810df..ebc946a30 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -13,7 +13,6 @@ noinst_HEADERS = \ gsm_data.h \ gsm_data_shared.h \ gsm_subscriber.h \ - gsup_client.h \ iucs.h \ iucs_ranap.h \ iu_dummy.h \ diff --git a/include/osmocom/msc/gsup_client.h b/include/osmocom/msc/gsup_client.h deleted file mode 100644 index 2f6170b63..000000000 --- a/include/osmocom/msc/gsup_client.h +++ /dev/null @@ -1,67 +0,0 @@ -/* GPRS Subscriber Update Protocol client */ - -/* (C) 2014 by Sysmocom s.f.m.c. GmbH - * All Rights Reserved - * - * Author: Jacob Erlbeck - * - * 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/>. - * - */ -#pragma once - -#include <osmocom/core/timer.h> - -#include <osmocom/gsm/oap_client.h> - -/* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as - * possible. Even one new connection attempt per second should be quite acceptable until the link is - * re-established */ -#define GSUP_CLIENT_RECONNECT_INTERVAL 1 -#define GSUP_CLIENT_PING_INTERVAL 20 - -struct msgb; -struct ipa_client_conn; -struct gsup_client; - -/* Expects message in msg->l2h */ -typedef int (*gsup_client_read_cb_t)(struct gsup_client *gsupc, - struct msgb *msg); - -struct gsup_client { - const char *unit_name; - - struct ipa_client_conn *link; - gsup_client_read_cb_t read_cb; - void *data; - - struct osmo_oap_client_state oap_state; - - struct osmo_timer_list ping_timer; - struct osmo_timer_list connect_timer; - int is_connected; - int got_ipa_pong; -}; - -struct gsup_client *gsup_client_create(void *talloc_ctx, - const char *unit_name, - const char *ip_addr, - unsigned int tcp_port, - gsup_client_read_cb_t read_cb, - struct osmo_oap_client_config *oapc_config); - -void gsup_client_destroy(struct gsup_client *gsupc); -int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg); -struct msgb *gsup_client_msgb_alloc(void); - diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index b54aa553d..91c28dbd8 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -12,6 +12,7 @@ #include <osmocom/msc/gsm_data.h> // for GSM_NAME_LENGTH #include <osmocom/msc/gsm_subscriber.h> +#include <osmocom/gsupclient/gsup_client.h> #define LOGGSUPP(level, gsup, fmt, args...) \ LOGP(DVLR, level, "GSUP(%s) " fmt, (gsup)->imsi, ## args) @@ -243,7 +244,7 @@ enum vlr_timer { struct vlr_instance { struct llist_head subscribers; struct llist_head operations; - struct gsup_client *gsup_client; + struct osmo_gsup_client *gsup_client; struct vlr_ops ops; struct osmo_timer_list lu_expire_timer; struct { |