lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40851?usp=email )
Change subject: iu_client: start using adopted iu_client ......................................................................
iu_client: start using adopted iu_client
Use internal headers. Use renamed event names/types.
Change-Id: I7c99ad0498c6f885361562c54fcf0ebdc086616b --- M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/sgsn.h M src/sgsn/gprs_ranap.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c 5 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/51/40851/1
diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h index 68f9115..6dcb63a 100644 --- a/include/osmocom/sgsn/gprs_ranap.h +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -5,7 +5,7 @@ #ifdef BUILD_IU #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/ranap_msg_factory.h> -#include <osmocom/ranap/iu_client.h> +#include <osmocom/sgsn/iu_client.h>
struct sgsn_mm_ctx; struct sgsn_pdp_ctx; diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 9190a61..09eb22c 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -17,7 +17,7 @@ #include "../../config.h"
#if BUILD_IU -#include <osmocom/ranap/iu_client.h> +#include <osmocom/sgsn/iu_client.h> #endif
#include <ares.h> diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 3252ee6..3e2c891 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -144,14 +144,14 @@
if (!ctx) { LOGIUP(ctx, LOGL_ERROR, "NULL ctx given for IU event %s\n", - ranap_iu_event_type_str(type)); + iu_client_event_type_str(type)); return rc; }
mm = sgsn_mm_ctx_by_ue_ctx(ctx); if (!mm) { LOGIUP(ctx, LOGL_NOTICE, "Cannot find mm ctx for IU event %s\n", - ranap_iu_event_type_str(type)); + iu_client_event_type_str(type)); ranap_iu_free_ue(ctx); return rc; } @@ -164,7 +164,7 @@ /* fall thru */ case RANAP_IU_EVENT_LINK_INVALIDATED: /* Clean up ranap_ue_conn_ctx here */ - LOGMMCTXP(LOGL_INFO, mm, "IU release (cause=%s)\n", ranap_iu_event_type_str(type)); + LOGMMCTXP(LOGL_INFO, mm, "IU release (cause=%s)\n", iu_client_event_type_str(type)); rc = osmo_fsm_inst_dispatch(mm->iu.mm_state_fsm, E_PMM_PS_CONN_RELEASE, NULL); if (rc < 0) sgsn_ranap_iu_free(mm); diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 320842d..bebb7ae 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -77,7 +77,7 @@ #if BUILD_IU #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/protocol/m3ua.h> -#include <osmocom/ranap/iu_client.h> +#include <osmocom/sgsn/iu_client.h> #endif
#define _GNU_SOURCE diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 7279167..9721ee1 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -63,7 +63,7 @@ #include "../../config.h"
#ifdef BUILD_IU -#include <osmocom/ranap/iu_client.h> +#include <osmocom/sgsn/iu_client.h> #endif
static struct sgsn_config *g_cfg = NULL;
-
lynxis lazus