[S] Change in osmo-iuh[master]: move vty functions into own vty.h

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/40846?usp=email ) Change subject: move vty functions into own vty.h ...................................................................... move vty functions into own vty.h In preparation to remove iu_client from osmo-iuh, move all non-iu_client stuff out of iu_client files. Related: OS#5487 Change-Id: I8d393d17aa5f004dc4aa4e916bee68f44339e138 --- M TODO-RELEASE M include/osmocom/ranap/Makefile.am M include/osmocom/ranap/iu_client.h A include/osmocom/ranap/vty.h M src/iu_client_vty.c 5 files changed, 13 insertions(+), 4 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index cd6ad86..f825ac1 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -13,3 +13,4 @@ libosmo-ranap new event RANAP_IU_EVENT_NEW_AREA libosmo-ranap move declaration (backwards compatible): asn_debug, asn1_xer_print: use osmocom/iuh/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 +libosmo-ranap move declaration (backwards compatible): ranap_iu_vty_init, ranap_iu_vty_config_write: use osmocom/ranap/vty.h instead of iu_client.h diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am index cef1cd3..fbd3c05 100644 --- a/include/osmocom/ranap/Makefile.am +++ b/include/osmocom/ranap/Makefile.am @@ -619,6 +619,7 @@ RANAP_VerticalSpeedDirection.h \ RANAP_VerticalVelocity.h \ RANAP_VoiceSupportMatchIndicator.h \ + vty.h \ version.h \ $(NULL) diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h index e5f7385..b0ff448 100644 --- a/include/osmocom/ranap/iu_client.h +++ b/include/osmocom/ranap/iu_client.h @@ -7,6 +7,7 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/iuh/common.h> #include <osmocom/ranap/ranap_common.h> +#include <osmocom/ranap/vty.h> #include <osmocom/sigtran/sccp_sap.h> struct msgb; @@ -100,6 +101,3 @@ /* freeing the UE will release all resources * This will close the SCCP connection connected to the UE */ void ranap_iu_free_ue(struct ranap_ue_conn_ctx *ue_ctx); - -void ranap_iu_vty_init(int iu_parent_node, enum ranap_nsap_addr_enc *rab_assign_addr_enc); -int ranap_iu_vty_config_write(struct vty *vty, const char *indent); diff --git a/include/osmocom/ranap/vty.h b/include/osmocom/ranap/vty.h new file mode 100644 index 0000000..750eac1 --- /dev/null +++ b/include/osmocom/ranap/vty.h @@ -0,0 +1,8 @@ +#pragma once + +#include <osmocom/ranap/ranap_common.h> + +struct vty; + +void ranap_iu_vty_init(int iu_parent_node, enum ranap_nsap_addr_enc *rab_assign_addr_enc); +int ranap_iu_vty_config_write(struct vty *vty, const char *indent); diff --git a/src/iu_client_vty.c b/src/iu_client_vty.c index 170791f..66136af 100644 --- a/src/iu_client_vty.c +++ b/src/iu_client_vty.c @@ -26,9 +26,10 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/iuh/iu_common.h> #include <osmocom/iuh/common.h> -#include <osmocom/ranap/iu_client.h> #include <osmocom/ranap/ranap_common.h> +#include <osmocom/ranap/vty.h> static enum ranap_nsap_addr_enc *g_rab_assign_addr_enc = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/40846?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8d393d17aa5f004dc4aa4e916bee68f44339e138 Gerrit-Change-Number: 40846 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus &lt;lynxis(a)fe80.eu&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel &lt;dwillmann(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: lynxis lazus &lt;lynxis(a)fe80.eu&gt;