pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28697 )
Change subject: Get rid of internal.h ......................................................................
Get rid of internal.h
Let's create missing header files and move stuff around to have a clear view of who implements what.
Change-Id: Ib32091d716b33bca58e2d3acf8840b52824c0bd3 --- M include/osmocom/cbc/Makefile.am M include/osmocom/cbc/cbc_data.h A include/osmocom/cbc/cbsp_server_fsm.h A include/osmocom/cbc/debug.h A include/osmocom/cbc/sbcap_server_fsm.h R include/osmocom/cbc/smscb_message_fsm.h M src/cbc_main.c M src/cbc_vty.c M src/cbsp_server.c M src/cbsp_server_fsm.c M src/message_handling.c M src/rest_api.c M src/rest_it_op.c M src/sbcap_msg.c M src/sbcap_server.c M src/sbcap_server_fsm.c M src/smscb_message_fsm.c M src/smscb_peer_fsm.c 18 files changed, 69 insertions(+), 55 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/97/28697/1
diff --git a/include/osmocom/cbc/Makefile.am b/include/osmocom/cbc/Makefile.am index 6c5ad63..72af597 100644 --- a/include/osmocom/cbc/Makefile.am +++ b/include/osmocom/cbc/Makefile.am @@ -4,9 +4,12 @@ cbc_message.h \ cbc_vty.h \ cbsp_server.h \ + cbsp_server_fsm.h \ charset.h \ - internal.h \ + debug.h \ sbcap_msg.h \ sbcap_server.h \ + sbcap_server_fsm.h \ rest_it_op.h \ + smscb_message_fsm.h \ $(NULL) diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index 1b58ba5..16861e7 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -6,8 +6,6 @@ #include <osmocom/gsm/protocol/gsm_48_049.h> #include <osmocom/gsm/gsm23003.h>
-struct rest_it_op; - #define CBC_MAX_LOC_ADDRS 8
enum cbc_cell_id_type { @@ -72,3 +70,7 @@ };
extern struct cbc *g_cbc; + +/* rest_api.c */ +int rest_api_init(void *ctx, const char *bind_addr, uint16_t port); +void rest_api_fin(void); diff --git a/include/osmocom/cbc/cbsp_server_fsm.h b/include/osmocom/cbc/cbsp_server_fsm.h new file mode 100644 index 0000000..7f16fc6 --- /dev/null +++ b/include/osmocom/cbc/cbsp_server_fsm.h @@ -0,0 +1,15 @@ +#pragma once + +#include <stdint.h> +#include <osmocom/core/fsm.h> + +extern struct osmo_fsm cbsp_server_fsm; + +enum cbsp_server_event { + CBSP_SRV_E_RX_RST_COMPL, /* reset complete received */ + CBSP_SRV_E_RX_RST_FAIL, /* reset failure received */ + CBSP_SRV_E_RX_KA_COMPL, /* keep-alive complete received */ + CBSP_SRV_E_RX_RESTART, /* restart received */ + CBSP_SRV_E_CMD_RESET, /* RESET command from CBC */ + CBSP_SRV_E_CMD_CLOSE, /* CLOSE command from CBC */ +}; diff --git a/include/osmocom/cbc/debug.h b/include/osmocom/cbc/debug.h new file mode 100644 index 0000000..1ec0a8e --- /dev/null +++ b/include/osmocom/cbc/debug.h @@ -0,0 +1,7 @@ +#pragma once + +enum { + DCBSP, + DSBcAP, + DREST, +}; diff --git a/include/osmocom/cbc/sbcap_server_fsm.h b/include/osmocom/cbc/sbcap_server_fsm.h new file mode 100644 index 0000000..46bd29d --- /dev/null +++ b/include/osmocom/cbc/sbcap_server_fsm.h @@ -0,0 +1,15 @@ +#pragma once + +#include <stdint.h> +#include <osmocom/core/fsm.h> + +extern struct osmo_fsm sbcap_server_fsm; + +enum sbcap_server_event { + SBcAP_SRV_E_RX_RST_COMPL, /* reset complete received */ + SBcAP_SRV_E_RX_RST_FAIL, /* reset failure received */ + SBcAP_SRV_E_RX_KA_COMPL, /* keep-alive complete received */ + SBcAP_SRV_E_RX_RESTART, /* restart received */ + SBcAP_SRV_E_CMD_RESET, /* RESET command from CBC */ + SBcAP_SRV_E_CMD_CLOSE, /* CLOSE command from CBC */ +}; diff --git a/include/osmocom/cbc/internal.h b/include/osmocom/cbc/smscb_message_fsm.h similarity index 60% rename from include/osmocom/cbc/internal.h rename to include/osmocom/cbc/smscb_message_fsm.h index eff2c24..9636acc 100644 --- a/include/osmocom/cbc/internal.h +++ b/include/osmocom/cbc/smscb_message_fsm.h @@ -1,48 +1,8 @@ #pragma once
#include <stdint.h> - -#include <osmocom/core/logging.h> #include <osmocom/core/fsm.h> -#include <osmocom/vty/command.h>
-#include <osmocom/cbc/cbc_data.h> - -enum { - DCBSP, - DSBcAP, - DREST, -}; - -extern struct osmo_fsm cbsp_server_fsm; - -enum cbsp_server_event { - CBSP_SRV_E_RX_RST_COMPL, /* reset complete received */ - CBSP_SRV_E_RX_RST_FAIL, /* reset failure received */ - CBSP_SRV_E_RX_KA_COMPL, /* keep-alive complete received */ - CBSP_SRV_E_RX_RESTART, /* restart received */ - CBSP_SRV_E_CMD_RESET, /* RESET command from CBC */ - CBSP_SRV_E_CMD_CLOSE, /* CLOSE command from CBC */ -}; - -extern struct osmo_fsm sbcap_server_fsm; - -enum sbcap_server_event { - SBcAP_SRV_E_RX_RST_COMPL, /* reset complete received */ - SBcAP_SRV_E_RX_RST_FAIL, /* reset failure received */ - SBcAP_SRV_E_RX_KA_COMPL, /* keep-alive complete received */ - SBcAP_SRV_E_RX_RESTART, /* restart received */ - SBcAP_SRV_E_CMD_RESET, /* RESET command from CBC */ - SBcAP_SRV_E_CMD_CLOSE, /* CLOSE command from CBC */ -}; - - -/* rest_api.c */ -int rest_api_init(void *ctx, const char *bind_addr, uint16_t port); -void rest_api_fin(void); - - -/* smscb_*fsm.c */ enum smscb_fsm_event { SMSCB_E_CHILD_DIED, /* create a message (from REST) */ diff --git a/src/cbc_main.c b/src/cbc_main.c index bd9e380..eaf0ebe 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -44,7 +44,7 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/misc.h>
-#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h> #include <osmocom/cbc/rest_it_op.h> #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/sbcap_server.h> diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 74e59ac..e35a48a 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -34,7 +34,6 @@ #include <osmocom/cbc/cbc_message.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>
diff --git a/src/cbsp_server.c b/src/cbsp_server.c index 58206e8..116242f 100644 --- a/src/cbsp_server.c +++ b/src/cbsp_server.c @@ -27,12 +27,14 @@ #include <osmocom/core/socket.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> +#include <osmocom/core/fsm.h> #include <osmocom/gsm/cbsp.h> #include <osmocom/gsm/protocol/gsm_48_049.h> #include <osmocom/netif/stream.h>
-#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h> #include <osmocom/cbc/cbsp_server.h> +#include <osmocom/cbc/cbsp_server_fsm.h> #include <osmocom/cbc/cbc_peer.h>
#if 0 diff --git a/src/cbsp_server_fsm.c b/src/cbsp_server_fsm.c index cdbca82..d1be036 100644 --- a/src/cbsp_server_fsm.c +++ b/src/cbsp_server_fsm.c @@ -25,7 +25,9 @@ #include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbsp_server.h> -#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/cbsp_server_fsm.h> +#include <osmocom/cbc/debug.h> +#include <osmocom/cbc/smscb_message_fsm.h>
#define S(x) (1 << (x))
diff --git a/src/message_handling.c b/src/message_handling.c index 23c0ace..39d8cfe 100644 --- a/src/message_handling.c +++ b/src/message_handling.c @@ -32,8 +32,9 @@ #include <osmocom/cbc/sbcap_server.h> #include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/rest_it_op.h> -#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h> #include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/smscb_message_fsm.h>
/* convert cbc_message to osmo_cbsp_cell_list */ static int cbcmsg_to_cbsp_cell_list(const void *ctx, struct osmo_cbsp_cell_list *list, diff --git a/src/rest_api.c b/src/rest_api.c index e596b77..4294485 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -37,7 +37,7 @@
#define PREFIX "/api/ecbe/v1"
-#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h> #include <osmocom/cbc/charset.h> #include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/rest_it_op.h> diff --git a/src/rest_it_op.c b/src/rest_it_op.c index ae1aaff..1110a3a 100644 --- a/src/rest_it_op.c +++ b/src/rest_it_op.c @@ -23,11 +23,13 @@ #include <errno.h> #include <pthread.h>
+#include <osmocom/core/talloc.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/it_q.h>
+#include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/rest_it_op.h> -#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h>
/*********************************************************************** * HTTP THREAD diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index bffe375..661f0d1 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -33,7 +33,7 @@
#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/sbcap_server.h> -#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h>
/* 3GPP TS 36.413 9.2.1.53 */ #define SBCAP_WARN_MSG_CONTENTS_IE_MAX_LEN 9600 diff --git a/src/sbcap_server.c b/src/sbcap_server.c index 2f78322..72c94a1 100644 --- a/src/sbcap_server.c +++ b/src/sbcap_server.c @@ -35,9 +35,11 @@
#include <osmocom/sbcap/sbcap_common.h>
-#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/sbcap_server.h> +#include <osmocom/cbc/sbcap_server_fsm.h> #include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/debug.h>
const char *sbcap_cbc_client_name(const struct osmo_sbcap_cbc_client *client) { diff --git a/src/sbcap_server_fsm.c b/src/sbcap_server_fsm.c index 616933e..fe2f022 100644 --- a/src/sbcap_server_fsm.c +++ b/src/sbcap_server_fsm.c @@ -27,8 +27,10 @@
#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/sbcap_server.h> -#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/sbcap_server_fsm.h> +#include <osmocom/cbc/debug.h> #include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/smscb_message_fsm.h>
#define S(x) (1 << (x))
diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index 27d31c2..0fb91e0 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -32,8 +32,9 @@
#include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/cbsp_server.h> -#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h> #include <osmocom/cbc/rest_it_op.h> +#include <osmocom/cbc/smscb_message_fsm.h>
#define S(x) (1 << (x))
diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index ec61fc2..32e6f54 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -39,7 +39,8 @@ #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/sbcap_server.h> #include <osmocom/cbc/sbcap_msg.h> -#include <osmocom/cbc/internal.h> +#include <osmocom/cbc/debug.h> +#include <osmocom/cbc/smscb_message_fsm.h>
#define S(x) (1 << (x))
-
pespin