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

Change in osmocom-bb[master]: trxcon: extended RACH != 11-bit RACH, correct logging messages

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28836 ) Change subject: trxcon: extended RACH != 11-bit RACH, correct logging messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7f977d5d2b68741a230c706f5b16cf307bc267d1 Gerrit-Change-Number: 28836 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:22:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28835 ) Change subject: trxcon: abstract out 'struct trxcon_inst' from L1CTL/TRXC/TRXD ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7282da6dd16216bb4295c4d18f993251defbdf0a Gerrit-Change-Number: 28835 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:21:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move L1 params from struct trx_instance to trxcon_inst

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28834 ) Change subject: trxcon: move L1 params from struct trx_instance to trxcon_inst ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifbd9bb17d63ab1d8712d0c8022a62117a48c6384 Gerrit-Change-Number: 28834 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:21:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_fsm, move into a separate file

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28809 ) Change subject: trxcon: rework trxcon_fsm, move into a separate file ...................................................................... Patch Set 4: Code-Review+2 (2 comments) Patchset: PS4: 1+1 File src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h: https://gerrit.osmocom.org/c/osmocom-bb/+/28809/comment/789b6112_331abde9 PS4, Line 61: uint8_t mode; > this used to be enum gsm_phys_chan_config in previous patch versions? I introduced this structure in the last patchset. It is used by both TRXCON_EV_SET_{CCCH,TCH}_MODE_REQ, while enum gsm_phys_chan_config is only applicable to TRXCON_EV_SET_CCCH_MODE_REQ. This is why I am using uint8_t. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifaf63ead9dd180181358e771367b2a686ba159ca Gerrit-Change-Number: 28809 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:21:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 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 submitted this change. ( 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, 197 insertions(+), 179 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve 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..589a832 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); @@ -549,44 +549,22 @@ static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) { - struct cbc_message_peer *mp = (struct cbc_message_peer *)fi->priv; - int ev; switch (fi->T) { case T_WAIT_WRITE_ACK: 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; - break; - case CBC_PEER_PROTO_SBcAP: - ev = SMSCB_E_SBCAP_WRITE_NACK; - break; - default: - OSMO_ASSERT(0); - } - osmo_fsm_inst_dispatch(fi->proc.parent, ev, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, NULL); 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; - break; - case CBC_PEER_PROTO_SBcAP: - ev = SMSCB_E_SBCAP_DELETE_NACK; - break; - default: - OSMO_ASSERT(0); - } - osmo_fsm_inst_dispatch(fi->proc.parent, ev, NULL); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, NULL); break; default: OSMO_ASSERT(0); @@ -603,7 +581,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 +618,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 +649,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 +674,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 +706,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 +725,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: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Split smscb_peer_fsm into CBSP and SBcAP specific FSMs This further simplifies tracking of events and simplifies and clears code on each of the FSMs. Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 --- M include/osmocom/cbc/smscb_peer_fsm.h M src/Makefile.am A src/cbsp_smscb_peer_fsm.c A src/sbcap_smscb_peer_fsm.c M src/smscb_peer_fsm.c 5 files changed, 952 insertions(+), 665 deletions(-) Approvals: pespin: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/cbc/smscb_peer_fsm.h b/include/osmocom/cbc/smscb_peer_fsm.h index 7bf1c54..7ae8968 100644 --- a/include/osmocom/cbc/smscb_peer_fsm.h +++ b/include/osmocom/cbc/smscb_peer_fsm.h @@ -35,3 +35,6 @@ }; extern const struct value_string smscb_peer_fsm_event_names[]; + +extern struct osmo_fsm cbsp_smscb_peer_fsm; +extern struct osmo_fsm sbcap_smscb_peer_fsm; diff --git a/src/Makefile.am b/src/Makefile.am index de40dea..ade53d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,14 +18,16 @@ cbsp_link.c \ cbsp_link_fsm.c \ cbsp_msg.c \ + cbsp_smscb_peer_fsm.c \ rest_api.c \ charset.c \ rest_it_op.c \ sbcap_msg.c \ sbcap_link.c \ sbcap_link_fsm.c \ - smscb_peer_fsm.c \ + sbcap_smscb_peer_fsm.c \ smscb_message_fsm.c \ + smscb_peer_fsm.c \ $(NULL) osmo_cbc_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \ diff --git a/src/cbsp_smscb_peer_fsm.c b/src/cbsp_smscb_peer_fsm.c new file mode 100644 index 0000000..872008c --- /dev/null +++ b/src/cbsp_smscb_peer_fsm.c @@ -0,0 +1,563 @@ +/* SMSCB Peer FSM: Represents state of one SMSCB for one peer (BSC) */ + +/* This FSM exists per tuple of (message, bsc peer) */ + +/* (C) 2019 by Harald Welte <laforge(a)gnumonks.org> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/fsm.h> + +#include <osmocom/gsm/gsm23003.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/gsm/cbsp.h> + +#include <osmocom/sbcap/sbcap_common.h> + +#include <osmocom/cbc/cbc_message.h> +#include <osmocom/cbc/cbc_peer.h> +#include <osmocom/cbc/cbsp_link.h> +#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)) + +/*********************************************************************** + * Helper functions + ***********************************************************************/ + +/* covert TS 08.08 Cell Identity value to CBC internal type */ +static enum cbc_cell_id_type cci_discr_from_cell_id(enum CELL_IDENT id_discr) +{ + switch (id_discr) { + case CELL_IDENT_NO_CELL: + return CBC_CELL_ID_NONE; + case CELL_IDENT_WHOLE_GLOBAL: + return CBC_CELL_ID_CGI; + case CELL_IDENT_LAC_AND_CI: + return CBC_CELL_ID_LAC_CI; + case CELL_IDENT_CI: + return CBC_CELL_ID_CI; + case CELL_IDENT_LAI: + return CBC_CELL_ID_LAI; + case CELL_IDENT_LAC: + return CBC_CELL_ID_LAC; + case CELL_IDENT_BSS: + return CBC_CELL_ID_BSS; + default: + return -1; + } +} + +/* covert CBC internal type to TS 08.08 Cell Identity */ +static enum CELL_IDENT cell_id_from_ccid_discr(enum cbc_cell_id_type in) +{ + switch (in) { + case CBC_CELL_ID_NONE: + return CELL_IDENT_NO_CELL; + case CBC_CELL_ID_CGI: + return CELL_IDENT_WHOLE_GLOBAL; + case CBC_CELL_ID_LAC_CI: + return CELL_IDENT_LAC_AND_CI; + case CBC_CELL_ID_CI: + return CELL_IDENT_CI; + case CBC_CELL_ID_LAI: + return CELL_IDENT_LAI; + case CBC_CELL_ID_LAC: + return CELL_IDENT_LAC; + case CBC_CELL_ID_BSS: + return CELL_IDENT_BSS; + default: + return -1; + } +} + +/* convert TS 08.08 Cell Identifier Union to CBC internal type */ +static void cci_from_cbsp(struct cbc_cell_id *cci, enum CELL_IDENT id_discr, + const union gsm0808_cell_id_u *u) +{ + cci->id_discr = cci_discr_from_cell_id(id_discr); + + switch (id_discr) { + case CELL_IDENT_NO_CELL: + break; + case CELL_IDENT_WHOLE_GLOBAL: + cci->u.cgi = u->global; + break; + case CELL_IDENT_LAC_AND_CI: + cci->u.lac_and_ci = u->lac_and_ci; + break; + case CELL_IDENT_CI: + cci->u.ci = u->ci; + break; + case CELL_IDENT_LAI: + cci->u.lai = u->lai_and_lac; + break; + case CELL_IDENT_LAC: + cci->u.lac = u->lac; + break; + case CELL_IDENT_BSS: + break; + default: + break; + } +} + +/* convert TS 08.08 Cell Identifier Union to CBC internal type */ +static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci) +{ + switch (cci->id_discr) { + case CBC_CELL_ID_NONE: + break; + case CBC_CELL_ID_CGI: + u->global = cci->u.cgi; + printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global))); + break; + case CBC_CELL_ID_LAC_CI: + u->lac_and_ci = cci->u.lac_and_ci; + break; + case CBC_CELL_ID_CI: + u->ci = cci->u.ci; + break; + case CBC_CELL_ID_LAI: + u->lai_and_lac = cci->u.lai; + break; + case CBC_CELL_ID_LAC: + u->lac = cci->u.lac; + break; + case CBC_CELL_ID_BSS: + break; + default: + OSMO_ASSERT(0); + } +} + +/* read a single osmo_cbsp_num_compl_ent and add it to cbc_message_peer */ +static void cci_from_cbsp_compl_ent(struct cbc_message_peer *mp, + struct osmo_cbsp_num_compl_ent *ce, enum CELL_IDENT id_discr) +{ + struct cbc_cell_id *cci; + + cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->num_compl_list); + } + cci_from_cbsp(cci, id_discr, &ce->cell_id); + cci->num_compl.num_compl += ce->num_compl; + cci->num_compl.num_bcast_info += ce->num_bcast_info; +} +static void msg_peer_append_cbsp_compl(struct cbc_message_peer *mp, + struct osmo_cbsp_num_compl_list *nclist) +{ + struct osmo_cbsp_num_compl_ent *ce; + + llist_for_each_entry(ce, &nclist->list, list) + cci_from_cbsp_compl_ent(mp, ce, nclist->id_discr); +} + +/* read a single osmo_cbsp_cell_ent and add it to cbc_message_peer */ +static void cci_from_cbsp_cell_ent(struct cbc_message_peer *mp, + struct osmo_cbsp_cell_ent *ce, enum CELL_IDENT id_discr) +{ + struct cbc_cell_id *cci; + + cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->cell_list); + } + cci_from_cbsp(cci, id_discr, &ce->cell_id); +} +static void msg_peer_append_cbsp_cell(struct cbc_message_peer *mp, + struct osmo_cbsp_cell_list *clist) +{ + struct osmo_cbsp_cell_ent *ce; + + llist_for_each_entry(ce, &clist->list, list) + cci_from_cbsp_cell_ent(mp, ce, clist->id_discr); +} + +/* read a single osmo_cbsp_fail_ent and add it to cbc_message_peer */ +static void cci_from_cbsp_fail_ent(struct cbc_message_peer *mp, + struct osmo_cbsp_fail_ent *fe) +{ + struct cbc_cell_id *cci; + cci = NULL; // lookup */ + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->fail_list); + } + cci->id_discr = cci_discr_from_cell_id(fe->id_discr); + cci->fail.cause = fe->cause; +} +static void msg_peer_append_cbsp_fail(struct cbc_message_peer *mp, struct llist_head *flist) +{ + struct osmo_cbsp_fail_ent *fe; + + llist_for_each_entry(fe, flist, list) + cci_from_cbsp_fail_ent(mp, fe); +} + +/* append all cells from cbc_message_peer to given CBSP cell_list */ +static void cbsp_append_cell_list(struct osmo_cbsp_cell_list *out, void *ctx, + const struct cbc_message_peer *mp) +{ + struct cbc_cell_id *cci; + enum cbc_cell_id_type id_discr = CBC_CELL_ID_NONE; + + llist_for_each_entry(cci, &mp->cell_list, list) { + struct osmo_cbsp_cell_ent *ent; + + if (id_discr == CBC_CELL_ID_NONE) + id_discr = cci->id_discr; + else if (id_discr != cci->id_discr) { + LOGPFSML(mp->fi, LOGL_ERROR, "Cannot encode CBSP cell_list as not all " + "entries are of same type (%u != %u)\n", id_discr, cci->id_discr); + continue; + } + ent = talloc_zero(ctx, struct osmo_cbsp_cell_ent); + OSMO_ASSERT(ent); + cbsp_from_cci(&ent->cell_id, cci); + llist_add_tail(&ent->list, &out->list); + } + out->id_discr = cell_id_from_ccid_discr(id_discr); +} + +/*********************************************************************** + * actual FSM + ***********************************************************************/ + +static void smscb_p_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + int rc; + + switch (event) { + case SMSCB_PEER_E_CREATE: + /* send it to peer */ + rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); + if (rc == 0) { + /* wait for peers' response */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, + T_WAIT_WRITE_ACK); + } + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_write_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + 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_MSG_E_WRITE_ACK, mp); + break; + 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_MSG_E_WRITE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *cbsp; + + switch (event) { + 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; + cbsp->u.write_replace.old_serial_nr = &mp->cbcmsg->msg.serial_nr; + //cbsp->u.write_replace.new_serial_nr + /* TODO: we assume that the replace will always affect all original cells */ + cbsp_append_cell_list(&cbsp->u.write_replace.cell_list, cbsp, mp); + // TODO: ALL OTHER DATA + 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_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; + cbsp->u.msg_status_query.old_serial_nr = mp->cbcmsg->msg.serial_nr; + cbsp_append_cell_list(&cbsp->u.msg_status_query.cell_list, cbsp, mp); + cbsp->u.msg_status_query.channel_ind = CBSP_CHAN_IND_BASIC; + cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_status_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + 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_MSG_E_STATUS_ACK, mp); + break; + 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_MSG_E_STATUS_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + + +static void smscb_p_fsm_wait_replace_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + 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_MSG_E_REPLACE_ACK, mp); + break; + 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_MSG_E_REPLACE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_delete_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *dec = NULL; + + switch (event) { + 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_MSG_E_DELETE_ACK, mp); + break; + case SMSCB_PEER_E_CBSP_DELETE_NACK: + dec = data; + /* append results */ + msg_peer_append_cbsp_compl(mp, &dec->u.kill_fail.num_compl_list); + msg_peer_append_cbsp_cell(mp, &dec->u.kill_fail.cell_list); + 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_MSG_E_DELETE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + + + +static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->T) { + case T_WAIT_WRITE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_PEER_E_CBSP_WRITE_NACK, NULL); + 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_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_MSG_E_STATUS_NACK, NULL); + break; + case T_WAIT_DELETE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_PEER_E_CBSP_DELETE_NACK, NULL); + break; + default: + OSMO_ASSERT(0); + } + return 0; +} + +static void smscb_p_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + struct osmo_cbsp_decoded *cbsp; + + switch (event) { + case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ + switch (fi->state) { + case SMSCB_S_DELETED: + case SMSCB_S_INIT: + LOGPFSML(fi, LOGL_ERROR, "Event %s not permitted\n", + osmo_fsm_event_name(fi->fsm, event)); + return; + default: + break; + } + cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_KILL); + OSMO_ASSERT(cbsp); + cbsp->u.kill.msg_id = mp->cbcmsg->msg.message_id; + cbsp->u.kill.old_serial_nr = mp->cbcmsg->msg.serial_nr; + /* TODO: we assume that the delete will always affect all original cells */ + cbsp_append_cell_list(&cbsp->u.kill.cell_list, cbsp, mp); + if (!mp->cbcmsg->msg.is_etws) { + /* Channel Indication IE is only present in CBS, not in ETWS! */ + cbsp->u.kill.channel_ind = talloc_zero(cbsp, enum cbsp_channel_ind); + OSMO_ASSERT(cbsp->u.kill.channel_ind); + *(cbsp->u.kill.channel_ind) = CBSP_CHAN_IND_BASIC; + } + cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + llist_del(&mp->list); + /* memory of mp is child of fi and hence automatically free'd */ +} + +static const struct osmo_fsm_state smscb_p_fsm_states[] = { + [SMSCB_S_INIT] = { + .name = "INIT", + .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_PEER_E_CBSP_WRITE_ACK) | + S(SMSCB_PEER_E_CBSP_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_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), + .action = smscb_p_fsm_active, + }, + [SMSCB_S_WAIT_STATUS_ACK] = { + .name = "WAIT_STATUS_ACK", + .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_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_PEER_E_CBSP_DELETE_ACK) | + S(SMSCB_PEER_E_CBSP_DELETE_NACK), + .out_state_mask = S(SMSCB_S_DELETED), + .action = smscb_p_fsm_wait_delete_ack, + }, + [SMSCB_S_DELETED] = { + .name = "DELETED", + }, +}; + +struct osmo_fsm cbsp_smscb_peer_fsm = { + .name = "SMSCB-PEER-CBSP", + .states = smscb_p_fsm_states, + .num_states = ARRAY_SIZE(smscb_p_fsm_states), + .allstate_event_mask = S(SMSCB_PEER_E_DELETE), + .allstate_action = smscb_p_fsm_allstate, + .timer_cb = smscb_p_fsm_timer_cb, + .log_subsys = DCBSP, + .event_names = smscb_peer_fsm_event_names, + .cleanup = smscb_p_fsm_cleanup, +}; + +static __attribute__((constructor)) void on_dso_load_smscb_p_fsm(void) +{ + OSMO_ASSERT(osmo_fsm_register(&cbsp_smscb_peer_fsm) == 0); +} diff --git a/src/sbcap_smscb_peer_fsm.c b/src/sbcap_smscb_peer_fsm.c new file mode 100644 index 0000000..706a98f --- /dev/null +++ b/src/sbcap_smscb_peer_fsm.c @@ -0,0 +1,370 @@ +/* SMSCB Peer FSM: Represents state of one SMSCB for one peer (MME) */ + +/* This FSM exists per tuple of (message, mme peer) */ + +/* (C) 2019 by Harald Welte <laforge(a)gnumonks.org> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/fsm.h> + +#include <osmocom/gsm/gsm23003.h> +#include <osmocom/gsm/protocol/gsm_08_08.h> +#include <osmocom/gsm/gsm0808_utils.h> + +#include <osmocom/sbcap/sbcap_common.h> + +#include <osmocom/cbc/cbc_message.h> +#include <osmocom/cbc/cbc_peer.h> +#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)) + +/*********************************************************************** + * Helper functions + ***********************************************************************/ + +/* append SBcAP cells to msg_peer compl list */ +void msg_peer_append_compl_sbcap_bcast_area_list(struct cbc_message_peer *mp, + const SBcAP_Broadcast_Scheduled_Area_List_t *bcast) +{ + SBcAP_CellId_Broadcast_List_t *cell_id_bscat = bcast->cellId_Broadcast_List; + A_SEQUENCE_OF(struct SBcAP_CellId_Broadcast_List_Item) *as_cell_id_bcast; + SBcAP_CellId_Broadcast_List_Item_t *it; + unsigned int i; + + if (!cell_id_bscat) + return; + + as_cell_id_bcast = (void *) &cell_id_bscat->list; + for (i = 0; i < as_cell_id_bcast->count; i++) { + it = (SBcAP_CellId_Broadcast_List_Item_t *)(as_cell_id_bcast->array[i]); + OSMO_ASSERT(it); + struct cbc_cell_id *cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->num_compl_list); + } + cci_from_sbcap_bcast_cell_id(cci, it); + LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s to Broadcast Completed list\n", + cbc_cell_id2str(cci)); + cci->num_compl.num_compl += 1; + cci->num_compl.num_bcast_info += 1; + } +} + +/* append SBcAP cells to msg_peer fail list */ +void msg_peer_append_fail_sbcap_tai_list(struct cbc_message_peer *mp, + const SBcAP_List_of_TAIs_t *tais) +{ + A_SEQUENCE_OF(List_of_TAIs__Member) *as_tais = (void *)&tais->list; + List_of_TAIs__Member *it; + unsigned int i; + + for (i = 0; i < as_tais->count; i++) { + it = (List_of_TAIs__Member *)(as_tais->array[i]); + OSMO_ASSERT(it); + struct cbc_cell_id *cci = NULL; // FIXME: lookup + if (!cci) { + cci = talloc_zero(mp, struct cbc_cell_id); + if (!cci) + return; + llist_add_tail(&cci->list, &mp->fail_list); + } + cci_from_sbcap_tai(cci, &it->tai); + cci->fail.cause = SBcAP_Cause_tracking_area_not_valid; + LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s (cause: %s) to Failed list\n", + cbc_cell_id2str(cci), sbcap_cause_str(cci->fail.cause)); + } +} + +/*********************************************************************** + * actual FSM + ***********************************************************************/ + +static void smscb_p_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + int rc; + + switch (event) { + case SMSCB_PEER_E_CREATE: + /* send it to peer */ + rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); + if (rc == 0) { + /* wait for peers' response */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, + T_WAIT_WRITE_ACK); + } + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_write_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + SBcAP_SBC_AP_PDU_t *sbcap = NULL; + A_SEQUENCE_OF(void) *as_pdu; + SBcAP_Write_Replace_Warning_Response_IEs_t *ie; + + switch (event) { + 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); + as_pdu = (void *)&sbcap->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; + /* static const long asn_VAL_21_SBcAP_id_Unknown_Tracking_Area_List = 22; */ + ie = sbcap_as_find_ie(as_pdu, 22); + if (ie) { /* IE is optional */ + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_List_of_TAIs); + msg_peer_append_fail_sbcap_tai_list(mp, &ie->value.choice.List_of_TAIs); + } + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + /* Signal parent fsm about completion */ + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); + break; + 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_MSG_E_WRITE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to MME */ + /* NOT IMPLEMENETED */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); + break; + case SMSCB_PEER_E_STATUS: + /* NOT IMPLEMENETED */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_status_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + /* NOT IMPLEMENETED */ + default: + OSMO_ASSERT(0); + } +} + + +static void smscb_p_fsm_wait_replace_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + //struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + /* NOT IMPLEMENETED */ + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_wait_delete_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + + switch (event) { + 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_MSG_E_DELETE_ACK, mp); + break; + 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_MSG_E_DELETE_NACK, mp); + break; + default: + OSMO_ASSERT(0); + } +} + + + +static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->T) { + case T_WAIT_WRITE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, NULL); + 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_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_MSG_E_STATUS_NACK, NULL); + break; + case T_WAIT_DELETE_ACK: + osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); + osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, NULL); + break; + default: + OSMO_ASSERT(0); + } + return 0; +} + +static void smscb_p_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + SBcAP_SBC_AP_PDU_t *sbcap; + A_SEQUENCE_OF(void) *as_pdu; + SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; + + switch (event) { + case SMSCB_PEER_E_DELETE: /* send Stop-Warning to MME */ + switch (fi->state) { + case SMSCB_S_DELETED: + case SMSCB_S_INIT: + LOGPFSML(fi, LOGL_ERROR, "Event %s not permitted\n", + osmo_fsm_event_name(fi->fsm, event)); + return; + default: + break; + } + if ((sbcap = sbcap_gen_stop_warning_req(mp->peer, mp->cbcmsg))) { + cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); + } else { + LOGP(DSBcAP, LOGL_ERROR, + "[%s] Tx SBc-AP Stop-Warning-Request: msg gen failed\n", + mp->peer->name); + } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + break; + 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); + as_pdu = (void *)&sbcap->choice.initiatingMessage.value.choice.Write_Replace_Warning_Indication.protocolIEs.list; + /* static const long asn_VAL_36_SBcAP_id_Broadcast_Scheduled_Area_List = 23; */ + ie = sbcap_as_find_ie(as_pdu, 23); + if (!ie) + return; /* IE is optional */ + OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Indication_IEs__value_PR_Broadcast_Scheduled_Area_List); + msg_peer_append_compl_sbcap_bcast_area_list(mp, &ie->value.choice.Broadcast_Scheduled_Area_List); + break; + default: + OSMO_ASSERT(0); + } +} + +static void smscb_p_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + llist_del(&mp->list); + /* memory of mp is child of fi and hence automatically free'd */ +} + +static const struct osmo_fsm_state smscb_p_fsm_states[] = { + [SMSCB_S_INIT] = { + .name = "INIT", + .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_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_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), + .action = smscb_p_fsm_active, + }, + [SMSCB_S_WAIT_STATUS_ACK] = { + .name = "WAIT_STATUS_ACK", + .in_event_mask = 0 /* NOT IMPLEMENTED */, + .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 = 0 /* NOT IMPLEMENTED */, + .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_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, + }, + [SMSCB_S_DELETED] = { + .name = "DELETED", + }, +}; + +struct osmo_fsm sbcap_smscb_peer_fsm = { + .name = "SMSCB-PEER-SBcAP", + .states = smscb_p_fsm_states, + .num_states = ARRAY_SIZE(smscb_p_fsm_states), + .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 = DSBcAP, + .event_names = smscb_peer_fsm_event_names, + .cleanup = smscb_p_fsm_cleanup, +}; + +static __attribute__((constructor)) void on_dso_load_smscb_p_fsm(void) +{ + OSMO_ASSERT(osmo_fsm_register(&sbcap_smscb_peer_fsm) == 0); +} diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 589a832..20eec95 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -27,13 +27,6 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/fsm.h> -#include <osmocom/gsm/gsm23003.h> -#include <osmocom/gsm/protocol/gsm_08_08.h> -#include <osmocom/gsm/gsm0808_utils.h> -#include <osmocom/gsm/cbsp.h> - -#include <osmocom/sbcap/sbcap_common.h> - #include <osmocom/cbc/cbc_message.h> #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/cbsp_link.h> @@ -43,8 +36,6 @@ #include <osmocom/cbc/smscb_peer_fsm.h> #include <osmocom/cbc/smscb_message_fsm.h> -#define S(x) (1 << (x)) - const struct value_string smscb_peer_fsm_event_names[] = { { SMSCB_PEER_E_CREATE, "CREATE" }, { SMSCB_PEER_E_REPLACE, "REPLACE" }, @@ -66,666 +57,24 @@ { 0, NULL } }; -#if 0 -static const struct value_string smscb_p_fsm_timer_names[] = { - OSMO_VALUE_STRING(T_WAIT_WRITE_ACK), - OSMO_VALUE_STRING(T_WAIT_REPLACE_ACK), - OSMO_VALUE_STRING(T_WAIT_DELETE_ACK), - { 0, NULL } -}; -#endif - -/*********************************************************************** - * Helper functions - ***********************************************************************/ - -/* covert TS 08.08 Cell Identity value to CBC internal type */ -static enum cbc_cell_id_type cci_discr_from_cell_id(enum CELL_IDENT id_discr) -{ - switch (id_discr) { - case CELL_IDENT_NO_CELL: - return CBC_CELL_ID_NONE; - case CELL_IDENT_WHOLE_GLOBAL: - return CBC_CELL_ID_CGI; - case CELL_IDENT_LAC_AND_CI: - return CBC_CELL_ID_LAC_CI; - case CELL_IDENT_CI: - return CBC_CELL_ID_CI; - case CELL_IDENT_LAI: - return CBC_CELL_ID_LAI; - case CELL_IDENT_LAC: - return CBC_CELL_ID_LAC; - case CELL_IDENT_BSS: - return CBC_CELL_ID_BSS; - default: - return -1; - } -} - -/* covert CBC internal type to TS 08.08 Cell Identity */ -static enum CELL_IDENT cell_id_from_ccid_discr(enum cbc_cell_id_type in) -{ - switch (in) { - case CBC_CELL_ID_NONE: - return CELL_IDENT_NO_CELL; - case CBC_CELL_ID_CGI: - return CELL_IDENT_WHOLE_GLOBAL; - case CBC_CELL_ID_LAC_CI: - return CELL_IDENT_LAC_AND_CI; - case CBC_CELL_ID_CI: - return CELL_IDENT_CI; - case CBC_CELL_ID_LAI: - return CELL_IDENT_LAI; - case CBC_CELL_ID_LAC: - return CELL_IDENT_LAC; - case CBC_CELL_ID_BSS: - return CELL_IDENT_BSS; - default: - return -1; - } -} - -/* convert TS 08.08 Cell Identifier Union to CBC internal type */ -static void cci_from_cbsp(struct cbc_cell_id *cci, enum CELL_IDENT id_discr, - const union gsm0808_cell_id_u *u) -{ - cci->id_discr = cci_discr_from_cell_id(id_discr); - - switch (id_discr) { - case CELL_IDENT_NO_CELL: - break; - case CELL_IDENT_WHOLE_GLOBAL: - cci->u.cgi = u->global; - break; - case CELL_IDENT_LAC_AND_CI: - cci->u.lac_and_ci = u->lac_and_ci; - break; - case CELL_IDENT_CI: - cci->u.ci = u->ci; - break; - case CELL_IDENT_LAI: - cci->u.lai = u->lai_and_lac; - break; - case CELL_IDENT_LAC: - cci->u.lac = u->lac; - break; - case CELL_IDENT_BSS: - break; - default: - break; - } -} - -/* convert TS 08.08 Cell Identifier Union to CBC internal type */ -static void cbsp_from_cci(union gsm0808_cell_id_u *u, const struct cbc_cell_id *cci) -{ - switch (cci->id_discr) { - case CBC_CELL_ID_NONE: - break; - case CBC_CELL_ID_CGI: - u->global = cci->u.cgi; - printf("u->gobal: %s\n", osmo_hexdump((uint8_t *) &u->global, sizeof(u->global))); - break; - case CBC_CELL_ID_LAC_CI: - u->lac_and_ci = cci->u.lac_and_ci; - break; - case CBC_CELL_ID_CI: - u->ci = cci->u.ci; - break; - case CBC_CELL_ID_LAI: - u->lai_and_lac = cci->u.lai; - break; - case CBC_CELL_ID_LAC: - u->lac = cci->u.lac; - break; - case CBC_CELL_ID_BSS: - break; - default: - OSMO_ASSERT(0); - } -} - -/* read a single osmo_cbsp_num_compl_ent and add it to cbc_message_peer */ -static void cci_from_cbsp_compl_ent(struct cbc_message_peer *mp, - struct osmo_cbsp_num_compl_ent *ce, enum CELL_IDENT id_discr) -{ - struct cbc_cell_id *cci; - - cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->num_compl_list); - } - cci_from_cbsp(cci, id_discr, &ce->cell_id); - cci->num_compl.num_compl += ce->num_compl; - cci->num_compl.num_bcast_info += ce->num_bcast_info; -} -static void msg_peer_append_cbsp_compl(struct cbc_message_peer *mp, - struct osmo_cbsp_num_compl_list *nclist) -{ - struct osmo_cbsp_num_compl_ent *ce; - - llist_for_each_entry(ce, &nclist->list, list) - cci_from_cbsp_compl_ent(mp, ce, nclist->id_discr); -} - -/* read a single osmo_cbsp_cell_ent and add it to cbc_message_peer */ -static void cci_from_cbsp_cell_ent(struct cbc_message_peer *mp, - struct osmo_cbsp_cell_ent *ce, enum CELL_IDENT id_discr) -{ - struct cbc_cell_id *cci; - - cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->cell_list); - } - cci_from_cbsp(cci, id_discr, &ce->cell_id); -} -static void msg_peer_append_cbsp_cell(struct cbc_message_peer *mp, - struct osmo_cbsp_cell_list *clist) -{ - struct osmo_cbsp_cell_ent *ce; - - llist_for_each_entry(ce, &clist->list, list) - cci_from_cbsp_cell_ent(mp, ce, clist->id_discr); -} - -/* read a single osmo_cbsp_fail_ent and add it to cbc_message_peer */ -static void cci_from_cbsp_fail_ent(struct cbc_message_peer *mp, - struct osmo_cbsp_fail_ent *fe) -{ - struct cbc_cell_id *cci; - cci = NULL; // lookup */ - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->fail_list); - } - cci->id_discr = cci_discr_from_cell_id(fe->id_discr); - cci->fail.cause = fe->cause; -} -static void msg_peer_append_cbsp_fail(struct cbc_message_peer *mp, struct llist_head *flist) -{ - struct osmo_cbsp_fail_ent *fe; - - llist_for_each_entry(fe, flist, list) - cci_from_cbsp_fail_ent(mp, fe); -} - -/* append all cells from cbc_message_peer to given CBSP cell_list */ -static void cbsp_append_cell_list(struct osmo_cbsp_cell_list *out, void *ctx, - const struct cbc_message_peer *mp) -{ - struct cbc_cell_id *cci; - enum cbc_cell_id_type id_discr = CBC_CELL_ID_NONE; - - llist_for_each_entry(cci, &mp->cell_list, list) { - struct osmo_cbsp_cell_ent *ent; - - if (id_discr == CBC_CELL_ID_NONE) - id_discr = cci->id_discr; - else if (id_discr != cci->id_discr) { - LOGPFSML(mp->fi, LOGL_ERROR, "Cannot encode CBSP cell_list as not all " - "entries are of same type (%u != %u)\n", id_discr, cci->id_discr); - continue; - } - ent = talloc_zero(ctx, struct osmo_cbsp_cell_ent); - OSMO_ASSERT(ent); - cbsp_from_cci(&ent->cell_id, cci); - llist_add_tail(&ent->list, &out->list); - } - out->id_discr = cell_id_from_ccid_discr(id_discr); -} - -/* append SBcAP cells to msg_peer compl list */ -void msg_peer_append_compl_sbcap_bcast_area_list(struct cbc_message_peer *mp, - const SBcAP_Broadcast_Scheduled_Area_List_t *bcast) -{ - SBcAP_CellId_Broadcast_List_t *cell_id_bscat = bcast->cellId_Broadcast_List; - A_SEQUENCE_OF(struct SBcAP_CellId_Broadcast_List_Item) *as_cell_id_bcast; - SBcAP_CellId_Broadcast_List_Item_t *it; - unsigned int i; - - if (!cell_id_bscat) - return; - - as_cell_id_bcast = (void *) &cell_id_bscat->list; - for (i = 0; i < as_cell_id_bcast->count; i++) { - it = (SBcAP_CellId_Broadcast_List_Item_t *)(as_cell_id_bcast->array[i]); - OSMO_ASSERT(it); - struct cbc_cell_id *cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->num_compl_list); - } - cci_from_sbcap_bcast_cell_id(cci, it); - LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s to Broadcast Completed list\n", - cbc_cell_id2str(cci)); - cci->num_compl.num_compl += 1; - cci->num_compl.num_bcast_info += 1; - } -} - -/* append SBcAP cells to msg_peer fail list */ -void msg_peer_append_fail_sbcap_tai_list(struct cbc_message_peer *mp, - const SBcAP_List_of_TAIs_t *tais) -{ - A_SEQUENCE_OF(List_of_TAIs__Member) *as_tais = (void *)&tais->list; - List_of_TAIs__Member *it; - unsigned int i; - - for (i = 0; i < as_tais->count; i++) { - it = (List_of_TAIs__Member *)(as_tais->array[i]); - OSMO_ASSERT(it); - struct cbc_cell_id *cci = NULL; // FIXME: lookup - if (!cci) { - cci = talloc_zero(mp, struct cbc_cell_id); - if (!cci) - return; - llist_add_tail(&cci->list, &mp->fail_list); - } - cci_from_sbcap_tai(cci, &it->tai); - cci->fail.cause = SBcAP_Cause_tracking_area_not_valid; - LOGPFSML(mp->fi, LOGL_DEBUG, "Appending CellId %s (cause: %s) to Failed list\n", - cbc_cell_id2str(cci), sbcap_cause_str(cci->fail.cause)); - } -} - -/*********************************************************************** - * actual FSM - ***********************************************************************/ - -static void smscb_p_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - int rc; - - switch (event) { - case SMSCB_PEER_E_CREATE: - /* send it to peer */ - rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); - if (rc == 0) { - /* wait for peers' response */ - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, - T_WAIT_WRITE_ACK); - } - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_wait_write_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - SBcAP_SBC_AP_PDU_t *sbcap = NULL; - A_SEQUENCE_OF(void) *as_pdu; - SBcAP_Write_Replace_Warning_Response_IEs_t *ie; - - switch (event) { - 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_MSG_E_WRITE_ACK, mp); - break; - 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_MSG_E_WRITE_NACK, mp); - break; - 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); - as_pdu = (void *)&sbcap->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; - /* static const long asn_VAL_21_SBcAP_id_Unknown_Tracking_Area_List = 22; */ - ie = sbcap_as_find_ie(as_pdu, 22); - if (ie) { /* IE is optional */ - OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Response_IEs__value_PR_List_of_TAIs); - msg_peer_append_fail_sbcap_tai_list(mp, &ie->value.choice.List_of_TAIs); - } - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - /* Signal parent fsm about completion */ - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_ACK, mp); - break; - 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_MSG_E_WRITE_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *cbsp; - - switch (event) { - 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; - cbsp->u.write_replace.old_serial_nr = &mp->cbcmsg->msg.serial_nr; - //cbsp->u.write_replace.new_serial_nr - /* TODO: we assume that the replace will always affect all original cells */ - cbsp_append_cell_list(&cbsp->u.write_replace.cell_list, cbsp, mp); - // TODO: ALL OTHER DATA - 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_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; - cbsp->u.msg_status_query.old_serial_nr = mp->cbcmsg->msg.serial_nr; - cbsp_append_cell_list(&cbsp->u.msg_status_query.cell_list, cbsp, mp); - cbsp->u.msg_status_query.channel_ind = CBSP_CHAN_IND_BASIC; - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_wait_status_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - - switch (event) { - 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_MSG_E_STATUS_ACK, mp); - break; - 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_MSG_E_STATUS_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - - -static void smscb_p_fsm_wait_replace_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - - switch (event) { - 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_MSG_E_REPLACE_ACK, mp); - break; - 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_MSG_E_REPLACE_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_wait_delete_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *dec = NULL; - //SBcAP_SBC_AP_PDU_t *pdu = NULL; - - switch (event) { - 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_MSG_E_DELETE_ACK, mp); - break; - case SMSCB_PEER_E_CBSP_DELETE_NACK: - dec = data; - /* append results */ - msg_peer_append_cbsp_compl(mp, &dec->u.kill_fail.num_compl_list); - msg_peer_append_cbsp_cell(mp, &dec->u.kill_fail.cell_list); - 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_MSG_E_DELETE_NACK, mp); - break; - 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_MSG_E_DELETE_ACK, mp); - break; - 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_MSG_E_DELETE_NACK, mp); - break; - default: - OSMO_ASSERT(0); - } -} - - - -static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) -{ - switch (fi->T) { - case T_WAIT_WRITE_ACK: - osmo_fsm_inst_state_chg(fi, SMSCB_S_ACTIVE, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_WRITE_NACK, NULL); - 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_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_MSG_E_STATUS_NACK, NULL); - break; - case T_WAIT_DELETE_ACK: - osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0); - osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_MSG_E_DELETE_NACK, NULL); - break; - default: - OSMO_ASSERT(0); - } - return 0; -} - -static void smscb_p_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - struct osmo_cbsp_decoded *cbsp; - SBcAP_SBC_AP_PDU_t *sbcap; - A_SEQUENCE_OF(void) *as_pdu; - SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; - - switch (event) { - case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ - switch (fi->state) { - case SMSCB_S_DELETED: - case SMSCB_S_INIT: - LOGPFSML(fi, LOGL_ERROR, "Event %s not permitted\n", - osmo_fsm_event_name(fi->fsm, event)); - return; - default: - break; - } - switch (mp->peer->proto) { - case CBC_PEER_PROTO_CBSP: - cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_KILL); - OSMO_ASSERT(cbsp); - cbsp->u.kill.msg_id = mp->cbcmsg->msg.message_id; - cbsp->u.kill.old_serial_nr = mp->cbcmsg->msg.serial_nr; - /* TODO: we assume that the delete will always affect all original cells */ - cbsp_append_cell_list(&cbsp->u.kill.cell_list, cbsp, mp); - if (!mp->cbcmsg->msg.is_etws) { - /* Channel Indication IE is only present in CBS, not in ETWS! */ - cbsp->u.kill.channel_ind = talloc_zero(cbsp, enum cbsp_channel_ind); - OSMO_ASSERT(cbsp->u.kill.channel_ind); - *(cbsp->u.kill.channel_ind) = CBSP_CHAN_IND_BASIC; - } - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); - break; - case CBC_PEER_PROTO_SBcAP: - if ((sbcap = sbcap_gen_stop_warning_req(mp->peer, mp->cbcmsg))) { - cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); - } else { - LOGP(DSBcAP, LOGL_ERROR, - "[%s] Tx SBc-AP Stop-Warning-Request: msg gen failed\n", - mp->peer->name); - } - break; - case CBC_PEER_PROTO_SABP: - default: - 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_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); - as_pdu = (void *)&sbcap->choice.initiatingMessage.value.choice.Write_Replace_Warning_Indication.protocolIEs.list; - /* static const long asn_VAL_36_SBcAP_id_Broadcast_Scheduled_Area_List = 23; */ - ie = sbcap_as_find_ie(as_pdu, 23); - if (!ie) - return; /* IE is optional */ - OSMO_ASSERT(ie->value.present == SBcAP_Write_Replace_Warning_Indication_IEs__value_PR_Broadcast_Scheduled_Area_List); - msg_peer_append_compl_sbcap_bcast_area_list(mp, &ie->value.choice.Broadcast_Scheduled_Area_List); - break; - default: - OSMO_ASSERT(0); - } -} - -static void smscb_p_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) -{ - struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; - llist_del(&mp->list); - /* memory of mp is child of fi and hence automatically free'd */ -} - -static const struct osmo_fsm_state smscb_p_fsm_states[] = { - [SMSCB_S_INIT] = { - .name = "INIT", - .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_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_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), - .action = smscb_p_fsm_active, - }, - [SMSCB_S_WAIT_STATUS_ACK] = { - .name = "WAIT_STATUS_ACK", - .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_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_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, - }, - [SMSCB_S_DELETED] = { - .name = "DELETED", - }, -}; - -struct osmo_fsm smscb_p_fsm = { - .name = "SMSCB-PEER", - .states = smscb_p_fsm_states, - .num_states = ARRAY_SIZE(smscb_p_fsm_states), - .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_peer_fsm_event_names, - .cleanup = smscb_p_fsm_cleanup, -}; - -static __attribute__((constructor)) void on_dso_load_smscb_p_fsm(void) -{ - OSMO_ASSERT(osmo_fsm_register(&smscb_p_fsm) == 0); -} - struct cbc_message_peer *smscb_peer_fsm_alloc(struct cbc_peer *peer, struct cbc_message *cbcmsg) { struct cbc_message_peer *mp; struct osmo_fsm_inst *fi; + struct osmo_fsm *fsm_def; - fi = osmo_fsm_inst_alloc_child(&smscb_p_fsm, cbcmsg->fi, SMSCB_MSG_E_CHILD_DIED); + switch (peer->proto) { + case CBC_PEER_PROTO_CBSP: + fsm_def = &cbsp_smscb_peer_fsm; + break; + case CBC_PEER_PROTO_SBcAP: + fsm_def = &sbcap_smscb_peer_fsm; + break; + case CBC_PEER_PROTO_SABP: + default: + osmo_panic("smscb_peer FSM not implemented for proto %u", peer->proto); + } + fi = osmo_fsm_inst_alloc_child(fsm_def, 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/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved 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; } 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 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, 10 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28824 ) Change subject: sbcap: Improve handling of WriteReplaceWarnResponse ...................................................................... sbcap: Improve handling of WriteReplaceWarnResponse If cause != accepted, submit a NACK to the upper layers. In that case, in the upper layers we don't want to parse the PDU IE "Unknown Tracking Area List" since it shouldn't be there. 3GPP TS 29.168 4.3.4.3.6 states: """ This IE shall only be included if the Cause IE indicates Message accepted, which means the MME will proceed with the request for Tracking Areas that are known to the MME. The Cause IE indicating Tracking area not valid is used when all Tracking Areas in the Request are invalid. """ Change-Id: I0a4d5bdbb6c4fd3870a4f4ebf226668b70fea06a --- M src/sbcap_link_fsm.c 1 file changed, 29 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 6a50e91..f2cbe82 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -241,6 +241,34 @@ return 0; } +/* Rx Write Replace Warning Response from peer */ +static int cbc_sbcap_link_rx_write_replace_warn_resp(struct cbc_sbcap_link *link, + struct cbc_message_peer *mp, + SBcAP_SBC_AP_PDU_t *pdu) +{ + 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; + + as_pdu = (void *)&pdu->choice.successfulOutcome.value.choice.Write_Replace_Warning_Response.protocolIEs.list; + + /* static const long asn_VAL_19_SBcAP_id_Cause = 1; */ + 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; + } else { /* This shouldn't happen, the IE is Mandatory... */ + ev = SMSCB_E_SBCAP_WRITE_NACK; + err_ind_pdu = sbcap_gen_error_ind(link, + SBcAP_Cause_missing_mandatory_element, pdu); + if (err_ind_pdu) + cbc_sbcap_link_tx(link, err_ind_pdu); + } + + return osmo_fsm_inst_dispatch(mp->fi, ev, pdu); +} + /* message was received from remote SBc-AP peer (MME) */ int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { @@ -345,7 +373,7 @@ //if (dec->u.write_replace_compl.old_serial_nr) // return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBcAP_REPLACE_ACK, dec); //else - return osmo_fsm_inst_dispatch(mp->fi, SMSCB_E_SBCAP_WRITE_ACK, pdu); + 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); default: -- 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: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-cbc[master]: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0fd00b60cdc6bc6a088be1336d849548ca89c847 Gerrit-Change-Number: 28828 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:18:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

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

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28826 ) Change subject: Split event list for smscb_message_fsm and smscb_peer_fsm ...................................................................... Patch Set 3: Code-Review+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: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 29 Jul 2022 14:18:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022