pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28695 )
Change subject: Move vty stuff to its own header cbc_vty.h ......................................................................
Move vty stuff to its own header cbc_vty.h
Change-Id: Ib793a74befb7eaad66d19967c28acb4baf52ea69 --- M include/osmocom/cbc/Makefile.am A include/osmocom/cbc/cbc_vty.h M include/osmocom/cbc/internal.h M src/cbc_main.c M src/cbc_vty.c 5 files changed, 13 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/95/28695/1
diff --git a/include/osmocom/cbc/Makefile.am b/include/osmocom/cbc/Makefile.am index 1ceb6a4..f8b4241 100644 --- a/include/osmocom/cbc/Makefile.am +++ b/include/osmocom/cbc/Makefile.am @@ -1,6 +1,7 @@ noinst_HEADERS = \ cbc_data.h \ cbc_peer.h \ + cbc_vty.h \ cbsp_server.h \ charset.h \ internal.h \ diff --git a/include/osmocom/cbc/cbc_vty.h b/include/osmocom/cbc/cbc_vty.h new file mode 100644 index 0000000..d53797c --- /dev/null +++ b/include/osmocom/cbc/cbc_vty.h @@ -0,0 +1,10 @@ +#pragma once + +enum cbc_vty_node { + CBC_NODE = _LAST_OSMOVTY_NODE + 1, + PEER_NODE, + CBSP_NODE, + SBcAP_NODE, + ECBE_NODE, +}; +void cbc_vty_init(void); diff --git a/include/osmocom/cbc/internal.h b/include/osmocom/cbc/internal.h index e59a923..475442f 100644 --- a/include/osmocom/cbc/internal.h +++ b/include/osmocom/cbc/internal.h @@ -41,16 +41,6 @@ int rest_api_init(void *ctx, const char *bind_addr, uint16_t port); void rest_api_fin(void);
-/* cbc_vty.c */ -enum cbc_vty_node { - CBC_NODE = _LAST_OSMOVTY_NODE + 1, - PEER_NODE, - CBSP_NODE, - SBcAP_NODE, - ECBE_NODE, -}; -void cbc_vty_init(void); - /* message_handling.c */ struct cbc_message *cbc_message_alloc(void *ctx, const struct cbc_message *cbcmsg); int cbc_message_new(const struct cbc_message *cbcmsg, struct rest_it_op *op); diff --git a/src/cbc_main.c b/src/cbc_main.c index 3727fad..bd9e380 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -49,6 +49,7 @@ #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/sbcap_server.h> #include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbc_vty.h>
static void *tall_cbc_ctx; struct cbc *g_cbc; diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 030f9e6..bf15116 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -32,6 +32,7 @@
#include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/cbc_vty.h> #include <osmocom/cbc/internal.h> #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/sbcap_server.h>
-
pespin