July 2022 - gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: Rename CBSP,SABP,SBcAP structs and APIs

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28700 to look at the new patch set (#3). Change subject: Rename CBSP,SABP,SBcAP structs and APIs ...................................................................... Rename CBSP,SABP,SBcAP structs and APIs Rename osmo_*_cbc -> cbc_*_mgr: Now they only hold TCP/SCTP server related conns, but will also hold TCP/SCTP client conns in the near future. Rename osmo_cbc_*_client -> cbc_*_link: The term "client" is confusing, since it doesn't exist in CBSP/SBcAP, and will later support connecting to server at TCP/SCTP level. Let's use "link" instead, similar to what's used in osmo-bsc which already supports both TCP client and server modes. Change-Id: Ia9d26dc1593c8ee08dce348fe9f5f4c9398ea2a5 --- M include/osmocom/cbc/cbc_peer.h M include/osmocom/cbc/cbsp_server.h M include/osmocom/cbc/sbcap_server.h M src/cbc_main.c M src/cbc_peer.c M src/cbc_vty.c M src/cbsp_server.c M src/cbsp_server_fsm.c M src/message_handling.c M src/sbcap_server.c M src/sbcap_server_fsm.c M src/smscb_peer_fsm.c 12 files changed, 235 insertions(+), 235 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/00/28700/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia9d26dc1593c8ee08dce348fe9f5f4c9398ea2a5 Gerrit-Change-Number: 28700 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: support handling of multiple L1CTL client connections

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28678 ) Change subject: trxcon: support handling of multiple L1CTL client connections ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h: https://gerrit.osmocom.org/c/osmocom-bb/+/28678/comment/73c9cc1c_34bb3310 PS1, Line 39: unsigned int index; > I don't get this comment. […] Both things. Be consistent, and also it idx is shorter and resembles more "id", which is probably how it ends up being used here :) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id92e5b553487e4cf10ea291b487a3ef0c65d72ae Gerrit-Change-Number: 28678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:45:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: support handling of multiple L1CTL client connections

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28678 ) Change subject: trxcon: support handling of multiple L1CTL client connections ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h: https://gerrit.osmocom.org/c/osmocom-bb/+/28678/comment/66e160f5_f9eaf4bf PS1, Line 39: unsigned int index; > idx? I don't get this comment. does it matter if it's index or idx? Or are you requesting the naming to be consistent between struct member and function argument names? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id92e5b553487e4cf10ea291b487a3ef0c65d72ae Gerrit-Change-Number: 28678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:43:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix trx_if_close(): delete TRXC timer if it's pending

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28677 ) Change subject: trxcon: fix trx_if_close(): delete TRXC timer if it's pending ...................................................................... Patch Set 1: (1 comment) File src/host/trxcon/src/trx_if.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28677/comment/30d1513c_3e5de5e0 PS1, Line 771: if ( it's safe to osmo_timer_del() directly, you don't need to safe-guard with the check. The first step in osmo_timer_del is exactly that active check... Think of it as a free(NULL) situation. less bloat in the code if caller doesn't have to check. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I669355ec03f67de437df2d3b822ed0a728b405d5 Gerrit-Change-Number: 28677 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:42:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: ensure are TRXC/TRXD logging is using LOGPFSML()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28676 ) Change subject: trxcon: ensure are TRXC/TRXD logging is using LOGPFSML() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic253903e7b8635bb13e210acfe929c73f8870632 Gerrit-Change-Number: 28676 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:41:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trx_if_open(): allocate trx->fi as a child of trxcon->fi

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28675 ) Change subject: trxcon: trx_if_open(): allocate trx->fi as a child of trxcon->fi ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I19579d2a76c38ca972a4ca132a8e5e3bba876c67 Gerrit-Change-Number: 28675 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Jul 2022 17:41:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap_server.h: Remove unused fields

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28698 ) Change subject: sbcap_server.h: Remove unused fields ...................................................................... sbcap_server.h: Remove unused fields Change-Id: I3086a264557b976985d166e56fb7f70ad96b81df --- M include/osmocom/cbc/sbcap_server.h 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/cbc/sbcap_server.h b/include/osmocom/cbc/sbcap_server.h index ebc9f2a..a5568ad 100644 --- a/include/osmocom/cbc/sbcap_server.h +++ b/include/osmocom/cbc/sbcap_server.h @@ -34,11 +34,7 @@ struct llist_head list; /* stream server connection for this client */ struct osmo_stream_srv *conn; - /* partially received sbcap message (rx completion pending) */ - struct msgb *rx_msg; - struct osmo_fsm_inst *fi; - struct cbc_peer *peer; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3086a264557b976985d166e56fb7f70ad96b81df Gerrit-Change-Number: 28698 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Get rid of internal.h

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve 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)) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib32091d716b33bca58e2d3acf8840b52824c0bd3 Gerrit-Change-Number: 28697 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Move vty stuff to its own header cbc_vty.h

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved 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> -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib793a74befb7eaad66d19967c28acb4baf52ea69 Gerrit-Change-Number: 28695 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Split cbc_message related code to its own .c and .h file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28696 ) Change subject: Split cbc_message related code to its own .c and .h file ...................................................................... Split cbc_message related code to its own .c and .h file Change-Id: I41f6e169b1ee6731cd472f6b72ea922260e30ceb --- M include/osmocom/cbc/Makefile.am M include/osmocom/cbc/cbc_data.h A include/osmocom/cbc/cbc_message.h M include/osmocom/cbc/internal.h M include/osmocom/cbc/rest_it_op.h M src/Makefile.am R src/cbc_message.c M src/cbc_peer.c M src/cbc_vty.c M src/cbsp_server_fsm.c M src/sbcap_msg.c M src/sbcap_server_fsm.c M src/smscb_peer_fsm.c 13 files changed, 120 insertions(+), 112 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/cbc/Makefile.am b/include/osmocom/cbc/Makefile.am index f8b4241..6c5ad63 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_message.h \ cbc_vty.h \ cbsp_server.h \ charset.h \ diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index 09b0ebf..1b58ba5 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -1,7 +1,6 @@ #pragma once #include <stdint.h> #include <stdbool.h> -#include <time.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/it_q.h> #include <osmocom/gsm/protocol/gsm_48_049.h> @@ -42,97 +41,6 @@ } num_compl; }; - -/********************************************************************************* - * CBC Message - *********************************************************************************/ - -/* a single SMSCB page of 82 user bytes (excluding any GSM specific header) */ -#define SMSCB_RAW_PAGE_LEN 82 -#define SMSCB_MAX_NUM_PAGES 15 - -/* representation of a plain SMSCB message without any metadata such as cell lists */ -struct smscb_message { - uint16_t message_id; - uint16_t serial_nr; - - bool is_etws; - union { - struct { - /* data coding scheme */ - uint8_t dcs; - /* number of pages containing valid information */ - unsigned int num_pages; - /* actual page data, concatenated */ - uint8_t data[SMSCB_MAX_NUM_PAGES][SMSCB_RAW_PAGE_LEN]; - /* total number of octets user data over _all_ the pages */ - uint16_t data_user_len; - } cbs; - struct { - /* WarningTypeValue 7bit parameter as per 23.041 9.3.24 */ - uint16_t warning_type; - /* Emergency User Alert */ - bool user_alert; - /* Popup on Display */ - bool popup_on_display; - uint8_t warning_sec_info[50]; - } etws; - }; -}; - -enum cbc_message_scope { - CBC_MSG_SCOPE_PLMN, - /* FIXME: more local/regional scopes than PLMN-wide */ -}; - -/* link between a SMSCB message and a peer (BSC, RNC, MME) */ -struct cbc_message_peer { - struct llist_head list; /* lined to cbc_message.peers */ - - /* 'cbcmsg' is not really needed, as the fsm instance parent points to - * the fsm instance of cbc_message, so we could also dereference those */ - struct cbc_message *cbcmsg; /* the SMSCB this relates to */ - struct cbc_peer *peer; /* the peer thos relates to */ - struct osmo_fsm_inst *fi; /* the FSM instance representing our state */ - - /* cells in which this message has been established/installed */ - struct llist_head cell_list; - /* cells in which this message has NOT been established/installed */ - struct llist_head fail_list; - /* number of broadcasts completed in cells of this peer */ - struct llist_head num_compl_list; -}; - -/* internal representation of a CBC message */ -struct cbc_message { - struct llist_head list; /* global list of currently active CBCs */ - - const char *cbe_name; /* name of the CBE originating this SMSCB */ - enum cbsp_category priority; - uint16_t rep_period; /* repetition period (1..4095) in units of 1.883s */ - bool extended_cbch; /* basic (false) or extended (true) CBCH */ - uint32_t warning_period_sec; /* warning period in seconds (0xffffffff = unlimited) */ - uint16_t num_bcast; /* number of broadcasts requested (0=unlimited) */ - - enum cbc_message_scope scope; - /* FIXME: data for other scopes than PLMN-wide */ - - /* SMSCB message with id, serial, dcs, pages, ... */ - struct smscb_message msg; - - struct osmo_fsm_inst *fi; /* FSM instance (smscb_message_fsm) */ - - /* CBC peers (BSCs, RNCs, MMEs) to which this message has already been sent */ - struct llist_head peers; - - struct rest_it_op *it_op; /* inter-thread queue operation currently processing */ - - struct { - time_t created; /* when was this message created? */ - time_t expired; /* when has this message expired? */ - } time; -}; - /********************************************************************************* * CBC itself *********************************************************************************/ @@ -164,10 +72,3 @@ }; extern struct cbc *g_cbc; - - - -int cbc_message_del_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer); -int cbc_message_add_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer); -struct cbc_message_peer *smscb_peer_fsm_alloc(struct cbc_peer *peer, struct cbc_message *cbcmsg); -struct cbc_message_peer *cbc_message_peer_get(struct cbc_message *cbcmsg, struct cbc_peer *peer); diff --git a/include/osmocom/cbc/cbc_message.h b/include/osmocom/cbc/cbc_message.h new file mode 100644 index 0000000..daf992d --- /dev/null +++ b/include/osmocom/cbc/cbc_message.h @@ -0,0 +1,110 @@ +#pragma once +#include <stdint.h> +#include <stdbool.h> +#include <time.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/it_q.h> +#include <osmocom/gsm/protocol/gsm_48_049.h> +#include <osmocom/gsm/gsm23003.h> + + +/********************************************************************************* + * CBC Message + *********************************************************************************/ + +/* a single SMSCB page of 82 user bytes (excluding any GSM specific header) */ +#define SMSCB_RAW_PAGE_LEN 82 +#define SMSCB_MAX_NUM_PAGES 15 + +/* representation of a plain SMSCB message without any metadata such as cell lists */ +struct smscb_message { + uint16_t message_id; + uint16_t serial_nr; + + bool is_etws; + union { + struct { + /* data coding scheme */ + uint8_t dcs; + /* number of pages containing valid information */ + unsigned int num_pages; + /* actual page data, concatenated */ + uint8_t data[SMSCB_MAX_NUM_PAGES][SMSCB_RAW_PAGE_LEN]; + /* total number of octets user data over _all_ the pages */ + uint16_t data_user_len; + } cbs; + struct { + /* WarningTypeValue 7bit parameter as per 23.041 9.3.24 */ + uint16_t warning_type; + /* Emergency User Alert */ + bool user_alert; + /* Popup on Display */ + bool popup_on_display; + uint8_t warning_sec_info[50]; + } etws; + }; +}; + +enum cbc_message_scope { + CBC_MSG_SCOPE_PLMN, + /* FIXME: more local/regional scopes than PLMN-wide */ +}; + +/* link between a SMSCB message and a peer (BSC, RNC, MME) */ +struct cbc_message_peer { + struct llist_head list; /* lined to cbc_message.peers */ + + /* 'cbcmsg' is not really needed, as the fsm instance parent points to + * the fsm instance of cbc_message, so we could also dereference those */ + struct cbc_message *cbcmsg; /* the SMSCB this relates to */ + struct cbc_peer *peer; /* the peer thos relates to */ + struct osmo_fsm_inst *fi; /* the FSM instance representing our state */ + + /* cells in which this message has been established/installed */ + struct llist_head cell_list; + /* cells in which this message has NOT been established/installed */ + struct llist_head fail_list; + /* number of broadcasts completed in cells of this peer */ + struct llist_head num_compl_list; +}; + +/* internal representation of a CBC message */ +struct cbc_message { + struct llist_head list; /* global list of currently active CBCs */ + + const char *cbe_name; /* name of the CBE originating this SMSCB */ + enum cbsp_category priority; + uint16_t rep_period; /* repetition period (1..4095) in units of 1.883s */ + bool extended_cbch; /* basic (false) or extended (true) CBCH */ + uint32_t warning_period_sec; /* warning period in seconds (0xffffffff = unlimited) */ + uint16_t num_bcast; /* number of broadcasts requested (0=unlimited) */ + + enum cbc_message_scope scope; + /* FIXME: data for other scopes than PLMN-wide */ + + /* SMSCB message with id, serial, dcs, pages, ... */ + struct smscb_message msg; + + struct osmo_fsm_inst *fi; /* FSM instance (smscb_message_fsm) */ + + /* CBC peers (BSCs, RNCs, MMEs) to which this message has already been sent */ + struct llist_head peers; + + struct rest_it_op *it_op; /* inter-thread queue operation currently processing */ + + struct { + time_t created; /* when was this message created? */ + time_t expired; /* when has this message expired? */ + } time; +}; + +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); +void cbc_message_delete(struct cbc_message *cbcmsg, struct rest_it_op *op); +struct cbc_message *cbc_message_by_id(uint16_t message_id); +int peer_new_cbc_message(struct cbc_peer *peer, struct cbc_message *cbcmsg); + +int cbc_message_del_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer); +int cbc_message_add_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer); +struct cbc_message_peer *smscb_peer_fsm_alloc(struct cbc_peer *peer, struct cbc_message *cbcmsg); +struct cbc_message_peer *cbc_message_peer_get(struct cbc_message *cbcmsg, struct cbc_peer *peer); diff --git a/include/osmocom/cbc/internal.h b/include/osmocom/cbc/internal.h index 475442f..eff2c24 100644 --- a/include/osmocom/cbc/internal.h +++ b/include/osmocom/cbc/internal.h @@ -41,13 +41,6 @@ int rest_api_init(void *ctx, const char *bind_addr, uint16_t port); void rest_api_fin(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); -void cbc_message_delete(struct cbc_message *cbcmsg, struct rest_it_op *op); -struct cbc_message *cbc_message_by_id(uint16_t message_id); -int peer_new_cbc_message(struct cbc_peer *peer, struct cbc_message *cbcmsg); - /* smscb_*fsm.c */ enum smscb_fsm_event { diff --git a/include/osmocom/cbc/rest_it_op.h b/include/osmocom/cbc/rest_it_op.h index c868b7c..fbfc189 100644 --- a/include/osmocom/cbc/rest_it_op.h +++ b/include/osmocom/cbc/rest_it_op.h @@ -7,7 +7,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/it_q.h> -#include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbc_message.h> enum rest_it_operation { REST_IT_OP_NONE, diff --git a/src/Makefile.am b/src/Makefile.am index f7c9516..e3458e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ osmo_cbc_SOURCES = \ cbc_main.c \ - cbc_data.c \ + cbc_message.c \ cbc_peer.c \ cbc_vty.c \ cbsp_server.c \ diff --git a/src/cbc_data.c b/src/cbc_message.c similarity index 95% rename from src/cbc_data.c rename to src/cbc_message.c index 4226cfc..c88e907 100644 --- a/src/cbc_data.c +++ b/src/cbc_message.c @@ -28,8 +28,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <osmocom/cbc/cbc_data.h> -#include <osmocom/cbc/cbsp_server.h> +#include <osmocom/cbc/cbc_message.h> /* remove a peer from the message */ int cbc_message_del_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer) diff --git a/src/cbc_peer.c b/src/cbc_peer.c index 9147a4e..a9aa12d 100644 --- a/src/cbc_peer.c +++ b/src/cbc_peer.c @@ -28,6 +28,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/cbc_peer.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 bf15116..74e59ac 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -31,6 +31,7 @@ #include <osmocom/vty/vty.h> #include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbc_vty.h> #include <osmocom/cbc/internal.h> diff --git a/src/cbsp_server_fsm.c b/src/cbsp_server_fsm.c index 8062364..cdbca82 100644 --- a/src/cbsp_server_fsm.c +++ b/src/cbsp_server_fsm.c @@ -22,6 +22,7 @@ #include <osmocom/gsm/cbsp.h> +#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/internal.h> diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index 6cb3a35..bffe375 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -31,7 +31,7 @@ #include <osmocom/sbcap/sbcap_common.h> -#include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/sbcap_server.h> #include <osmocom/cbc/internal.h> diff --git a/src/sbcap_server_fsm.c b/src/sbcap_server_fsm.c index 43c5ddb..616933e 100644 --- a/src/sbcap_server_fsm.c +++ b/src/sbcap_server_fsm.c @@ -25,6 +25,7 @@ #include <osmocom/sbcap/sbcap_common.h> +#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/sbcap_server.h> #include <osmocom/cbc/internal.h> #include <osmocom/cbc/cbc_peer.h> diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 9c840fa..ec61fc2 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -34,7 +34,7 @@ #include <osmocom/sbcap/sbcap_common.h> -#include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbsp_server.h> #include <osmocom/cbc/sbcap_server.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I41f6e169b1ee6731cd472f6b72ea922260e30ceb Gerrit-Change-Number: 28696 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022