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 /src/libvlr | |
| 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 'src/libvlr')
| -rw-r--r-- | src/libvlr/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libvlr/vlr.c | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 1408f6cd0..dcae1c7cf 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -5,6 +5,7 @@ AM_CFLAGS= \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ $(COVERAGE_CFLAGS) \ diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 2f7dc3052..bfaf3339c 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -28,7 +28,7 @@ #include <osmocom/gsm/apn.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/msc/gsm_subscriber.h> -#include <osmocom/msc/gsup_client.h> +#include <osmocom/gsupclient/gsup_client.h> #include <osmocom/msc/vlr.h> #include <osmocom/msc/debug.h> @@ -156,7 +156,7 @@ struct vlr_subscr *_vlr_subscr_find_by_msisdn(struct vlr_instance *vlr, static int vlr_tx_gsup_message(const struct vlr_instance *vlr, const struct osmo_gsup_message *gsup_msg) { - struct msgb *msg = gsup_client_msgb_alloc(); + struct msgb *msg = osmo_gsup_client_msgb_alloc(); int rc = osmo_gsup_encode(msg, gsup_msg); if (rc < 0) { @@ -174,7 +174,7 @@ static int vlr_tx_gsup_message(const struct vlr_instance *vlr, LOGP(DVLR, LOGL_DEBUG, "GSUP tx: %s\n", osmo_hexdump_nospc(msg->data, msg->len)); - return gsup_client_send(vlr->gsup_client, msg); + return osmo_gsup_client_send(vlr->gsup_client, msg); } /* Transmit GSUP message for subscriber to HLR, using IMSI from subscriber */ @@ -974,7 +974,7 @@ static int vlr_subscr_handle_cancel_req(struct vlr_subscr *vsub, /* Incoming handler for GSUP from HLR. * Keep this function non-static for direct invocation by unit tests. */ -int vlr_gsupc_read_cb(struct gsup_client *gsupc, struct msgb *msg) +int vlr_gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg) { struct vlr_instance *vlr = (struct vlr_instance *) gsupc->data; struct vlr_subscr *vsub; @@ -1214,10 +1214,10 @@ int vlr_start(const char *gsup_unit_name, struct vlr_instance *vlr, { OSMO_ASSERT(vlr); - vlr->gsup_client = gsup_client_create(vlr, gsup_unit_name, - gsup_server_addr_str, - gsup_server_port, - &vlr_gsupc_read_cb, NULL); + vlr->gsup_client = osmo_gsup_client_create(vlr, gsup_unit_name, + gsup_server_addr_str, + gsup_server_port, + &vlr_gsupc_read_cb, NULL); if (!vlr->gsup_client) return -ENOMEM; vlr->gsup_client->data = vlr; |