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

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Jul 2022 18:03:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-cbc[master]: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed

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/+/28854 to look at the new patch set (#2). Change subject: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed ...................................................................... *_smscb_peer_fsm: Immediately NACK if Tx of msg failed This makes the smscb_message_fsm receive immediate notice that this peer failed to deliver the message, avoiding need to wait for 10 seconds timeout. Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 --- M src/cbsp_smscb_peer_fsm.c M src/sbcap_smscb_peer_fsm.c M src/smscb_message_fsm.c 3 files changed, 27 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/54/28854/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 Gerrit-Change-Number: 28854 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28858 ) Change subject: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones ...................................................................... ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones This is intended to ease adding new emulated MMEs and BSCs by using next available port strting from the one defined in the TTCN3 test module parameter. Requires: osmo-ttcn3-hacks.git Ib443aba9396aebe0a56b1a79719bbcf66302a1aa Change-Id: Ib1387284c8f361572057b6d036429366238382a6 --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/58/28858/1 diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index c2c1b7b..9d7f4a1 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -33,9 +33,9 @@ local-port 29168 peer cbsp ttcn3-bsc mode server - remote-port 9999 + remote-port 15000 remote-ip 172.18.27.100 peer sbcap ttcn3-mme mode server - remote-port 9998 + remote-port 16000 remote-ip 172.18.27.100 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib1387284c8f361572057b6d036429366238382a6 Gerrit-Change-Number: 28858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 ) Change subject: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme ...................................................................... cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme The BSC/MMEs ports are applied in osmo-cbc.cfg similarly in sequential order. Change-Id: Ib443aba9396aebe0a56b1a79719bbcf66302a1aa --- M cbc/CBC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/28857/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 9c9c644..76fc3be 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -38,8 +38,8 @@ integer mp_cbc_cbsp_port := 48049; integer mp_cbc_sbcap_port := c_SBC_AP_PORT; integer mp_cbc_ecbe_port := 12345; - integer mp_local_cbsp_port := 9999; - integer mp_local_sbcap_port := 9998; + integer mp_local_cbsp_port := 15000; + integer mp_local_sbcap_port := 16000; }; const integer MAX_BSC := 3; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 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: Ib443aba9396aebe0a56b1a79719bbcf66302a1aa Gerrit-Change-Number: 28857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Enable MMEs and BSCs selectively

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 ) Change subject: cbc: Enable MMEs and BSCs selectively ...................................................................... cbc: Enable MMEs and BSCs selectively Let's only create BSC handlers (no MM handlers) in tests validating CBSP specific features. A new test is added to specifically validate scenarios with both an MME and BSC attached to the CBC. Change-Id: I79ee41f183ef49e9fd606d2a3efa2767628bf142 --- M cbc/CBC_Tests.ttcn 1 file changed, 29 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/28856/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 5240d85..9c9c644 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -135,7 +135,7 @@ g_vc_conn_MME[idx].start(f_MME_ConnHdlr_main(id, pars)); } -private function f_init(integer num_bsc := 1, integer num_mme := 1) runs on test_CT { +private function f_init(integer num_bsc := 0, integer num_mme := 0) runs on test_CT { f_http_init(mp_cbc_host, mp_cbc_ecbe_port); g_num_bsc := num_bsc; @@ -168,7 +168,7 @@ } testcase TC_rx_keepalive() runs on test_CT { - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive); f_start(); f_shutdown_helper(); @@ -191,7 +191,7 @@ CBSP[0].receive(PortEvent:{connClosed:=?}) } testcase TC_rx_keepalive_timeout() runs on test_CT { - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive_timeout); f_start(); f_shutdown_helper(); @@ -220,7 +220,7 @@ } }; - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].exp_cbs_msg := msg; g_pars_BSC[0].start_fn := refers(f_bsc_TC_write_replace); f_start(); @@ -330,7 +330,7 @@ /* specify a variety of different Cell Identifier formats to extend test coverage */ testcase TC_ecbe_create_delete_cgi() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(43, 16752); @@ -342,14 +342,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac_ci() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(44, 16752); cell_list_success := ts_BSSMAP_CIL_LAC_CI({ @@ -360,14 +358,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(45, 16752); cell_list_success := ts_BSSMAP_CIL_LAC({ @@ -378,14 +374,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_ci() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(46, 16752); cell_list_success := ts_BSSMAP_CIL_CI({ @@ -396,14 +390,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lai() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(47, 16752); cell_list_success := ts_BSSMAP_CIL_LAI({ @@ -414,6 +406,25 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + +/* Create and delete message with both BSC and MME available */ +testcase TC_ecbe_create_delete_bsc_and_mme() runs on test_CT { + f_init(num_bsc := 1, num_mme := 1); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(43, 16752); + + cell_list_success := ts_BSSMAP_CIL_CGI({ + ts_BSSMAP_CI_CGI('901'H, '70'H, 23, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 43) + }); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); @@ -429,6 +440,7 @@ execute( TC_ecbe_create_delete_lac() ); execute( TC_ecbe_create_delete_ci() ); execute( TC_ecbe_create_delete_lai() ); + execute( TC_ecbe_create_delete_bsc_and_mme() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 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: I79ee41f183ef49e9fd606d2a3efa2767628bf142 Gerrit-Change-Number: 28856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Fix use of incorrect variable in loop

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 ) Change subject: cbc: Fix use of incorrect variable in loop ...................................................................... cbc: Fix use of incorrect variable in loop This went unnoticed before because all tests were running with both bsc and mme set to 1. Change-Id: I978c92819cb4e218c95bc719ade71787dc474b23 --- M cbc/CBC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/28855/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 11b8e5a..5240d85 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -150,7 +150,7 @@ } function f_start() runs on test_CT { - for (var integer i := 0; i < g_num_mme; i := i + 1) { + for (var integer i := 0; i < g_num_bsc; i := i + 1) { f_start_bsc(i, testcasename(), g_pars_BSC[i]); } for (var integer i := 0; i < g_num_mme; i := i + 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 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: I978c92819cb4e218c95bc719ade71787dc474b23 Gerrit-Change-Number: 28855 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-cbc[master]: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28853 ) Change subject: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails ...................................................................... Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails Change-Id: Ie40c8e41c297398bbec48f7bb2c60cfdc703fa5d --- M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbc_message.c M src/cbsp_link.c M src/sbcap_link.c 5 files changed, 19 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/53/28853/1 diff --git a/include/osmocom/cbc/cbsp_link.h b/include/osmocom/cbc/cbsp_link.h index a96162d..0a18d21 100644 --- a/include/osmocom/cbc/cbsp_link.h +++ b/include/osmocom/cbc/cbsp_link.h @@ -47,6 +47,6 @@ void cbc_cbsp_link_free(struct cbc_cbsp_link *link); const char *cbc_cbsp_link_name(const struct cbc_cbsp_link *link); int cbc_cbsp_link_open_cli(struct cbc_cbsp_link *link); -void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp); +int cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp); void cbc_cbsp_link_close(struct cbc_cbsp_link *link); int cbc_cbsp_link_rx_cb(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec); diff --git a/include/osmocom/cbc/sbcap_link.h b/include/osmocom/cbc/sbcap_link.h index 0c23710..ee87be4 100644 --- a/include/osmocom/cbc/sbcap_link.h +++ b/include/osmocom/cbc/sbcap_link.h @@ -47,6 +47,6 @@ void cbc_sbcap_link_free(struct cbc_sbcap_link *link); const char *cbc_sbcap_link_name(const struct cbc_sbcap_link *link); int cbc_sbcap_link_open_cli(struct cbc_sbcap_link *link); -void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); +int cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); void cbc_sbcap_link_close(struct cbc_sbcap_link *link); int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); diff --git a/src/cbc_message.c b/src/cbc_message.c index a2bf86a..f17ab75 100644 --- a/src/cbc_message.c +++ b/src/cbc_message.c @@ -70,8 +70,8 @@ peer->name); return -EINVAL; } - cbc_cbsp_link_tx(peer->link.cbsp, cbsp); - break; + return cbc_cbsp_link_tx(peer->link.cbsp, cbsp); + case CBC_PEER_PROTO_SBcAP: /* skip peers without any current SBc-AP connection */ if (!peer->link.sbcap) { @@ -84,17 +84,16 @@ peer->name); return -EINVAL; } - cbc_sbcap_link_tx(peer->link.sbcap, sbcap); - break; + return cbc_sbcap_link_tx(peer->link.sbcap, sbcap); + case CBC_PEER_PROTO_SABP: LOGP(DLGLOBAL, LOGL_ERROR, "Sending message to peer proto %s not implemented!\n", get_value_string(cbc_peer_proto_name, peer->proto)); return -1; + default: OSMO_ASSERT(0); } - - return 0; } /* receive a new CBC message from the user (REST). Allocates new memory, diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 343ac26..a6462ee 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -318,14 +318,14 @@ return 0; } -void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp) +int cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp) { struct msgb *msg; if (!link) { LOGP(DCBSP, LOGL_NOTICE, "Cannot transmit %s: no connection\n", get_value_string(cbsp_msg_type_names, cbsp->msg_type)); - return ; + return -ENOLINK; } LOGPCC(link, LOGL_INFO, "Transmitting %s\n", @@ -336,13 +336,14 @@ LOGPCC(link, LOGL_ERROR, "Failed to encode CBSP %s: %s\n", get_value_string(cbsp_msg_type_names, cbsp->msg_type), osmo_cbsp_errstr); talloc_free(cbsp); - return; + return -EINVAL; } talloc_free(cbsp); if (link->is_client) osmo_stream_cli_send(link->cli_conn, msg); else osmo_stream_srv_send(link->srv_conn, msg); + return 0; } void cbc_cbsp_link_close(struct cbc_cbsp_link *link) diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 91fa75c..b2a5aa2 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -379,27 +379,30 @@ return 0; } -void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) +int cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { struct msgb *msg; + int rc = 0; if (!pdu) { LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg: no pdu\n"); - return; + return -ENOMSG; } if (!link) { LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg %s: no connection\n", sbcap_pdu_get_name(pdu)); - return; + return -ENOLINK; } LOGPSBCAPC(link, LOGL_INFO, "Tx msg %s\n", sbcap_pdu_get_name(pdu)); OSMO_ASSERT(link->conn); msg = sbcap_encode(pdu); - if (!msg) + if (!msg) { + rc = -EINVAL; goto ret_free; + } LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", sbcap_pdu_get_name(pdu), msgb_hexdump(msg)); if (link->is_client) @@ -408,6 +411,7 @@ osmo_stream_srv_send(link->srv_conn, msg); ret_free: sbcap_pdu_free(pdu); + return rc; } void cbc_sbcap_link_close(struct cbc_sbcap_link *link) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie40c8e41c297398bbec48f7bb2c60cfdc703fa5d Gerrit-Change-Number: 28853 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-cbc[master]: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28854 ) Change subject: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed ...................................................................... *_smscb_peer_fsm: Immediately NACK if Tx of msg failed This makes the smscb_message_fsm receive immediate notice that this peer failed to deliver the message, avoiding need to wait for 10 seconds timeout. Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 --- M src/cbsp_smscb_peer_fsm.c M src/sbcap_smscb_peer_fsm.c M src/smscb_message_fsm.c 3 files changed, 27 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/54/28854/1 diff --git a/src/cbsp_smscb_peer_fsm.c b/src/cbsp_smscb_peer_fsm.c index 872008c..bce90df 100644 --- a/src/cbsp_smscb_peer_fsm.c +++ b/src/cbsp_smscb_peer_fsm.c @@ -266,11 +266,9 @@ 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); - } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, T_WAIT_WRITE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -309,6 +307,7 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *cbsp; + int rc; switch (event) { case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to BSC */ @@ -320,8 +319,10 @@ /* 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); + rc = 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); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; case SMSCB_PEER_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_MSG_STATUS_QUERY); @@ -330,8 +331,10 @@ 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); + rc = 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); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -423,8 +426,6 @@ } } - - static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) { switch (fi->T) { @@ -454,6 +455,7 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *cbsp; + int rc; switch (event) { case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ @@ -478,8 +480,10 @@ 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); + rc = 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); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -497,7 +501,8 @@ [SMSCB_S_INIT] = { .name = "INIT", .in_event_mask = S(SMSCB_PEER_E_CREATE), - .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK) | + S(SMSCB_S_ACTIVE), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { diff --git a/src/sbcap_smscb_peer_fsm.c b/src/sbcap_smscb_peer_fsm.c index 706a98f..f43b644 100644 --- a/src/sbcap_smscb_peer_fsm.c +++ b/src/sbcap_smscb_peer_fsm.c @@ -116,11 +116,9 @@ 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); - } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, T_WAIT_WRITE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -256,6 +254,7 @@ SBcAP_SBC_AP_PDU_t *sbcap; A_SEQUENCE_OF(void) *as_pdu; SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; + int rc; switch (event) { case SMSCB_PEER_E_DELETE: /* send Stop-Warning to MME */ @@ -269,13 +268,16 @@ break; } if ((sbcap = sbcap_gen_stop_warning_req(mp->peer, mp->cbcmsg))) { - cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); + rc = 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); + rc = -1; } osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; case SMSCB_PEER_E_SBCAP_WRITE_IND: sbcap = (SBcAP_SBC_AP_PDU_t *)data; @@ -305,7 +307,8 @@ [SMSCB_S_INIT] = { .name = "INIT", .in_event_mask = S(SMSCB_PEER_E_CREATE), - .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK) | + S(SMSCB_S_ACTIVE), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index 9281736..e7f96c0 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -84,7 +84,7 @@ /* 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) { - if (peer_fi->state == SMSCB_S_WAIT_WRITE_ACK) + if (peer_fi->state != SMSCB_S_ACTIVE) return; } rest_it_op_set_http_result(cbcmsg->it_op, 201, "Created"); // FIXME: error cases -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 Gerrit-Change-Number: 28854 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-cbc[master]: cbc_main: Enable logging of fsm timeouts

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28852 ) Change subject: cbc_main: Enable logging of fsm timeouts ...................................................................... cbc_main: Enable logging of fsm timeouts Change-Id: I6ffbfbc8eddb3efff0b6401223b9b5563cf83b51 --- M src/cbc_main.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/52/28852/1 diff --git a/src/cbc_main.c b/src/cbc_main.c index 7e13e52..fd8e4fe 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -35,6 +35,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <osmocom/core/application.h> +#include <osmocom/core/fsm.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/stats.h> @@ -268,6 +269,7 @@ log_enable_multithread(); sbcap_set_log_area(DSBcAP, DASN1C); osmo_stats_init(tall_cbc_ctx); + osmo_fsm_log_timeouts(true); vty_init(&vty_info); g_cbc = cbc_alloc(tall_cbc_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6ffbfbc8eddb3efff0b6401223b9b5563cf83b51 Gerrit-Change-Number: 28852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

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

by dexter

Attention is currently required from: neels, pespin. dexter 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 2: Code-Review+1 (1 comment) File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827/comment/e38e69a1_1a2cee25 PS1, Line 414: talloc_free(message); > See how it pairs up with talloc_zero() and ranap_ran_rx_co_decode() above As far as I can see ranap_ran_rx_co_free() frees the contents and the talloc_free frees the struct - so everything should be fine. -- 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: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 15:18:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022