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

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_endpoint API

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/28755 to look at the new patch set (#3). Change subject: apply refactoring of osmo_pfcp_endpoint API ...................................................................... apply refactoring of osmo_pfcp_endpoint API libosmo-pfcp If80c35c6a942bf9593781b5a6bc28ba37323ce5e changes the osmo_pfcp_endpoint API, apply the necessary changes here. Related: SYS#5599 Depends: If80c35c6a942bf9593781b5a6bc28ba37323ce5e (libosmo-pfcp) Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 --- M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c M src/osmo-upf/up_session.c 5 files changed, 44 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/55/28755/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 Gerrit-Change-Number: 28755 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: pfcp_endpoint: fix final PFCP retrans resp_cb

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 ) Change subject: pfcp_endpoint: fix final PFCP retrans resp_cb ...................................................................... pfcp_endpoint: fix final PFCP retrans resp_cb After the final retransmission of a sent request, still keep the message in the queue for its expiry period, so that a later response is matched to the request. The osmo_pfcp_msg.resp_cb() depends on the sent message to remain in the queue until it times out. That was not the case in an earlier stage of libosmo-pfcp development. I noticed this during ttcn3 testing, where osmo-hnbgw continuously resends PFCP Association Setup Requests, and fails to associate if ttcn3 happens to respond to the final retransmission of a request. Related: SYS#5599 Change-Id: Iaca396891921f7057015ce6e1e4528b955757809 --- M src/libosmo-pfcp/pfcp_endpoint.c 1 file changed, 10 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 0ee3a9a..68d0a21 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -181,18 +181,19 @@ struct osmo_pfcp_msg *m = qe->m; int rc; - /* re-transmit */ - if (qe->n1_remaining) - qe->n1_remaining--; - OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "re-sending (%u attempts remaining)\n", qe->n1_remaining); - - rc = osmo_pfcp_endpoint_tx_data_no_logging(endpoint, m); - /* If encoding failed, it cannot ever succeed. Drop the queue entry. */ - if (rc) - return false; /* if no more attempts remaining, drop from queue */ if (!qe->n1_remaining) return false; + + /* re-transmit */ + qe->n1_remaining--; + OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "re-sending (%u attempts remaining after this)\n", qe->n1_remaining); + + rc = osmo_pfcp_endpoint_tx_data_no_logging(endpoint, m); + /* If encoding failed, it cannot ever succeed. Drop the queue entry. (Error logging already taken care of in + * osmo_pfcp_endpoint_tx_data_no_logging().) */ + if (rc) + return false; /* re-schedule timer, keep in queue */ osmo_timer_schedule(&qe->t1, t1_ms/1000, (t1_ms % 1000) * 1000); return true; 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/libosmo-pfcp/+/28812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iaca396891921f7057015ce6e1e4528b955757809 Gerrit-Change-Number: 28812 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: apply code review: refactor pfcp_endpoint API

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 ) Change subject: apply code review: refactor pfcp_endpoint API ...................................................................... apply code review: refactor pfcp_endpoint API Code review requested that the API should use functions instead of direct access to a struct. I have moved all user provided config to a separate struct osmo_pfcp_endpoint_cfg, to be passed to osmo_pfcp_endpoint_create(). Halfway through those changes, I am not so certain whether that is what reviewers had in mind. It makes sense from the point of view to keep nr of arguments passed to osmo_pfcp_endpoint_create() small, and to allow changing the user provided config without requiring a new osmo_pfcp_endpoint_create2() API function. Though that again has ABI compat problems, and makes no sense from the point of view that all access should be done via API functions. Personally I don't really agree with this change, which is probably the reason why this patch ended up this way. Related: SYS#5599 Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e --- M include/osmocom/pfcp/pfcp_endpoint.h M src/libosmo-pfcp/pfcp_cp_peer.c M src/libosmo-pfcp/pfcp_endpoint.c 3 files changed, 116 insertions(+), 55 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/pfcp/pfcp_endpoint.h b/include/osmocom/pfcp/pfcp_endpoint.h index acc878e..d0ed113 100644 --- a/include/osmocom/pfcp/pfcp_endpoint.h +++ b/include/osmocom/pfcp/pfcp_endpoint.h @@ -32,13 +32,15 @@ struct osmo_pfcp_endpoint; struct osmo_fsm_inst; -#define OSMO_PFCP_TIMER_HEARTBEAT_REQ -19 -#define OSMO_PFCP_TIMER_HEARTBEAT_RESP -20 -#define OSMO_PFCP_TIMER_GRACEFUL_REL -21 -#define OSMO_PFCP_TIMER_T1 -22 -#define OSMO_PFCP_TIMER_N1 -23 -#define OSMO_PFCP_TIMER_KEEP_RESP -24 -#define OSMO_PFCP_TIMER_ASSOC_RETRY -26 +enum osmo_pfcp_timers { + OSMO_PFCP_TIMER_HEARTBEAT_REQ = -19, + OSMO_PFCP_TIMER_HEARTBEAT_RESP = -20, + OSMO_PFCP_TIMER_GRACEFUL_REL = -21, + OSMO_PFCP_TIMER_T1 = -22, + OSMO_PFCP_TIMER_N1 = -23, + OSMO_PFCP_TIMER_KEEP_RESP = -24, + OSMO_PFCP_TIMER_ASSOC_RETRY = -26, +}; extern struct osmo_tdef osmo_pfcp_tdefs[]; @@ -51,51 +53,41 @@ struct osmo_pfcp_msg *req); /* Send/receive PFCP messages to/from remote PFCP endpoints. */ -struct osmo_pfcp_endpoint { - struct { - /* Local address */ - struct osmo_sockaddr local_addr; - /* Local PFCP Node ID, as sent in outgoing messages' Node ID IE */ - struct osmo_pfcp_ie_node_id local_node_id; +struct osmo_pfcp_endpoint; - /* Timer definitions to use, if any. See t1_ms, keep_resp_ms. Use osmo_pfcp_tdefs by default. It is - * convenient to add osmo_pfcp_tdefs as one of your program's osmo_tdef_group entries and call - * osmo_tdef_vty_init() to expose PFCP timers on the VTY. */ - const struct osmo_tdef *tdefs; - } cfg; +struct osmo_pfcp_endpoint_cfg { + /* Local address */ + struct osmo_sockaddr local_addr; + /* Local PFCP Node ID, as sent in outgoing messages' Node ID IE */ + struct osmo_pfcp_ie_node_id local_node_id; - /* PFCP socket */ - struct osmo_fd pfcp_fd; + /* If non-NULL, this function is called just after decoding and before handling the osmo_pfcp_msg passed as + * argument m. + * The caller (you) usually implements this to set m->ctx.peer_fi and m->ctx.session_fi as appropriate, + * so that these are used for logging context during message handling. The caller may also use m->ctx.peer_fi + * and m->ctx.session_fi pointers to reduce lookup iterations in e.g. rx_msg(). */ + osmo_pfcp_endpoint_cb set_msg_ctx_cb; - /* The time at which this endpoint last restarted, as seconds since unix epoch. */ - uint32_t recovery_time_stamp; + /* Callback to receive a single incoming PFCP message from a remote peer, already decoded. See also the doc for + * osmo_pfcp_endpoint_cb. */ + osmo_pfcp_endpoint_cb rx_msg_cb; - /* State for determining the next sequence number for transmitting a request message */ - uint32_t seq_nr_state; - - /* This function is called just after decoding and before handling the message. - * This function may set ctx.peer_fi and ctx.session_fi, used for logging context during message decoding. - * The caller may also use these fi pointers to reduce lookup iterations in rx_msg(). - */ - osmo_pfcp_endpoint_cb set_msg_ctx; - - /* Callback to receive single incoming PFCP messages from a remote peer, already decoded. */ - osmo_pfcp_endpoint_cb rx_msg; + /* Custom timer definitions to use, if any. Relevant timers are: OSMO_PFCP_TIMER_N1, OSMO_PFCP_TIMER_T1, + * OSMO_PFCP_TIMER_KEEP_RESP. These are used for the PFCP message retransmission queue. + * If passed NULL, use the timer definitions from the global osmo_pfcp_tdefs. + * To expose retransmission timers on the VTY configuration, it is convenient to add osmo_pfcp_tdefs as one of + * your program's osmo_tdef_group entries and call osmo_tdef_vty_init(). */ + const struct osmo_tdef *tdefs; /* application-private data */ void *priv; - /* All transmitted PFCP Request messages, list of osmo_pfcp_queue_entry. - * For a transmitted Request message, wait for a matching Response from a remote peer; if none arrives, - * retransmit (see n1 and t1_ms). */ - struct llist_head sent_requests; - /* All transmitted PFCP Response messages, list of osmo_pfcp_queue_entry. - * For a transmitted Response message, keep it in the queue for a fixed amount of time. If the peer retransmits - * the original Request, do not dispatch the Request, but respond with the queued message directly. */ - struct llist_head sent_responses; + /* Always false in this API version. When adding new members to this struct in the future, they shall be added + * after this 'more_items' flag, and such members shall be accessed only when more_items == true. */ + bool more_items; }; -struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, void *priv); +struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, const struct osmo_pfcp_endpoint_cfg *cfg); int osmo_pfcp_endpoint_bind(struct osmo_pfcp_endpoint *ep); void osmo_pfcp_endpoint_close(struct osmo_pfcp_endpoint *ep); void osmo_pfcp_endpoint_free(struct osmo_pfcp_endpoint **ep); @@ -105,3 +97,11 @@ int osmo_pfcp_endpoint_tx_heartbeat_req(struct osmo_pfcp_endpoint *ep, const struct osmo_sockaddr *remote_addr); void osmo_pfcp_endpoint_invalidate_ctx(struct osmo_pfcp_endpoint *ep, struct osmo_fsm_inst *deleted_fi); + +const struct osmo_pfcp_endpoint_cfg *osmo_pfcp_endpoint_get_cfg(const struct osmo_pfcp_endpoint *ep); +void *osmo_pfcp_endpoint_get_priv(const struct osmo_pfcp_endpoint *ep); +uint32_t osmo_pfcp_endpoint_get_recovery_timestamp(const struct osmo_pfcp_endpoint *ep); +const struct osmo_sockaddr *osmo_pfcp_endpoint_get_local_addr(const struct osmo_pfcp_endpoint *ep); +void osmo_pfcp_endpoint_set_seq_nr_state(struct osmo_pfcp_endpoint *ep, uint32_t seq_nr_state); + +bool osmo_pfcp_endpoint_retrans_queue_is_busy(const struct osmo_pfcp_endpoint *ep); diff --git a/src/libosmo-pfcp/pfcp_cp_peer.c b/src/libosmo-pfcp/pfcp_cp_peer.c index e1dd9ac..959206a 100644 --- a/src/libosmo-pfcp/pfcp_cp_peer.c +++ b/src/libosmo-pfcp/pfcp_cp_peer.c @@ -161,7 +161,7 @@ struct osmo_pfcp_msg *m; m = osmo_pfcp_cp_peer_new_req(cp_peer, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); - m->ies.assoc_setup_req.recovery_time_stamp = cp_peer->ep->recovery_time_stamp; + m->ies.assoc_setup_req.recovery_time_stamp = osmo_pfcp_endpoint_get_recovery_timestamp(cp_peer->ep); m->ies.assoc_setup_req.cp_function_features_present = true; osmo_pfcp_bits_set(m->ies.assoc_setup_req.cp_function_features.bits, OSMO_PFCP_CP_FEAT_BUNDL, true); diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 6162086..0ee3a9a 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -32,6 +32,29 @@ #include <osmocom/pfcp/pfcp_endpoint.h> #include <osmocom/pfcp/pfcp_msg.h> +/* Send/receive PFCP messages to/from remote PFCP endpoints. */ +struct osmo_pfcp_endpoint { + struct osmo_pfcp_endpoint_cfg cfg; + + /* PFCP socket */ + struct osmo_fd pfcp_fd; + + /* The time at which this endpoint last restarted, as seconds since unix epoch. */ + uint32_t recovery_time_stamp; + + /* State for determining the next sequence number for transmitting a request message */ + uint32_t seq_nr_state; + + /* All transmitted PFCP Request messages, list of osmo_pfcp_queue_entry. + * For a transmitted Request message, wait for a matching Response from a remote peer; if none arrives, + * retransmit (see n1 and t1_ms). */ + struct llist_head sent_requests; + /* All transmitted PFCP Response messages, list of osmo_pfcp_queue_entry. + * For a transmitted Response message, keep it in the queue for a fixed amount of time. If the peer retransmits + * the original Request, do not dispatch the Request, but respond with the queued message directly. */ + struct llist_head sent_responses; +}; + /*! Entry of pfcp_endpoint message queue of PFCP messages, for re-transsions. */ struct osmo_pfcp_queue_entry { /* entry in per-peer list of messages waiting for a response */ @@ -103,18 +126,22 @@ {} }; -struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, void *priv) +/* Allocate a PFCP endpoint. Copy cfg's content to the allocated endpoint struct. Set the recovery_time_stamp to the + * current time. */ +struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, const struct osmo_pfcp_endpoint_cfg *cfg) { struct osmo_pfcp_endpoint *ep = talloc_zero(ctx, struct osmo_pfcp_endpoint); uint32_t unix_time; if (!ep) return NULL; + ep->cfg = *cfg; + if (!ep->cfg.tdefs) + ep->cfg.tdefs = osmo_pfcp_tdefs; + INIT_LLIST_HEAD(&ep->sent_requests); INIT_LLIST_HEAD(&ep->sent_responses); - ep->cfg.tdefs = osmo_pfcp_tdefs; - ep->priv = priv; ep->pfcp_fd.fd = -1; /* time() returns seconds since 1970 (UNIX epoch), but the recovery_time_stamp is coded in the NTP format, which is @@ -343,8 +370,8 @@ /* Populate message context to point at peer and session, if applicable. * With that context applied, log message rx. */ - if (ep->set_msg_ctx) - ep->set_msg_ctx(ep, m, NULL); + if (ep->cfg.set_msg_ctx_cb) + ep->cfg.set_msg_ctx_cb(ep, m, NULL); OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "received retransmission of earlier request\n"); /* Also log on the earlier PFCP msg that it is resent */ @@ -362,8 +389,8 @@ /* Populate message context to point at peer and session, if applicable. * With that context applied, log message rx. */ - if (ep->set_msg_ctx) - ep->set_msg_ctx(ep, m, req); + if (ep->cfg.set_msg_ctx_cb) + ep->cfg.set_msg_ctx_cb(ep, m, req); OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "received\n"); if (req && req->ctx.resp_cb) { @@ -373,12 +400,12 @@ if (rc != 1) { dispatch_rx = false; OSMO_LOG_PFCP_MSG(m, LOGL_DEBUG, - "response handled by m->resp_cb(), not dispatching to rx_msg()\n"); + "response handled by m->resp_cb(), not dispatching to rx_msg_cb()\n"); } } if (dispatch_rx) - ep->rx_msg(ep, m, req); + ep->cfg.rx_msg_cb(ep, m, req); if (req) osmo_pfcp_queue_del(prev_msg); } @@ -402,7 +429,7 @@ return -EIO; msgb_put(msg, rc); - OSMO_ASSERT(ep->rx_msg); + OSMO_ASSERT(ep->cfg.rx_msg_cb); /* This may be a bundle of PFCP messages. Parse and receive each message received, by shifting l4h * through the message bundle. */ @@ -436,8 +463,8 @@ /* close the existing socket, if any */ osmo_pfcp_endpoint_close(ep); - if (!ep->rx_msg) { - LOGP(DLPFCP, LOGL_ERROR, "missing rx_msg cb at osmo_pfcp_endpoint\n"); + if (!ep->cfg.rx_msg_cb) { + LOGP(DLPFCP, LOGL_ERROR, "missing cfg.rx_msg_cb at osmo_pfcp_endpoint\n"); return -EINVAL; } @@ -483,3 +510,37 @@ llist_for_each_entry(qe, &ep->sent_responses, entry) osmo_pfcp_msg_invalidate_ctx(qe->m, deleted_fi); } + +/* Return the cfg for an endpoint, guaranteed to return non-NULL for a valid ep. */ +const struct osmo_pfcp_endpoint_cfg *osmo_pfcp_endpoint_get_cfg(const struct osmo_pfcp_endpoint *ep) +{ + return &ep->cfg; +} + +/* Shorthand for &osmo_pfcp_endpoint_get_cfg(ep)->priv */ +void *osmo_pfcp_endpoint_get_priv(const struct osmo_pfcp_endpoint *ep) +{ + return ep->cfg.priv; +} + +uint32_t osmo_pfcp_endpoint_get_recovery_timestamp(const struct osmo_pfcp_endpoint *ep) +{ + return ep->recovery_time_stamp; +} + +/* Shorthand for &osmo_pfcp_endpoint_get_cfg(ep)->local_addr */ +const struct osmo_sockaddr *osmo_pfcp_endpoint_get_local_addr(const struct osmo_pfcp_endpoint *ep) +{ + return &ep->cfg.local_addr; +} + +void osmo_pfcp_endpoint_set_seq_nr_state(struct osmo_pfcp_endpoint *ep, uint32_t seq_nr_state) +{ + ep->seq_nr_state = seq_nr_state; +} + +/* Return true when the retransmission queues contain any PFCP messages, false when the queues are empty. */ +bool osmo_pfcp_endpoint_retrans_queue_is_busy(const struct osmo_pfcp_endpoint *ep) +{ + return !(llist_empty(&ep->sent_requests) && llist_empty(&ep->sent_responses)); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e Gerrit-Change-Number: 28754 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB GTP mapping

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 ) Change subject: hnbgw: test PS RAB GTP mapping ...................................................................... Patch Set 3: (2 comments) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/d1a5ee98_066e… PS1, Line 285: pfcp_remote_ip := "127.0.0.2", > agreed (mp_... […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/e9b205e8_7ff2… PS1, Line 1261: elementIdentifier := 8, > sounds like you may want to add a template for this Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b Gerrit-Change-Number: 28818 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 12:55:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-bsc[master]: tests/ctrl: Avoid creating logfile

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28811 ) Change subject: tests/ctrl: Avoid creating logfile ...................................................................... tests/ctrl: Avoid creating logfile It's of no use for the test. Furthemore, it was being created outside the build direcory, being left there. Change-Id: Iaeee14a01badb8439bc8893ba8be06b13e4318f3 --- M tests/ctrl/osmo-bsc-neigh-test.cfg 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index 8c04db6..baf5f36 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -1,12 +1,3 @@ -! osmo-bsc default configuration -! (assumes STP to run on 127.0.0.1 and uses default point codes) -! -log file /tmp/osmo-bsc-neigh.log - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging level set-all debug e1_input e1_line 0 driver ipa network -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaeee14a01badb8439bc8893ba8be06b13e4318f3 Gerrit-Change-Number: 28811 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

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

by pespin

Attention is currently required from: neels, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... Patch Set 2: (1 comment) File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/6f1e3d4a_970dc740 PS2, Line 193: /* Return true when the user configured GTP mapping to be enabled, by configuring a PFCP link to a UPF. > I'm not following you, pau. […] I we should not allow running osmo-hnbgw without proxying GTP through it (in detail, through its associated UPF). I am referring to the problem described for the need of a GTP-u proxy in the SGSN in OS#5154 and SYS#5389, SYS#5435. You also referenced a need for it in osmo-hnbgw in the decription of the task this commit is about (OS#5153). I think the main issue in this case would be what's described in SYS#5435 case "B]": "SGSN sending to nano3G GGSN's TEI which is changing after UpdatePDPCtxResp" but this time applied to HNBGW and hNodeB. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 28 Jul 2022 12:25:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB GTP mapping

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 ) Change subject: hnbgw: test PS RAB GTP mapping ...................................................................... Patch Set 3: (3 comments) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/dda6e1b9_d561… PS1, Line 285: pfcp_remote_ip := "127.0.0.2", > technically the ttcn3 virt UPF should respond back to whichever IP sends PFCP requests, i think i le […] agreed (mp_...) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/1e555f67_e5d5… PS1, Line 1308: f_sleep(2.0); > i guess i wanted to "simulate" that the RAB remains in use for a bit of time. […] Ack https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/59adaacb_383d… PS1, Line 1308: f_sleep(2.0); > i guess i wanted to "simulate" that the RAB remains in use for a bit of time. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b Gerrit-Change-Number: 28818 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:56:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_endpoint API

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/28755 to look at the new patch set (#2). Change subject: apply refactoring of osmo_pfcp_endpoint API ...................................................................... apply refactoring of osmo_pfcp_endpoint API libosmo-pfcp If80c35c6a942bf9593781b5a6bc28ba37323ce5e changes the osmo_pfcp_endpoint API, apply the necessary changes here. Related: SYS#5599 Depends: If80c35c6a942bf9593781b5a6bc28ba37323ce5e (libosmo-pfcp) Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 --- M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c M src/osmo-upf/up_session.c 5 files changed, 44 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/55/28755/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 Gerrit-Change-Number: 28755 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: apply code review: refactor pfcp_endpoint API

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 ) Change subject: apply code review: refactor pfcp_endpoint API ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: snuck in one more trivial API function, trivial enough to just re-add the vote -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e Gerrit-Change-Number: 28754 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:54:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: apply code review: refactor pfcp_endpoint API

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 to look at the new patch set (#3). Change subject: apply code review: refactor pfcp_endpoint API ...................................................................... apply code review: refactor pfcp_endpoint API Code review requested that the API should use functions instead of direct access to a struct. I have moved all user provided config to a separate struct osmo_pfcp_endpoint_cfg, to be passed to osmo_pfcp_endpoint_create(). Halfway through those changes, I am not so certain whether that is what reviewers had in mind. It makes sense from the point of view to keep nr of arguments passed to osmo_pfcp_endpoint_create() small, and to allow changing the user provided config without requiring a new osmo_pfcp_endpoint_create2() API function. Though that again has ABI compat problems, and makes no sense from the point of view that all access should be done via API functions. Personally I don't really agree with this change, which is probably the reason why this patch ended up this way. Related: SYS#5599 Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e --- M include/osmocom/pfcp/pfcp_endpoint.h M src/libosmo-pfcp/pfcp_cp_peer.c M src/libosmo-pfcp/pfcp_endpoint.c 3 files changed, 116 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/54/28754/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e Gerrit-Change-Number: 28754 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

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

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... Patch Set 2: (15 comments) File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/44dd4d64_06a87c46 PS2, Line 193: /* Return true when the user configured GTP mapping to be enabled, by configuring a PFCP link to a UPF. > I'm not sure we really want to disable this feature. […] I'm not following you, pau. Which feature do you want ot disable? The feature to use the external UPF for gtp-mapping? Or the feature to bypass that external UPF? I think there are valid use cases in both scenrarios. Paging should not really be something the HNBGW has to decide upon, but the SGSN. The SGSN knows if there's an Iu connection or not, and it should know if it has to buffer packets and page, or if it can send them to the RNC/HNBGW. Am I missing something? File include/osmocom/hnbgw/ps_rab_fsm.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/ef534e74_248fe3dd PS1, Line 8: struct addr_teid { > Maybe add a one line documenttion. […] Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/1ca2bfaf_e50eb34a PS1, Line 14: /* Two of this make up a GTP mapping, one for the Access (HNB) side, one for the Core (CN) side. > what does "this" mean here? Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/838fba43_cc60c991 PS1, Line 24: struct half_gtp_map { > gtp_tunnel would be accurate, except that the FAR (Forwarding Action Rule) is closely related to the […] Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/fd7653c5_5c0ab9f5 PS1, Line 36: /* Whether the RANAP message this RAB's remote address was obtained from encoded the address in x213_nsap */ > it is accurate but i'll rephrase to less ambiguous grammar Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/bdd01c72_9849f2dd PS1, Line 41: struct osmo_fsm_inst *fi; > document the type of fsm? because I see 2 more "fi" below. Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/e779e32e_720d5540 PS1, Line 54: /* Backpointer to the ps_rab_ass_fsm for the RAB Assignment Request from Core that created this RAB. */ > commenting in code... Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/e4a5f17e_840e6ad6 PS1, Line 79: bool ps_rab_is_established(struct ps_rab *rab); > constify param Done File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/458a0325_19cfeaeb PS1, Line 373: if (!map->is_ps) { > we (i?) usually list CS above PS ... […] Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/d872ba4a_9e2f1532 PS1, Line 396: rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); > i think i even considered that when writing the patch, but left it like this to show that the CS cod […] Done File src/osmo-hnbgw/hnbgw_pfcp.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/30fc8785_d653f75b PS1, Line 77: if (!hnb_gw_is_gtp_mapping_enabled(hnb_gw)) { > that's a matter of taste ... […] agrering with neels. File src/osmo-hnbgw/hnbgw_rua.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/5eb6d23e_cfd6d3a0 PS1, Line 284: if (!map->is_ps) { > idk i like CS above PS better, also before this patch there was "!is_ps" above Ack File src/osmo-hnbgw/hnbgw_vty.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/26f2a5ee_7f01c55b PS1, Line 474: if (g_hnb_gw->config.pfcp.local_addr) > same order here as where the cmds are added to vty, but ok whatever not aware of any specific ordering requirement. File src/osmo-hnbgw/ps_rab_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/24881181_99e8e8ef PS1, Line 490: /* See whether all RABs are done establishing, and replace RTP info in the RAB Assignment Response message, so that we > lol thx Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/9bf989a9_b05c7779 PS1, Line 625: void hnbgw_gtpmap_release(struct hnbgw_context_map *map) > I'm reading "gsmtap" all the time ;) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:45:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: add library/PFCP_*, deps/PFCP

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 to look at the new patch set (#3). Change subject: add library/PFCP_*, deps/PFCP ...................................................................... add library/PFCP_*, deps/PFCP Will soon be used by new subdir 'upf' (test osmo-upf), and by 'hnbgw' (test GTP mapping via UPF). Related: SYS#5599 Change-Id: I0723b931b3f755ea291bffa2f27c34ba446c2f2f --- M deps/Makefile M library/General_Types.ttcn A library/PFCP_CodecPort.ttcn A library/PFCP_CodecPort_CtrlFunct.ttcn A library/PFCP_CodecPort_CtrlFunctDef.cc A library/PFCP_Emulation.ttcn A library/PFCP_Templates.ttcn 7 files changed, 919 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/28817/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0723b931b3f755ea291bffa2f27c34ba446c2f2f Gerrit-Change-Number: 28817 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB GTP mapping

by neels

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 to look at the new patch set (#3). Change subject: hnbgw: test PS RAB GTP mapping ...................................................................... hnbgw: test PS RAB GTP mapping Related: SYS#5895 Change-Id: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M hnbgw/osmo-hnbgw.cfg M hnbgw/regen_makefile.sh M library/ranap/RANAP_Templates.ttcn 5 files changed, 294 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/28818/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b Gerrit-Change-Number: 28818 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test PS RAB GTP mapping

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 ) Change subject: hnbgw: test PS RAB GTP mapping ...................................................................... Patch Set 2: (2 comments) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/536cb845_9ed7… PS1, Line 285: pfcp_remote_ip := "127.0.0.2", > this probably needs to be moved to a mp_pfcp_ip_remote technically the ttcn3 virt UPF should respond back to whichever IP sends PFCP requests, i think i left it like this because it felt not properly thought through yet. does it make sense to set a fixed mp_pfcp_ip_remote? makes the PFCP emulation code simpler. we always have one fixed SUT. so i guess it makes sense. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818/comment/94029f0d_1fd9… PS1, Line 1308: f_sleep(2.0); > is this sleep needed? i guess i wanted to "simulate" that the RAB remains in use for a bit of time. sometimes nicer to have a time delay at such places to help reading logs / traces -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I93c4689ddc016eb4eb25f8cbdd0142936c6f972b Gerrit-Change-Number: 28818 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:43:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass_req_encode(): return msgb

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 ) Change subject: ranap_rab_ass_req_encode(): return msgb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I85e715326e1d8f4f301f82f78da109f1a7a92f30 Gerrit-Change-Number: 28815 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:37:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: fix test_ranap_rab_ass_resp_decode_encode

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 ) Change subject: fix test_ranap_rab_ass_resp_decode_encode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ifb98a52e56db1227a834c0d7b7a260314d9f547e Gerrit-Change-Number: 28814 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:36:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs

by laforge

Attention is currently required from: neels, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 ) Change subject: mgw_fsm: move MGCP timeout to mgw_fsm_T_defs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2aa67121c20dc3da5fd937a02b6747468622f317 Gerrit-Change-Number: 28813 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:36:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: pfcp_endpoint: fix final PFCP retrans resp_cb

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 ) Change subject: pfcp_endpoint: fix final PFCP retrans resp_cb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iaca396891921f7057015ce6e1e4528b955757809 Gerrit-Change-Number: 28812 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:35:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in libosmo-pfcp[master]: apply code review: refactor pfcp_endpoint API

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 ) Change subject: apply code review: refactor pfcp_endpoint API ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e Gerrit-Change-Number: 28754 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:35:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by pespin

pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28828 ) Change subject: Split smscb_peer_fsm into CBSP and SBcAP specific FSMs ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 year, 9 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 1: Verified+1 (1 comment) Patchset: PS1: linter warning about asn1c related code, ignoring. -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:32:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: add library/PFCP_*, deps/PFCP

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 ) Change subject: add library/PFCP_*, deps/PFCP ...................................................................... Patch Set 2: (1 comment) File library/PFCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817/comment/8f11044c_bc3d… PS1, Line 18: type enumerated e_PFCP_Cause { > You could move some of these into PFCP_Types. […] Not resolved (any of my comments in this file). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0723b931b3f755ea291bffa2f27c34ba446c2f2f Gerrit-Change-Number: 28817 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 11:31:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/28/28828/1 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..c2f3795 --- /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, 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/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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: add library/PFCP_*, deps/PFCP

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 to look at the new patch set (#2). Change subject: add library/PFCP_*, deps/PFCP ...................................................................... add library/PFCP_*, deps/PFCP Will soon be used by new subdir 'upf' (test osmo-upf), and by 'hnbgw' (test GTP mapping via UPF). Related: SYS#5599 Change-Id: I0723b931b3f755ea291bffa2f27c34ba446c2f2f --- M deps/Makefile M library/General_Types.ttcn A library/PFCP_CodecPort.ttcn A library/PFCP_CodecPort_CtrlFunct.ttcn A library/PFCP_CodecPort_CtrlFunctDef.cc A library/PFCP_Emulation.ttcn A library/PFCP_Templates.ttcn 7 files changed, 910 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/28817/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0723b931b3f755ea291bffa2f27c34ba446c2f2f Gerrit-Change-Number: 28817 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: reduce code dup in handle_cn_data_ind()

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 ) Change subject: reduce code dup in handle_cn_data_ind() ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827/comment/33534f40_2cd21330 PS1, Line 376: if (!map->is_ps) { I'd personally first check for the type of procedure ("switch (message->procedureCode)") and then inside each message do whatever, to follow a kind of "decode" path, but fine anyway. https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827/comment/d287c9ab_26112e4b PS1, Line 414: talloc_free(message); if rc==0, then these 2 get called: ranap_ran_rx_co_free(message) talloc_free(message) are you sure this is not doublefreeing? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4bca25d1643693cf3a9d3c49f35b29ff1dce0859 Gerrit-Change-Number: 28827 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 10:34:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 ) Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... Patch Set 2: (4 comments) File include/osmocom/hnbgw/hnbgw.h: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/29d202b0_07e98082 PS2, Line 193: /* Return true when the user configured GTP mapping to be enabled, by configuring a PFCP link to a UPF. I'm not sure we really want to disable this feature. It was noticed in some customer's tickets that some regular scenarios will fail if the HNBGW is not in thge middle of the GTP path. For instance IIRC if the UE conn is closed and some DL data arrives and the HNBGW needs to page the UE. I'm fine leaving it for now until the feature is completed, but we should drop this mode at some point. File src/osmo-hnbgw/hnbgw.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/75a9e9ff_87e9338c PS1, Line 230: LOGP(DHNBAP, LOGL_INFO, "deallocating UE context: id 0x%x, imsi %s, tmsi 0x%x\n", > missed this one, i think i needed it for debugging, could just drop it AFAICT this was not resolved. https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/0fd07e41_fd46c938 PS1, Line 354: LOGP(DMAIN, LOGL_INFO, "Deallocating hnb_context\n"); > this can probably go on a different commit. Same, not resolved. File src/osmo-hnbgw/ps_rab_fsm.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816/comment/bbb8fd8d_dbf2f7da PS1, Line 797: .name = "PS_RAB_ST_WAIT_USE_COUNT", > WAIT_USE_COUNT Not resolved. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 10:29:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass_req_encode(): return msgb

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 ) Change subject: ranap_rab_ass_req_encode(): return msgb ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > It would even probably make more sense to allocate the msgb at the caller and pass it to the encode […] that would be good, but can't: the function is calling ranap_generate_initiating_message() from osmo-iuh.git, which returns the msgb -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I85e715326e1d8f4f301f82f78da109f1a7a92f30 Gerrit-Change-Number: 28815 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Jul 2022 10:23:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: reduce code dup in handle_cn_data_ind()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 ) Change subject: reduce code dup in handle_cn_data_ind() ...................................................................... reduce code dup in handle_cn_data_ind() Change-Id: I4bca25d1643693cf3a9d3c49f35b29ff1dce0859 --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 11 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/27/28827/1 diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 75b1c94..0f1ed07 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -370,12 +370,11 @@ } /* Intercept RAB Assignment Request, to map RTP and GTP between access and core */ - if (!map->is_ps) { - /* Circuit-Switched. Set up mapping of RTP ports via MGW */ - message = talloc_zero(map, ranap_message); - rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); - - if (rc == 0) { + message = talloc_zero(map, ranap_message); + rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + if (rc == 0) { + if (!map->is_ps) { + /* Circuit-Switched. Set up mapping of RTP ports via MGW */ switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: /* mgw_fsm_alloc_and_handle_rab_ass_req() takes ownership of (ranap) message */ @@ -386,16 +385,8 @@ mgw_fsm_release(map); break; } - ranap_ran_rx_co_free(message); - } - - talloc_free(message); - } else { - /* Packet-Switched. Set up mapping of GTP ports via UPF */ - message = talloc_zero(map, ranap_message); - rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg)); - - if (rc == 0) { + } else { + /* Packet-Switched. Set up mapping of GTP ports via UPF */ switch (message->procedureCode) { case RANAP_ProcedureCode_id_RAB_Assignment: @@ -412,16 +403,15 @@ break; case RANAP_ProcedureCode_id_Iu_Release: - /* Any IU Release will terminate the MGW FSM, the message itsself is not passed to the - * FSM code. It is just forwarded normally by the rua_tx_dt() call below. */ + /* An IU Release will terminate the PFCP sessions for all RABs (ps_rab FSM instances). + * Terminate all RABs and forward the IU Release directly by rua_tx_dt() below. */ hnbgw_gtpmap_release(map); break; } - ranap_ran_rx_co_free(message); } - - talloc_free(message); + ranap_ran_rx_co_free(message); } + talloc_free(message); return rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, msgb_l2(oph->msg), msgb_l2len(oph->msg)); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4bca25d1643693cf3a9d3c49f35b29ff1dce0859 Gerrit-Change-Number: 28827 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by neels

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 to look at the new patch set (#2). Change subject: add ps_rab_ass FSM to map GTP via UPF ...................................................................... add ps_rab_ass FSM to map GTP via UPF Related: SYS#5895 Depends: If80c35c6a942bf9593781b5a6bc28ba37323ce5e (libosmo-pfcp) Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a --- M configure.ac M contrib/jenkins.sh M include/osmocom/hnbgw/Makefile.am M include/osmocom/hnbgw/context_map.h M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/hnbgw_pfcp.h A include/osmocom/hnbgw/ps_rab_ass_fsm.h A include/osmocom/hnbgw/ps_rab_fsm.h M include/osmocom/hnbgw/tdefs.h M include/osmocom/hnbgw/vty.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c A src/osmo-hnbgw/hnbgw_pfcp.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/ps_rab_ass_fsm.c A src/osmo-hnbgw/ps_rab_fsm.c M src/osmo-hnbgw/tdefs.c 20 files changed, 1,965 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/16/28816/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a Gerrit-Change-Number: 28816 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

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

by neels

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

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

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

by fixeria

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

1 year, 9 months

1
0
0 0

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

by fixeria

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

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Request and handle Write Replace Warning Indication

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28822 ) Change subject: sbcap: Request and handle Write Replace Warning Indication ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0 Gerrit-Change-Number: 28822 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:39:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Move ASN1C enc/dec logging to its own category

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28821 ) Change subject: Move ASN1C enc/dec logging to its own category ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia4cbae2395532d9b5b7b9177a7d0f31bf777d751 Gerrit-Change-Number: 28821 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:38:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Move cbc_cell_id2str() and make it public

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28820 ) Change subject: Move cbc_cell_id2str() and make it public ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I74ccbbc810a2fa76fb2999a7588b3f67d4d21e03 Gerrit-Change-Number: 28820 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:37:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28819 ) Change subject: sbcap: Log info about messages received and trasmitted ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File src/sbcap_link.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/a41dd2dc_8b53bba9 PS1, Line 397: Transmitting Given that you're changing "Received" to "Rx", I suggest to use "Tx" here for consistency. https://gerrit.osmocom.org/c/osmo-cbc/+/28819/comment/3727e0f3_78007760 PS1, Line 403: LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", Isn't it redundant to print PDU name here? You're already printing it on line 398 ("Transmitting msg %s"). -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ifd1eca79bf4fac63de8066cd6a18004138d51d04 Gerrit-Change-Number: 28819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 18:36:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... Patch Set 2: Verified+1 (1 comment) Patchset: PS2: linter warns about asn1c generated code here. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Jul 2022 17:51:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by pespin

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

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Move ASN1C enc/dec logging to its own category

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28821 to look at the new patch set (#2). Change subject: Move ASN1C enc/dec logging to its own category ...................................................................... Move ASN1C enc/dec logging to its own category ASN1C encoding/decoding can get really verbose. Furthermore, it should only be enabled under really specific conditions, so it makes sense to have it under its own category. Change-Id: Ia4cbae2395532d9b5b7b9177a7d0f31bf777d751 --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/debug.h M include/osmocom/sbcap/sbcap_common.h M include/osmocom/sbcap/sbcap_internal.h M src/cbc_main.c M src/sbcap/sbcap_common.c M tests/sbcap/sbcap_test.c 7 files changed, 29 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/21/28821/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia4cbae2395532d9b5b7b9177a7d0f31bf777d751 Gerrit-Change-Number: 28821 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

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

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 to look at the new patch set (#2). Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 --- M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/sbcap_msg.h M src/cbc_data.c M src/sbcap_msg.c M src/smscb_peer_fsm.c 5 files changed, 52 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/23/28823/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Request and handle Write Replace Warning Indication

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28822 to look at the new patch set (#2). Change subject: sbcap: Request and handle Write Replace Warning Indication ...................................................................... sbcap: Request and handle Write Replace Warning Indication Change-Id: I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0 --- M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/sbcap_msg.h M include/osmocom/cbc/smscb_message_fsm.h M src/cbc_data.c M src/sbcap_link_fsm.c M src/sbcap_msg.c M src/smscb_peer_fsm.c 7 files changed, 81 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/22/28822/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I563e7d1c999f14b8197bb41e85b7bcf6262fe2a0 Gerrit-Change-Number: 28822 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28823 ) Change subject: sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer ...................................................................... sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 --- M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/sbcap_msg.h M src/cbc_data.c M src/sbcap_msg.c M src/smscb_peer_fsm.c 5 files changed, 52 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/23/28823/1 diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index b857dc2..6d64f04 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -17,6 +17,7 @@ CBC_CELL_ID_LAC, CBC_CELL_ID_CI, CBC_CELL_ID_ECGI, + CBC_CELL_ID_TAI, }; struct cbc_cell_id { @@ -29,6 +30,7 @@ uint16_t lac; uint16_t ci; struct osmo_eutran_cell_global_id ecgi; + struct osmo_tracking_area_id tai; } u; /* only in failure list */ struct { diff --git a/include/osmocom/cbc/sbcap_msg.h b/include/osmocom/cbc/sbcap_msg.h index 22d043b..ce76ef3 100644 --- a/include/osmocom/cbc/sbcap_msg.h +++ b/include/osmocom/cbc/sbcap_msg.h @@ -14,3 +14,4 @@ void cci_from_sbcap_bcast_cell_id(struct cbc_cell_id *cci, const SBcAP_CellId_Broadcast_List_Item_t *it); +void cci_from_sbcap_tai(struct cbc_cell_id *cci, const SBcAP_TAI_t *tai); diff --git a/src/cbc_data.c b/src/cbc_data.c index 013b053..3029ffc 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -65,6 +65,9 @@ snprintf(buf, sizeof(buf), "ECGI %s-%05X-%02X", osmo_plmn_name(&cid->u.ecgi.plmn), cid->u.ecgi.eci >> 8, cid->u.ecgi.eci & 0xff); break; + case CBC_CELL_ID_TAI: + snprintf(buf, sizeof(buf), "TAI %s-%u", osmo_plmn_name(&cid->u.tai.plmn), cid->u.tai.tac); + break; default: snprintf(buf, sizeof(buf), "<invalid>"); break; diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index 11a08d1..1c0e768 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -356,3 +356,11 @@ { cci_from_sbcap_ecgi(cci, &it->eCGI); } + +/* Fill a cbc_cell_id from a SBcAP_TAI_t */ +void cci_from_sbcap_tai(struct cbc_cell_id *cci, const SBcAP_TAI_t *tai) +{ + cci->id_discr = CBC_CELL_ID_TAI; + cci->u.tai.tac = osmo_load16be(tai->tAC.buf); + osmo_plmn_from_bcd(tai->pLMNidentity.buf, &cci->u.tai.plmn); +} diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index f6bbc96..1a7801b 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -314,6 +314,31 @@ } } +/* 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 ***********************************************************************/ @@ -342,7 +367,9 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *dec = NULL; - //SBcAP_SBC_AP_PDU_t *pdu = 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_E_CBSP_WRITE_ACK: @@ -363,13 +390,21 @@ osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_WRITE_NACK, mp); break; case SMSCB_E_SBCAP_WRITE_ACK: - //pdu = data; + 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_E_SBCAP_WRITE_ACK, mp); break; case SMSCB_E_SBCAP_WRITE_NACK: - //pdu = data; 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); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I37b08aa374c1097d2871bf69a7bb7893f32bccd3 Gerrit-Change-Number: 28823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/24/28824/1 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

2024

2023

2022

gerrit-log July 2022