lynxis lazus has uploaded this change for review.

View Change

move enum ranap_nsap_addr_enc into ranap_common.h

The enum defines how an IP address in a RAB assignment is encoded.
This is part of RANAP.

Related: OS#5487
Change-Id: Ie281bcf6b03d4cc431902cb0f6b0d5f722c80c74
---
M TODO-RELEASE
M include/osmocom/ranap/iu_client.h
M include/osmocom/ranap/ranap_common.h
M src/iu_client_vty.c
4 files changed, 8 insertions(+), 5 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/45/40845/1

diff --git a/TODO-RELEASE b/TODO-RELEASE
index 0f87cfd..890abc2f 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -12,3 +12,4 @@
 libosmo-ranap	add API			iu_client.h: add ranap_iu_page_cs2/ranap_iu_page_ps2
 libosmo-ranap	new event		RANAP_IU_EVENT_NEW_AREA
 libosmo-ranap	move declaration	(backwards compatible): asn_debug, asn1_xer_print: use osmocom/iuh/iu_common.h instead of iu_client.h
+libosmo-ranap	move definition	(backwards compatible): enum ranap_nsap_addr_enc: use osmocom/ranap/ranap_common.h instead of iu_client.h
diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h
index a595a97..306cf90 100644
--- a/include/osmocom/ranap/iu_client.h
+++ b/include/osmocom/ranap/iu_client.h
@@ -6,6 +6,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/iuh/iu_common.h>
+#include <osmocom/ranap/ranap_common.h>
 #include <osmocom/sigtran/sccp_sap.h>
 
 struct msgb;
@@ -16,11 +17,6 @@
 
 struct ranap_iu_rnc;
 
-enum ranap_nsap_addr_enc {
-	RANAP_NSAP_ADDR_ENC_X213,
-	RANAP_NSAP_ADDR_ENC_V4RAW,
-};
-
 struct ranap_ue_conn_ctx {
 	struct llist_head list;
 	struct ranap_iu_rnc *rnc;
diff --git a/include/osmocom/ranap/ranap_common.h b/include/osmocom/ranap/ranap_common.h
index 0da7b10..ed478fa 100644
--- a/include/osmocom/ranap/ranap_common.h
+++ b/include/osmocom/ranap/ranap_common.h
@@ -596,6 +596,11 @@
 extern int _ranap_DRANAP;
 #define RANAP_DEBUG(x, args ...) DEBUGP(_ranap_DRANAP, x, ## args)
 
+enum ranap_nsap_addr_enc {
+	RANAP_NSAP_ADDR_ENC_X213,
+	RANAP_NSAP_ADDR_ENC_V4RAW,
+};
+
 /* Callback to be used with decoder functions in ranap_common_cn.c  ranap_common_ran.c */
 typedef void (*ranap_handle_cb)(void *priv, ranap_message *ranap_msg);
 
diff --git a/src/iu_client_vty.c b/src/iu_client_vty.c
index b111a5b..ee50444 100644
--- a/src/iu_client_vty.c
+++ b/src/iu_client_vty.c
@@ -27,6 +27,7 @@
 #include <osmocom/sigtran/sccp_sap.h>
 
 #include <osmocom/ranap/iu_client.h>
+#include <osmocom/ranap/ranap_common.h>
 
 static enum ranap_nsap_addr_enc *g_rab_assign_addr_enc = NULL;
 

To view, visit change 40845. To unsubscribe, or for help writing mail filters, visit settings.