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

Change in osmo-hnbgw[master]: add ps_rab_ass FSM to map GTP via UPF

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... Patch Set 1: (11 comments) File include/osmocom/hnbgw/context_map.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/5f3a5fe8_9670b6ad PS1, Line 56: * and each Response gets one ps_rab_ass FSM. Each such message can contain any number and any combination of > you mean each req+response pair has a ps_rab_ass? or one for each? one each. tried to think of an ascii art way to draw the relations because it is strugglesome to explain in words ... first i tried to have one FSM for req + resp + PFCP for all RABs, then gradually noticed that each RAB needs a separate PFCP FSM, and then that i also need to have separate FSMs for RANAP req and resp. File include/osmocom/hnbgw/ps_rab_fsm.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/49c62d11_8063c541 PS1, Line 24: struct half_gtp_map { > gtp_map_leg? to use some term more "usual". gtp_tunnel would be accurate, except that the FAR (Forwarding Action Rule) is closely related to the *other* GTP tunnel. I'll expand the comment. https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/8ec7ec53_37a06b83 PS1, Line 36: /* Whether the RANAP message this RAB's remote address was obtained from encoded the address in x213_nsap */ > "from encoded the address" looks wrongly written? it is accurate but i'll rephrase to less ambiguous grammar https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/80c397c7_60c89080 PS1, Line 54: /* Backpointer to the ps_rab_ass_fsm for the RAB Assignment Request from Core that created this RAB. */ > (I wonder why do we need 2 different FSMs here, looks like the same followup procedure to me, req + […] commenting in code... File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/2bc0f340_b5d5eb4d PS1, Line 230: LOGP(DHNBAP, LOGL_INFO, "deallocating UE context: id 0x%x, imsi %s, tmsi 0x%x\n", > this can probably go on a different commit. missed this one, i think i needed it for debugging, could just drop it File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/0b5c7053_b1792c48 PS1, Line 373: if (!map->is_ps) { > not super important, but probably makes it easier to read if you do "if (map->is_ps)" now, and move […] we (i?) usually list CS above PS ... so the is_ps maybe should have been named is_cs instead; i agree that it is slightly annoying, but i've made peace with that over the years (this line is unchanged from before this patch despite gerrit rendering on green background, I'm only adding an 'else') https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/6c9af076_7cd2ecf3 PS1, Line 396: rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); > You are actually duplicating these 2 lines now. They can be moved outside the if/else condition. […] i think i even considered that when writing the patch, but left it like this to show that the CS code is completely unchanged... but true. i'll remove the code dup in a separate patch File src/osmo-hnbgw/hnbgw_pfcp.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/6254cfaf_7516e07d PS1, Line 77: if (!hnb_gw_is_gtp_mapping_enabled(hnb_gw)) { > I'd move this to the main function, to avoid calling hnbgw_pfcp_init(). […] that's a matter of taste ... personally i like it very much when things are completely contained in a single file, with the parts appearing in main() as minimal as possible. but i see the LOGP above seems at the wrong place File src/osmo-hnbgw/hnbgw_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/3b1f3a66_383eaeb2 PS1, Line 284: if (!map->is_ps) { > same, probably easier to read with "if (map->is_ps)" idk i like CS above PS better, also before this patch there was "!is_ps" above File src/osmo-hnbgw/hnbgw_vty.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/975c18f5_a6158113 PS1, Line 474: if (g_hnb_gw->config.pfcp.local_addr) > I think we usually print first local addresses, then remote addresses. same order here as where the cmds are added to vty, but ok whatever File src/osmo-hnbgw/ps_rab_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/4eec37a5_8a12da06 PS1, Line 490: /* See whether all RABs are done establishing, and replace RTP info in the RAB Assignment Response message, so that we > s/RTP/GTP/ lol thx -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 10:03:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Split event list for smscb_message_fsm and smscb_peer_fsm

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28826 to look at the new patch set (#2). Change subject: Split event list for smscb_message_fsm and smscb_peer_fsm ...................................................................... Split event list for smscb_message_fsm and smscb_peer_fsm It really doesn't make sense to share the event list betwen those for several reasons. First, because ech of those FSM relate to different things: * smscb_message_fsm: Handling/scheduling of 1 smscb towards all peers * smscb_peer_fsm: Handling/scheduling of 1 smscb towards 1 peer. The former has higher level interface used by the REST API, plus some mid level interface used by smscb_peer_fsm. The later has a mid level interface used by smscb_message_fsm to interact, and a lower level interface used by the SBcAP/CBSP links to talk to. Furthermore, this makes it a lot easier understanding which events are sent from one to another FSM. Change-Id: I909474d1ff4ec7ed20aff0981da47074397df6cb --- M include/osmocom/cbc/Makefile.am M include/osmocom/cbc/smscb_message_fsm.h A include/osmocom/cbc/smscb_peer_fsm.h M src/cbc_message.c M src/cbsp_link_fsm.c M src/sbcap_link_fsm.c M src/smscb_message_fsm.c M src/smscb_peer_fsm.c 8 files changed, 197 insertions(+), 179 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/26/28826/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I909474d1ff4ec7ed20aff0981da47074397df6cb Gerrit-Change-Number: 28826 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_me...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:49:14 +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: Store reported failed TAIs from WriteReplaceResponse in cbc_me...

by pespin

Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Split event list for smscb_message_fsm and smscb_peer_fsm

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28826 ) Change subject: Split event list for smscb_message_fsm and smscb_peer_fsm ...................................................................... Split event list for smscb_message_fsm and smscb_peer_fsm It really doesn't make sense to share the event list betwen those for several reasons. First, because ech of those FSM relate to different things: * smscb_message_fsm: Handling/scheduling of 1 smscb towards all peers * smscb_peer_fsm: Handling/scheduling of 1 smscb towards 1 peer. The former has higher level interface used by the REST API, plus some mid level interface used by smscb_peer_fsm. The later has a mid level interface used by smscb_message_fsm to interact, and a lower level interface used by the SBcAP/CBSP links to talk to. Furthermore, this makes it a lot easier understanding which events are sent from one to another FSM. Change-Id: I909474d1ff4ec7ed20aff0981da47074397df6cb --- M include/osmocom/cbc/Makefile.am M include/osmocom/cbc/smscb_message_fsm.h A include/osmocom/cbc/smscb_peer_fsm.h M src/cbc_message.c M src/cbsp_link_fsm.c M src/sbcap_link_fsm.c M src/smscb_message_fsm.c M src/smscb_peer_fsm.c 8 files changed, 199 insertions(+), 159 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/26/28826/1 diff --git a/include/osmocom/cbc/Makefile.am b/include/osmocom/cbc/Makefile.am index dc3a21f..c4bc639 100644 --- a/include/osmocom/cbc/Makefile.am +++ b/include/osmocom/cbc/Makefile.am @@ -13,4 +13,5 @@ sbcap_link_fsm.h \ rest_it_op.h \ smscb_message_fsm.h \ + smscb_peer_fsm.h \ $(NULL) diff --git a/include/osmocom/cbc/smscb_message_fsm.h b/include/osmocom/cbc/smscb_message_fsm.h index dec719b..7970fd5 100644 --- a/include/osmocom/cbc/smscb_message_fsm.h +++ b/include/osmocom/cbc/smscb_message_fsm.h @@ -3,36 +3,28 @@ #include <stdint.h> #include <osmocom/core/fsm.h> -enum smscb_fsm_event { - SMSCB_E_CHILD_DIED, +enum smscb_message_fsm_event { + SMSCB_MSG_E_CHILD_DIED, /* create a message (from REST) */ - SMSCB_E_CREATE, + SMSCB_MSG_E_CREATE, /* replace a message (from REST) */ - SMSCB_E_REPLACE, + SMSCB_MSG_E_REPLACE, /* get status of a message (from REST) */ - SMSCB_E_STATUS, + SMSCB_MSG_E_STATUS, /* delete a message (from REST) */ - SMSCB_E_DELETE, - /* CBSP peer confirms write */ - SMSCB_E_CBSP_WRITE_ACK, - SMSCB_E_CBSP_WRITE_NACK, - /* CBSP peer confirms replace */ - SMSCB_E_CBSP_REPLACE_ACK, - SMSCB_E_CBSP_REPLACE_NACK, - /* CBSP peer confirms delete */ - SMSCB_E_CBSP_DELETE_ACK, - SMSCB_E_CBSP_DELETE_NACK, - /* CBSP peer confirms status query */ - SMSCB_E_CBSP_STATUS_ACK, - SMSCB_E_CBSP_STATUS_NACK, - /* SBc-AP peer confirms write */ - SMSCB_E_SBCAP_WRITE_ACK, - SMSCB_E_SBCAP_WRITE_NACK, - /* SBc-AP peer confirms delete */ - SMSCB_E_SBCAP_DELETE_ACK, - SMSCB_E_SBCAP_DELETE_NACK, - /* SBc-AP peer sends Write Replace Warning Indication to us */ - SMSCB_E_SBCAP_WRITE_IND, + SMSCB_MSG_E_DELETE, + /* peer confirms write */ + SMSCB_MSG_E_WRITE_ACK, + SMSCB_MSG_E_WRITE_NACK, + /* peer confirms replace */ + SMSCB_MSG_E_REPLACE_ACK, + SMSCB_MSG_E_REPLACE_NACK, + /* peer confirms delete */ + SMSCB_MSG_E_DELETE_ACK, + SMSCB_MSG_E_DELETE_NACK, + /* peer confirms status query */ + SMSCB_MSG_E_STATUS_ACK, + SMSCB_MSG_E_STATUS_NACK }; enum smscb_fsm_state { @@ -58,4 +50,4 @@ T_WAIT_DELETE_ACK, }; -extern const struct value_string smscb_fsm_event_names[]; +extern const struct value_string smscb_message_fsm_event_names[]; diff --git a/include/osmocom/cbc/smscb_peer_fsm.h b/include/osmocom/cbc/smscb_peer_fsm.h new file mode 100644 index 0000000..7bf1c54 --- /dev/null +++ b/include/osmocom/cbc/smscb_peer_fsm.h @@ -0,0 +1,37 @@ +#pragma once + +#include <stdint.h> +#include <osmocom/core/fsm.h> + +enum smscb_peer_fsm_event { + /* create a message (from REST) */ + SMSCB_PEER_E_CREATE, + /* replace a message (from REST) */ + SMSCB_PEER_E_REPLACE, + /* get status of a message (from REST) */ + SMSCB_PEER_E_STATUS, + /* delete a message (from REST) */ + SMSCB_PEER_E_DELETE, + /* CBSP peer confirms write */ + SMSCB_PEER_E_CBSP_WRITE_ACK, + SMSCB_PEER_E_CBSP_WRITE_NACK, + /* CBSP peer confirms replace */ + SMSCB_PEER_E_CBSP_REPLACE_ACK, + SMSCB_PEER_E_CBSP_REPLACE_NACK, + /* CBSP peer confirms delete */ + SMSCB_PEER_E_CBSP_DELETE_ACK, + SMSCB_PEER_E_CBSP_DELETE_NACK, + /* CBSP peer confirms status query */ + SMSCB_PEER_E_CBSP_STATUS_ACK, + SMSCB_PEER_E_CBSP_STATUS_NACK, + /* SBc-AP peer confirms write */ + SMSCB_PEER_E_SBCAP_WRITE_ACK, + SMSCB_PEER_E_SBCAP_WRITE_NACK, + /* SBc-AP peer confirms delete */ + SMSCB_PEER_E_SBCAP_DELETE_ACK, + SMSCB_PEER_E_SBCAP_DELETE_NACK, + /* SBc-AP peer sends Write Replace Warning Indication to us */ + SMSCB_PEER_E_SBCAP_WRITE_IND, +}; + +extern const struct value_string smscb_peer_fsm_event_names[]; diff --git a/src/cbc_message.c b/src/cbc_message.c index 029abcb..a2bf86a 100644 --- a/src/cbc_message.c +++ b/src/cbc_message.c @@ -130,7 +130,7 @@ } /* kick off the state machine[s] */ - if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_E_CREATE, op) < 0) { + if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_MSG_E_CREATE, op) < 0) { rest_it_op_set_http_result(op, 500, "Illegal FSM event"); rest_it_op_complete(op); } @@ -142,7 +142,7 @@ void cbc_message_delete(struct cbc_message *cbcmsg, struct rest_it_op *op) { - if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_E_DELETE, op) < 0) { + if (osmo_fsm_inst_dispatch(cbcmsg->fi, SMSCB_MSG_E_DELETE, op) < 0) { rest_it_op_set_http_result(op, 500, "Illegal FSM event"); rest_it_op_complete(op); } diff --git a/src/cbsp_link_fsm.c b/src/cbsp_link_fsm.c index eba21a7..40414d0 100644 --- a/src/cbsp_link_fsm.c +++ b/src/cbsp_link_fsm.c @@ -27,7 +27,7 @@ #include <osmocom/cbc/cbsp_link.h> #include <osmocom/cbc/cbsp_link_fsm.h> #include <osmocom/cbc/debug.h> -#include <osmocom/cbc/smscb_message_fsm.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #define S(x) (1 << (x)) @@ -339,22 +339,22 @@ switch (dec->msg_type) { case CBSP_MSGT_WRITE_REPLACE_COMPL: if (dec->u.write_replace_compl.old_serial_nr) - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_REPLACE_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_REPLACE_ACK, dec); else - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_WRITE_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_WRITE_ACK, dec); case CBSP_MSGT_WRITE_REPLACE_FAIL: if (dec->u.write_replace_fail.old_serial_nr) - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_REPLACE_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_REPLACE_NACK, dec); else - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_WRITE_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_WRITE_NACK, dec); case CBSP_MSGT_KILL_COMPL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_DELETE_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_DELETE_ACK, dec); case CBSP_MSGT_KILL_FAIL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_DELETE_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_DELETE_NACK, dec); case CBSP_MSGT_MSG_STATUS_QUERY_COMPL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_STATUS_ACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_STATUS_ACK, dec); case CBSP_MSGT_MSG_STATUS_QUERY_FAIL: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_CBSP_STATUS_NACK, dec); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_CBSP_STATUS_NACK, dec); default: LOGPCC(link, LOGL_ERROR, "unknown message %s\n", get_value_string(cbsp_msg_type_names, dec->msg_type)); diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index f2cbe82..685ce7d 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -31,7 +31,7 @@ #include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/debug.h> #include <osmocom/cbc/cbc_peer.h> -#include <osmocom/cbc/smscb_message_fsm.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #define S(x) (1 << (x)) @@ -249,7 +249,7 @@ A_SEQUENCE_OF(void) *as_pdu; SBcAP_Write_Replace_Warning_Response_IEs_t *ie; SBcAP_SBC_AP_PDU_t *err_ind_pdu; - int ev = SMSCB_E_SBCAP_WRITE_ACK; + int ev = SMSCB_PEER_E_SBCAP_WRITE_ACK; as_pdu = (void *)&pdu->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; @@ -257,9 +257,9 @@ ie = sbcap_as_find_ie(as_pdu, 1); if (ie) { if (ie->value.choice.Cause != SBcAP_Cause_message_accepted) - ev = SMSCB_E_SBCAP_WRITE_NACK; + ev = SMSCB_PEER_E_SBCAP_WRITE_NACK; } else { /* This shouldn't happen, the IE is Mandatory... */ - ev = SMSCB_E_SBCAP_WRITE_NACK; + ev = SMSCB_PEER_E_SBCAP_WRITE_NACK; err_ind_pdu = sbcap_gen_error_ind(link, SBcAP_Cause_missing_mandatory_element, pdu); if (err_ind_pdu) @@ -362,7 +362,7 @@ case SBcAP_SBC_AP_PDU_PR_initiatingMessage: switch (pdu->choice.initiatingMessage.procedureCode) { case SBcAP_ProcedureId_Write_Replace_Warning_Indication: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_WRITE_IND, pdu); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBCAP_WRITE_IND, pdu); default: break; } @@ -371,11 +371,11 @@ switch (pdu->choice.successfulOutcome.procedureCode) { case SBcAP_ProcedureId_Write_Replace_Warning: //if (dec->u.write_replace_compl.old_serial_nr) - // return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBcAP_REPLACE_ACK, dec); + // return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBcAP_REPLACE_ACK, dec); //else return cbc_sbcap_link_rx_write_replace_warn_resp(link, mp, pdu); case SBcAP_ProcedureId_Stop_Warning: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_DELETE_ACK, pdu); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBCAP_DELETE_ACK, pdu); default: break; } @@ -383,7 +383,7 @@ case SBcAP_SBC_AP_PDU_PR_unsuccessfulOutcome: switch (pdu->choice.unsuccessfulOutcome.procedureCode) { case SBcAP_ProcedureId_Stop_Warning: - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_DELETE_NACK, pdu); + return osmo_fsm_inst_dispatch(mp->fi, SMSCB_PEER_E_SBCAP_DELETE_NACK, pdu); default: break; } diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index 40d4535..9281736 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -35,20 +35,38 @@ #include <osmocom/cbc/debug.h> #include <osmocom/cbc/rest_it_op.h> #include <osmocom/cbc/smscb_message_fsm.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #define S(x) (1 << (x)) +const struct value_string smscb_message_fsm_event_names[] = { + { SMSCB_MSG_E_CHILD_DIED, "CHILD_DIED" }, + { SMSCB_MSG_E_CREATE, "CREATE" }, + { SMSCB_MSG_E_REPLACE, "REPLACE" }, + { SMSCB_MSG_E_STATUS, "STATUS" }, + { SMSCB_MSG_E_DELETE, "DELETE" }, + { SMSCB_MSG_E_WRITE_ACK, "WRITE_ACK" }, + { SMSCB_MSG_E_WRITE_NACK, "WRITE_NACK" }, + { SMSCB_MSG_E_REPLACE_ACK, "REPLACE_ACK" }, + { SMSCB_MSG_E_REPLACE_NACK, "REPLACE_NACK" }, + { SMSCB_MSG_E_DELETE_ACK, "DELETE_ACK" }, + { SMSCB_MSG_E_DELETE_NACK, "DELETE_NACK" }, + { SMSCB_MSG_E_STATUS_ACK, "STATUS_ACK" }, + { SMSCB_MSG_E_STATUS_NACK, "STATUS_NACK" }, + { 0, NULL } +}; + static void smscb_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct cbc_message *cbcmsg = fi->priv; switch (event) { - case SMSCB_E_CREATE: + case SMSCB_MSG_E_CREATE: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 15, T_WAIT_WRITE_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_CREATE, NULL); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_CREATE, NULL); break; default: OSMO_ASSERT(0); @@ -61,10 +79,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_WRITE_ACK: - case SMSCB_E_CBSP_WRITE_NACK: - case SMSCB_E_SBCAP_WRITE_ACK: - case SMSCB_E_SBCAP_WRITE_NACK: + case SMSCB_MSG_E_WRITE_ACK: + case SMSCB_MSG_E_WRITE_NACK: /* check if any per-peer children have not yet received the ACK or * timed out */ llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { @@ -92,26 +108,26 @@ struct cbc_message *cbcmsg = fi->priv; switch (event) { - case SMSCB_E_REPLACE: + case SMSCB_MSG_E_REPLACE: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 15, T_WAIT_REPLACE_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_REPLACE, data); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_REPLACE, data); break; - case SMSCB_E_STATUS: + case SMSCB_MSG_E_STATUS: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 15, T_WAIT_STATUS_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_STATUS, data); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_STATUS, data); break; - case SMSCB_E_DELETE: + case SMSCB_MSG_E_DELETE: OSMO_ASSERT(!cbcmsg->it_op); cbcmsg->it_op = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 15, T_WAIT_DELETE_ACK); /* forward this event to all child FSMs (i.e. all smscb_message_peer) */ - osmo_fsm_inst_broadcast_children(fi, SMSCB_E_DELETE, data); + osmo_fsm_inst_broadcast_children(fi, SMSCB_PEER_E_DELETE, data); break; default: OSMO_ASSERT(0); @@ -124,8 +140,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_REPLACE_ACK: - case SMSCB_E_CBSP_REPLACE_NACK: + case SMSCB_MSG_E_REPLACE_ACK: + case SMSCB_MSG_E_REPLACE_NACK: llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { if (peer_fi->state == SMSCB_S_WAIT_REPLACE_ACK) return; @@ -152,8 +168,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_STATUS_ACK: - case SMSCB_E_CBSP_STATUS_NACK: + case SMSCB_MSG_E_STATUS_ACK: + case SMSCB_MSG_E_STATUS_NACK: llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { if (peer_fi->state == SMSCB_S_WAIT_STATUS_ACK) return; @@ -180,10 +196,8 @@ struct osmo_fsm_inst *peer_fi; switch (event) { - case SMSCB_E_CBSP_DELETE_ACK: - case SMSCB_E_CBSP_DELETE_NACK: - case SMSCB_E_SBCAP_DELETE_ACK: - case SMSCB_E_SBCAP_DELETE_NACK: + case SMSCB_MSG_E_DELETE_ACK: + case SMSCB_MSG_E_DELETE_NACK: llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { if (peer_fi->state != SMSCB_S_DELETED) return; @@ -223,25 +237,23 @@ static struct osmo_fsm_state smscb_fsm_states[] = { [SMSCB_S_INIT] = { .name = "INIT", - .in_event_mask = S(SMSCB_E_CREATE), + .in_event_mask = S(SMSCB_MSG_E_CREATE), .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), .action = smscb_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { .name = "WAIT_WRITE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_WRITE_ACK) | - S(SMSCB_E_CBSP_WRITE_NACK) | - S(SMSCB_E_SBCAP_WRITE_ACK) | - S(SMSCB_E_SBCAP_WRITE_NACK), + .in_event_mask = S(SMSCB_MSG_E_WRITE_ACK) | + S(SMSCB_MSG_E_WRITE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE), .action = smscb_fsm_wait_write_ack, .onleave = smscb_fsm_wait_write_ack_onleave, }, [SMSCB_S_ACTIVE] = { .name = "ACTIVE", - .in_event_mask = S(SMSCB_E_REPLACE) | - S(SMSCB_E_STATUS) | - S(SMSCB_E_DELETE), + .in_event_mask = S(SMSCB_MSG_E_REPLACE) | + S(SMSCB_MSG_E_STATUS) | + S(SMSCB_MSG_E_DELETE), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_REPLACE_ACK) | S(SMSCB_S_WAIT_STATUS_ACK) | @@ -250,26 +262,24 @@ }, [SMSCB_S_WAIT_REPLACE_ACK] = { .name = "WAIT_REPLACE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_REPLACE_ACK) | - S(SMSCB_E_CBSP_REPLACE_NACK), + .in_event_mask = S(SMSCB_MSG_E_REPLACE_ACK) | + S(SMSCB_MSG_E_REPLACE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE), .action = smscb_fsm_wait_replace_ack, .onleave = smscb_fsm_wait_replace_ack_onleave, }, [SMSCB_S_WAIT_STATUS_ACK] = { .name = "WAIT_STATUS_ACK", - .in_event_mask = S(SMSCB_E_CBSP_STATUS_ACK) | - S(SMSCB_E_CBSP_STATUS_NACK), + .in_event_mask = S(SMSCB_MSG_E_STATUS_ACK) | + S(SMSCB_MSG_E_STATUS_NACK), .out_state_mask = S(SMSCB_S_ACTIVE), .action = smscb_fsm_wait_status_ack, .onleave = smscb_fsm_wait_status_ack_onleave, }, [SMSCB_S_WAIT_DELETE_ACK] = { .name = "WAIT_DELETE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_DELETE_ACK) | - S(SMSCB_E_CBSP_DELETE_NACK) | - S(SMSCB_E_SBCAP_DELETE_ACK) | - S(SMSCB_E_SBCAP_DELETE_NACK), + .in_event_mask = S(SMSCB_MSG_E_DELETE_ACK) | + S(SMSCB_MSG_E_DELETE_NACK), .out_state_mask = S(SMSCB_S_DELETED), .action = smscb_fsm_wait_delete_ack, .onleave = smscb_fsm_wait_delete_ack_onleave, @@ -311,7 +321,7 @@ static void smscb_fsm_allstate(struct osmo_fsm_inst *Fi, uint32_t event, void *data) { switch (event) { - case SMSCB_E_CHILD_DIED: + case SMSCB_MSG_E_CHILD_DIED: break; default: OSMO_ASSERT(0); @@ -332,11 +342,11 @@ .name = "SMSCB", .states = smscb_fsm_states, .num_states = ARRAY_SIZE(smscb_fsm_states), - .allstate_event_mask = S(SMSCB_E_CHILD_DIED), + .allstate_event_mask = S(SMSCB_MSG_E_CHILD_DIED), .allstate_action = smscb_fsm_allstate, .timer_cb = smscb_fsm_timer_cb, .log_subsys = DSMSCB, - .event_names = smscb_fsm_event_names, + .event_names = smscb_message_fsm_event_names, .cleanup= smscb_fsm_cleanup, }; diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 2c1edab..f6a2661 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -40,29 +40,29 @@ #include <osmocom/cbc/sbcap_link.h> #include <osmocom/cbc/sbcap_msg.h> #include <osmocom/cbc/debug.h> +#include <osmocom/cbc/smscb_peer_fsm.h> #include <osmocom/cbc/smscb_message_fsm.h> #define S(x) (1 << (x)) -const struct value_string smscb_fsm_event_names[] = { - { SMSCB_E_CHILD_DIED, "CHILD_DIED" }, - { SMSCB_E_CREATE, "CREATE" }, - { SMSCB_E_REPLACE, "REPLACE" }, - { SMSCB_E_STATUS, "STATUS" }, - { SMSCB_E_DELETE, "DELETE" }, - { SMSCB_E_CBSP_WRITE_ACK, "CBSP_WRITE_ACK" }, - { SMSCB_E_CBSP_WRITE_NACK, "CBSP_WRITE_NACK" }, - { SMSCB_E_CBSP_REPLACE_ACK, "CBSP_REPLACE_ACK" }, - { SMSCB_E_CBSP_REPLACE_NACK, "CBSP_REPLACE_NACK" }, - { SMSCB_E_CBSP_DELETE_ACK, "CBSP_DELETE_ACK" }, - { SMSCB_E_CBSP_DELETE_NACK, "CBSP_DELETE_NACK" }, - { SMSCB_E_CBSP_STATUS_ACK, "CBSP_STATUS_ACK" }, - { SMSCB_E_CBSP_STATUS_NACK, "CBSP_STATUS_NACK" }, - { SMSCB_E_SBCAP_WRITE_ACK, "SBcAP_WRITE_ACK" }, - { SMSCB_E_SBCAP_WRITE_NACK, "SBcAP_WRITE_NACK" }, - { SMSCB_E_SBCAP_DELETE_ACK, "SBcAP_DELETE_ACK" }, - { SMSCB_E_SBCAP_DELETE_NACK, "SBcAP_DELETE_NACK" }, - { SMSCB_E_SBCAP_WRITE_IND, "SBcAP_WRITE_IND" }, +const struct value_string smscb_peer_fsm_event_names[] = { + { SMSCB_PEER_E_CREATE, "CREATE" }, + { SMSCB_PEER_E_REPLACE, "REPLACE" }, + { SMSCB_PEER_E_STATUS, "STATUS" }, + { SMSCB_PEER_E_DELETE, "DELETE" }, + { SMSCB_PEER_E_CBSP_WRITE_ACK, "CBSP_WRITE_ACK" }, + { SMSCB_PEER_E_CBSP_WRITE_NACK, "CBSP_WRITE_NACK" }, + { SMSCB_PEER_E_CBSP_REPLACE_ACK, "CBSP_REPLACE_ACK" }, + { SMSCB_PEER_E_CBSP_REPLACE_NACK, "CBSP_REPLACE_NACK" }, + { SMSCB_PEER_E_CBSP_DELETE_ACK, "CBSP_DELETE_ACK" }, + { SMSCB_PEER_E_CBSP_DELETE_NACK, "CBSP_DELETE_NACK" }, + { SMSCB_PEER_E_CBSP_STATUS_ACK, "CBSP_STATUS_ACK" }, + { SMSCB_PEER_E_CBSP_STATUS_NACK, "CBSP_STATUS_NACK" }, + { SMSCB_PEER_E_SBCAP_WRITE_ACK, "SBcAP_WRITE_ACK" }, + { SMSCB_PEER_E_SBCAP_WRITE_NACK, "SBcAP_WRITE_NACK" }, + { SMSCB_PEER_E_SBCAP_DELETE_ACK, "SBcAP_DELETE_ACK" }, + { SMSCB_PEER_E_SBCAP_DELETE_NACK, "SBcAP_DELETE_NACK" }, + { SMSCB_PEER_E_SBCAP_WRITE_IND, "SBcAP_WRITE_IND" }, { 0, NULL } }; @@ -349,7 +349,7 @@ int rc; switch (event) { - case SMSCB_E_CREATE: + case SMSCB_PEER_E_CREATE: /* send it to peer */ rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); if (rc == 0) { @@ -372,24 +372,24 @@ SBcAP_Write_Replace_Warning_Response_IEs_t *ie; switch (event) { - case SMSCB_E_CBSP_WRITE_ACK: + case SMSCB_PEER_E_CBSP_WRITE_ACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_WRITE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); break; - case SMSCB_E_CBSP_WRITE_NACK: + case SMSCB_PEER_E_CBSP_WRITE_NACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_WRITE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); break; - case SMSCB_E_SBCAP_WRITE_ACK: + case SMSCB_PEER_E_SBCAP_WRITE_ACK: sbcap = data; OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_successfulOutcome); OSMO_ASSERT(sbcap->choice.successfulOutcome.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning); @@ -402,12 +402,12 @@ } osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_WRITE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); break; - case SMSCB_E_SBCAP_WRITE_NACK: + case SMSCB_PEER_E_SBCAP_WRITE_NACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_WRITE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, mp); break; default: OSMO_ASSERT(0); @@ -420,7 +420,7 @@ struct osmo_cbsp_decoded *cbsp; switch (event) { - case SMSCB_E_REPLACE: /* send WRITE-REPLACE to BSC */ + case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to BSC */ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_WRITE_REPLACE); OSMO_ASSERT(cbsp); cbsp->u.write_replace.msg_id = mp->cbcmsg->msg.message_id; @@ -432,7 +432,7 @@ cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); break; - case SMSCB_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ + case SMSCB_PEER_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_MSG_STATUS_QUERY); OSMO_ASSERT(cbsp); cbsp->u.msg_status_query.msg_id = mp->cbcmsg->msg.message_id; @@ -453,20 +453,20 @@ struct osmo_cbsp_decoded *dec = NULL; switch (event) { - case SMSCB_E_CBSP_STATUS_ACK: + case SMSCB_PEER_E_CBSP_STATUS_ACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_compl.num_compl_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_STATUS_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_ACK, mp); break; - case SMSCB_E_CBSP_STATUS_NACK: + case SMSCB_PEER_E_CBSP_STATUS_NACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.msg_status_query_fail.num_compl_list); msg_peer_append_cbsp_fail(mp, &dec->u.msg_status_query_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_STATUS_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, mp); break; default: OSMO_ASSERT(0); @@ -480,22 +480,22 @@ struct osmo_cbsp_decoded *dec = NULL; switch (event) { - case SMSCB_E_CBSP_REPLACE_ACK: + case SMSCB_PEER_E_CBSP_REPLACE_ACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_compl.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_compl.cell_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_REPLACE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_ACK, mp); break; - case SMSCB_E_CBSP_REPLACE_NACK: + case SMSCB_PEER_E_CBSP_REPLACE_NACK: dec = data; msg_peer_append_cbsp_compl(mp, &dec->u.write_replace_fail.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.write_replace_fail.cell_list); msg_peer_append_cbsp_fail(mp, &dec->u.write_replace_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_REPLACE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, mp); break; default: OSMO_ASSERT(0); @@ -509,16 +509,16 @@ //SBcAP_SBC_AP_PDU_t *pdu = NULL; switch (event) { - case SMSCB_E_CBSP_DELETE_ACK: + case SMSCB_PEER_E_CBSP_DELETE_ACK: dec = data; /* append results */ msg_peer_append_cbsp_compl(mp, &dec->u.kill_compl.num_compl_list); msg_peer_append_cbsp_cell(mp, &dec->u.kill_compl.cell_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_DELETE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); break; - case SMSCB_E_CBSP_DELETE_NACK: + case SMSCB_PEER_E_CBSP_DELETE_NACK: dec = data; /* append results */ msg_peer_append_cbsp_compl(mp, &dec->u.kill_fail.num_compl_list); @@ -526,19 +526,19 @@ msg_peer_append_cbsp_fail(mp, &dec->u.kill_fail.fail_list); osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_DELETE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); break; - case SMSCB_E_SBCAP_DELETE_ACK: + case SMSCB_PEER_E_SBCAP_DELETE_ACK: //pdu = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_DELETE_ACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_ACK, mp); break; - case SMSCB_E_SBCAP_DELETE_NACK: + case SMSCB_PEER_E_SBCAP_DELETE_NACK: //pdu = data; osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_SBCAP_DELETE_NACK, mp); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, mp); break; default: OSMO_ASSERT(0); @@ -556,10 +556,10 @@ osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); switch (mp->peer->proto) { case CBC_PEER_PROTO_CBSP: - ev = SMSCB_E_CBSP_WRITE_NACK; + ev = SMSCB_PEER_E_CBSP_WRITE_NACK; break; case CBC_PEER_PROTO_SBcAP: - ev = SMSCB_E_SBCAP_WRITE_NACK; + ev = SMSCB_PEER_E_SBCAP_WRITE_NACK; break; default: OSMO_ASSERT(0); @@ -568,20 +568,20 @@ break; case T_WAIT_REPLACE_ACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_REPLACE_NACK, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_REPLACE_NACK, NULL); break; case T_WAIT_STATUS_ACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_STATUS_NACK, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_STATUS_NACK, NULL); break; case T_WAIT_DELETE_ACK: osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); switch (mp->peer->proto) { case CBC_PEER_PROTO_CBSP: - ev = SMSCB_E_CBSP_DELETE_NACK; + ev = SMSCB_PEER_E_CBSP_DELETE_NACK; break; case CBC_PEER_PROTO_SBcAP: - ev = SMSCB_E_SBCAP_DELETE_NACK; + ev = SMSCB_PEER_E_SBCAP_DELETE_NACK; break; default: OSMO_ASSERT(0); @@ -603,7 +603,7 @@ SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; switch (event) { - case SMSCB_E_DELETE: /* send KILL to BSC */ + case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ switch (fi->state) { case SMSCB_S_DELETED: case SMSCB_S_INIT: @@ -640,11 +640,11 @@ break; case CBC_PEER_PROTO_SABP: default: - osmo_panic("SMSCB_E_DELETE not implemented for proto %u", mp->peer->proto); + osmo_panic("SMSCB_PEER_E_DELETE not implemented for proto %u", mp->peer->proto); } osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); break; - case SMSCB_E_SBCAP_WRITE_IND: + case SMSCB_PEER_E_SBCAP_WRITE_IND: sbcap = (SBcAP_SBC_AP_PDU_t *)data; OSMO_ASSERT(sbcap->present == SBcAP_SBC_AP_PDU_PR_initiatingMessage); OSMO_ASSERT(sbcap->choice.initiatingMessage.procedureCode == SBcAP_ProcedureId_Write_Replace_Warning_Indication); @@ -671,24 +671,24 @@ static const struct osmo_fsm_state smscb_p_fsm_states[] = { [SMSCB_S_INIT] = { .name = "INIT", - .in_event_mask = S(SMSCB_E_CREATE), + .in_event_mask = S(SMSCB_PEER_E_CREATE), .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { .name = "WAIT_WRITE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_WRITE_ACK) | - S(SMSCB_E_CBSP_WRITE_NACK) | - S(SMSCB_E_SBCAP_WRITE_ACK) | - S(SMSCB_E_SBCAP_WRITE_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_WRITE_ACK) | + S(SMSCB_PEER_E_CBSP_WRITE_NACK) | + S(SMSCB_PEER_E_SBCAP_WRITE_ACK) | + S(SMSCB_PEER_E_SBCAP_WRITE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_DELETE_ACK), .action = smscb_p_fsm_wait_write_ack, }, [SMSCB_S_ACTIVE] = { .name = "ACTIVE", - .in_event_mask = S(SMSCB_E_REPLACE) | - S(SMSCB_E_STATUS), + .in_event_mask = S(SMSCB_PEER_E_REPLACE) | + S(SMSCB_PEER_E_STATUS), .out_state_mask = S(SMSCB_S_WAIT_REPLACE_ACK) | S(SMSCB_S_WAIT_STATUS_ACK) | S(SMSCB_S_WAIT_DELETE_ACK), @@ -696,26 +696,26 @@ }, [SMSCB_S_WAIT_STATUS_ACK] = { .name = "WAIT_STATUS_ACK", - .in_event_mask = S(SMSCB_E_CBSP_STATUS_ACK) | - S(SMSCB_E_CBSP_STATUS_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_STATUS_ACK) | + S(SMSCB_PEER_E_CBSP_STATUS_NACK), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_DELETE_ACK), .action = smscb_p_fsm_wait_status_ack, }, [SMSCB_S_WAIT_REPLACE_ACK] = { .name = "WAIT_REPLACE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_REPLACE_ACK) | - S(SMSCB_E_CBSP_REPLACE_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_REPLACE_ACK) | + S(SMSCB_PEER_E_CBSP_REPLACE_NACK), .out_state_mask = S(SMSCB_S_ACTIVE) | S(SMSCB_S_WAIT_DELETE_ACK), .action = smscb_p_fsm_wait_replace_ack, }, [SMSCB_S_WAIT_DELETE_ACK] = { .name = "WAIT_DELETE_ACK", - .in_event_mask = S(SMSCB_E_CBSP_DELETE_ACK) | - S(SMSCB_E_CBSP_DELETE_NACK) | - S(SMSCB_E_SBCAP_DELETE_ACK) | - S(SMSCB_E_SBCAP_DELETE_NACK), + .in_event_mask = S(SMSCB_PEER_E_CBSP_DELETE_ACK) | + S(SMSCB_PEER_E_CBSP_DELETE_NACK) | + S(SMSCB_PEER_E_SBCAP_DELETE_ACK) | + S(SMSCB_PEER_E_SBCAP_DELETE_NACK), .out_state_mask = S(SMSCB_S_DELETED), .action = smscb_p_fsm_wait_delete_ack, }, @@ -728,12 +728,12 @@ .name = "SMSCB-PEER", .states = smscb_p_fsm_states, .num_states = ARRAY_SIZE(smscb_p_fsm_states), - .allstate_event_mask = S(SMSCB_E_DELETE) | - S(SMSCB_E_SBCAP_WRITE_IND), + .allstate_event_mask = S(SMSCB_PEER_E_DELETE) | + S(SMSCB_PEER_E_SBCAP_WRITE_IND), .allstate_action = smscb_p_fsm_allstate, .timer_cb = smscb_p_fsm_timer_cb, .log_subsys = DCBSP, - .event_names = smscb_fsm_event_names, + .event_names = smscb_peer_fsm_event_names, .cleanup = smscb_p_fsm_cleanup, }; @@ -747,7 +747,7 @@ struct cbc_message_peer *mp; struct osmo_fsm_inst *fi; - fi = osmo_fsm_inst_alloc_child(&smscb_p_fsm, cbcmsg->fi, SMSCB_E_CHILD_DIED); + fi = osmo_fsm_inst_alloc_child(&smscb_p_fsm, cbcmsg->fi, SMSCB_MSG_E_CHILD_DIED); if (!fi) return NULL; /* include the peer name in the ID of the child FSM */ -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I909474d1ff4ec7ed20aff0981da47074397df6cb Gerrit-Change-Number: 28826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by pespin

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 to look at the new patch set (#2). Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... sbcap: Log info about messages received and trasmitted Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 --- M include/osmocom/sbcap/sbcap_common.h M src/sbcap/sbcap_common.c M src/sbcap_link.c M src/sbcap_link_fsm.c 4 files changed, 65 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/19/28819/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Introduce logging category smscb

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28825 ) Change subject: Introduce logging category smscb ...................................................................... Introduce logging category smscb The smscb_message_fsm is totally independent of CBSP. Change-Id: I6e686747ddde9540ff3f765ef461bfca812615ba --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/debug.h M src/cbc_main.c M src/smscb_message_fsm.c 4 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/25/28825/1 diff --git a/doc/examples/osmo-cbc/osmo-cbc.cfg b/doc/examples/osmo-cbc/osmo-cbc.cfg index 7f5ebdc..9874a39 100644 --- a/doc/examples/osmo-cbc/osmo-cbc.cfg +++ b/doc/examples/osmo-cbc/osmo-cbc.cfg @@ -1,5 +1,6 @@ log stderr logging level main notice + logging level smscb notice logging level cbsp notice logging level sbcap notice logging level asn1c notice diff --git a/include/osmocom/cbc/debug.h b/include/osmocom/cbc/debug.h index c0b3864..e07cfdd 100644 --- a/include/osmocom/cbc/debug.h +++ b/include/osmocom/cbc/debug.h @@ -2,6 +2,7 @@ enum { DMAIN, + DSMSCB, DCBSP, DSBcAP, DASN1C, diff --git a/src/cbc_main.c b/src/cbc_main.c index 5096dc8..7e13e52 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -62,6 +62,13 @@ .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DSMSCB] = { + .name = "DSMSCB", + .description = "SMS Cell Broadcast handling", + .color = "\033[1;35m", + .enabled = 1, + .loglevel = LOGL_NOTICE, + }, [DCBSP] = { .name = "DCBSP", .description = "Cell Broadcast Service Protocol (CBC-BSC)", diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index ba17910..40d4535 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -335,7 +335,7 @@ .allstate_event_mask = S(SMSCB_E_CHILD_DIED), .allstate_action = smscb_fsm_allstate, .timer_cb = smscb_fsm_timer_cb, - .log_subsys = DCBSP, + .log_subsys = DSMSCB, .event_names = smscb_fsm_event_names, .cleanup= smscb_fsm_cleanup, }; @@ -349,7 +349,7 @@ char idbuf[32]; if (cbc_message_by_id(orig_msg->msg.message_id)) { - LOGP(DCBSP, LOGL_ERROR, "Cannot create message_id %u (already exists)\n", + LOGP(DSMSCB, LOGL_ERROR, "Cannot create message_id %u (already exists)\n", orig_msg->msg.message_id); return NULL; } @@ -357,13 +357,13 @@ snprintf(idbuf, sizeof(idbuf), "%s-%u", orig_msg->cbe_name, orig_msg->msg.message_id); fi = osmo_fsm_inst_alloc(&smscb_fsm, ctx, NULL, LOGL_INFO, idbuf); if (!fi) { - LOGP(DCBSP, LOGL_ERROR, "Cannot allocate cbc_message fsm\n"); + LOGP(DSMSCB, LOGL_ERROR, "Cannot allocate cbc_message fsm\n"); return NULL; } smscb = talloc(fi, struct cbc_message); if (!smscb) { - LOGP(DCBSP, LOGL_ERROR, "Cannot allocate cbc_message\n"); + LOGP(DSMSCB, LOGL_ERROR, "Cannot allocate cbc_message\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6e686747ddde9540ff3f765ef461bfca812615ba Gerrit-Change-Number: 28825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Log info about messages received and trasmitted

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 1: (2 comments) File src/sbcap_link.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/de5bc368_4127b1c9 PS1, Line 397: Transmitting > Given that you're changing "Received" to "Rx", I suggest to use "Tx" here for consistency. Ack https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/88b42868_4a92312f PS1, Line 403: LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", > Isn't it redundant to print PDU name here? […] Yes, I'm printing it as debug after encoding it, this is helpful to find out that it was encoded successfuly. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:44:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of WriteReplaceWarnResponse

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28824 ) Change subject: sbcap: Improve handling of WriteReplaceWarnResponse ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0a4d5bdbb6c4fd3870a4f4ebf226668b70fea06a Gerrit-Change-Number: 28824 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:42:38 +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: Store reported failed TAIs from WriteReplaceResponse in cbc_me...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:40:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022