From 49012f14dd5480573943e5d8cd5e9908f3eabb16 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 8 Dec 2016 21:30:34 +0100 Subject: oap: rename public API from oap_ to oap_client_ Mainly to differentiate the OAP messaging API (osmo_oap_ in libosmocore) from the OAP client. This is in preparation for moving the oap client to libcommon, which is in turn preparation for libvlr. Add the osmo_ prefix, as all public Osmocom API should have. We also have OAP messages code in libosmocore, so clarify by naming this osmo_oap_client, and by also renaming the oap_test to oap_client_test. This reshuffling will allow an easy move of OAP to libosmocore if we should want to do that. A number of patches will follow up on this. Related: OS#1592 Change-Id: Id447d2bebc026a375567654adafa5f82439ea7e1 --- openbsc/src/gprs/gprs_gsup_client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openbsc/src/gprs/gprs_gsup_client.c') diff --git a/openbsc/src/gprs/gprs_gsup_client.c b/openbsc/src/gprs/gprs_gsup_client.c index b99156371..0360e0a24 100644 --- a/openbsc/src/gprs/gprs_gsup_client.c +++ b/openbsc/src/gprs/gprs_gsup_client.c @@ -116,7 +116,7 @@ static void gsup_client_oap_register(struct gsup_client *gsupc) { struct msgb *msg_tx; int rc; - rc = oap_register(&gsupc->oap_state, &msg_tx); + rc = oap_client_register(&gsupc->oap_state, &msg_tx); if ((rc < 0) || (!msg_tx)) { LOGP(DLGSUP, LOGL_ERROR, "GSUP OAP set up, but cannot register.\n"); @@ -155,7 +155,7 @@ static int gsup_client_oap_handle(struct gsup_client *gsupc, struct msgb *msg_rx int rc; struct msgb *msg_tx; - rc = oap_handle(&gsupc->oap_state, msg_rx, &msg_tx); + rc = oap_client_handle(&gsupc->oap_state, msg_rx, &msg_tx); msgb_free(msg_rx); if (rc < 0) return rc; @@ -265,7 +265,7 @@ static void start_test_procedure(struct gsup_client *gsupc) struct gsup_client *gsup_client_create(const char *ip_addr, unsigned int tcp_port, gsup_client_read_cb_t read_cb, - struct oap_config *oap_config) + struct oap_client_config *oap_config) { struct gsup_client *gsupc; int rc; @@ -273,7 +273,7 @@ struct gsup_client *gsup_client_create(const char *ip_addr, gsupc = talloc_zero(tall_bsc_ctx, struct gsup_client); OSMO_ASSERT(gsupc); - rc = oap_init(oap_config, &gsupc->oap_state); + rc = oap_client_init(oap_config, &gsupc->oap_state); if (rc != 0) goto failed; -- cgit v1.2.3