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

Change in osmo-msc[master]: Try to send all pending SMS for subscriber in sub_ready_for_sms()

by pespin

Attention is currently required from: keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28343 ) Change subject: Try to send all pending SMS for subscriber in sub_ready_for_sms() ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28343/comment/98af8ea0_2fb14a90 PS2, Line 7: Try to send all pending SMS for subscriber in sub_ready_for_sms() Please explain why this was not applied before, why is this needed and what is the change of behavior with this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5a1360a7a18312836b96b6be761a53b7d0b17d02 Gerrit-Change-Number: 28343 Gerrit-PatchSet: 2 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 20 Jun 2022 09:07:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: Avoid UPDATE immediately followed by DELETE

by pespin

Attention is currently required from: keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28340 ) Change subject: Avoid UPDATE immediately followed by DELETE ...................................................................... Patch Set 1: (5 comments) File src/libmsc/db.c: https://gerrit.osmocom.org/c/osmo-msc/+/28340/comment/5d3c17ad_215e7893 PS1, Line 314: [DB_STMT_SMS_DEL_SENT_BY_ID] = what's the point in having the 2 of them? File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/c/osmo-msc/+/28340/comment/f72118ab_2728313a PS1, Line 871: /* msc_vlr tests will not pass any sms_queue, hence need to check smq != NULL */ Rather better fix the tests to pass a valid smq pointer. https://gerrit.osmocom.org/c/osmo-msc/+/28340/comment/aa4a01d4_460e3574 PS1, Line 873: db_sms_mark_delivered(sms); Sounds like all this should be placed wherever S_SMS_DELIVERED signal is handled imho. File src/libmsc/sms_queue.c: https://gerrit.osmocom.org/c/osmo-msc/+/28340/comment/64058604_497df46f PS1, Line 123: struct gsm_sms_queue { If you move the code block to be handled in signal callback, this probably can stay here. https://gerrit.osmocom.org/c/osmo-msc/+/28340/comment/09c1478b_1a1ee10e PS1, Line 607: /* Remember the subscriber and clear the pending entry */ The cod eblock should be mover over here? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I777155c0f818b979c636bb59953719e472771603 Gerrit-Change-Number: 28340 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 20 Jun 2022 09:05:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: Use unix timestamps in the SMS db

by pespin

Attention is currently required from: keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28339 ) Change subject: Use unix timestamps in the SMS db ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: You are probably breaking backward compatibility with older existing databases here? This may need a new db version and code to migrate to it? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I599a57666da22adf806b01ff095c8672d523a737 Gerrit-Change-Number: 28339 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 20 Jun 2022 08:59:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: Turn off secure_delete in sqlite

by pespin

Attention is currently required from: keith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28341 ) Change subject: Turn off secure_delete in sqlite ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e Gerrit-Change-Number: 28341 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Mon, 20 Jun 2022 08:57:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmo-pfcp[master]: separate pfcp_queue_timer_cb() in req and resp

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28337 ) Change subject: separate pfcp_queue_timer_cb() in req and resp ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/libosmo-pfcp/pfcp_endpoint.c: https://gerrit.osmocom.org/c/libosmo-pfcp/+/28337/comment/97bfe9b0_d58c08a9 PS1, Line 285: } else { You'll probably want to name the 2 timers differently (put them in a union), since anyway you'll want to have different timer configurations for each of the two. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ic8ab71f5efd4cf669689a0b075f9a52ce66bdd5d Gerrit-Change-Number: 28337 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: Mon, 20 Jun 2022 08:57:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add TC_chan_alloc_algo_ass_dynamic

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28322 ) Change subject: BSC_Tests: add TC_chan_alloc_algo_ass_dynamic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28322 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: Ia522f37c1c001b3a36f5145b8875fbb88311c2e5 Gerrit-Change-Number: 28322 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Jun 2022 08:54:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: cgit: Fix Atom feed scheme from http to https

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28386 ) Change subject: cgit: Fix Atom feed scheme from http to https ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4000f32ee8e7c55a711f928a19379b3a80a8446f Gerrit-Change-Number: 28386 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Jun 2022 08:50:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: cgit: fix Atom feed hostname from localhost to cgit.osmocom.org

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28385 ) Change subject: cgit: fix Atom feed hostname from localhost to cgit.osmocom.org ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaab14e254acc0356f0d3639924e3b6b528d57973 Gerrit-Change-Number: 28385 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Jun 2022 08:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc-nat[master]: subscr_conn_fsm: refactor timeouts

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28249 ) Change subject: subscr_conn_fsm: refactor timeouts ...................................................................... subscr_conn_fsm: refactor timeouts Use osmo_tdef_state_timeout instead of passing timers every time. Rename g_mgw_tdefs to g_bsc_nat_tdefs and add the new TDEF_ASS_COMPL there, so the TDEF_MGCP can be used in subscr_conn_fsm and by mgcp client without duplicating it. Related: SYS#5560 Change-Id: Ib34e6ccc34901ebc37d2dbe347d9644cb70921ca --- M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/subscr_conn_fsm.c 3 files changed, 42 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index fd2c3fb..f7dafbb 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -24,6 +24,9 @@ #include <osmocom/mgcp_client/mgcp_client_pool.h> #include <osmocom/sigtran/sccp_sap.h> +#define BSC_NAT_TDEF_ASS_COMPL (-1) +#define BSC_NAT_TDEF_MGCP (-2427) + enum bsc_nat_net { BSC_NAT_NET_CN = 0, BSC_NAT_NET_RAN @@ -39,11 +42,11 @@ struct bsc_nat { struct osmo_fsm_inst *fi; + struct osmo_tdef *tdefs; struct llist_head subscr_conns; /* list of struct subscr_conn */ struct { struct mgcp_client_pool *pool; - struct osmo_tdef *tdefs; uint32_t call_id_next; } mgw; diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index b847679..3ae7881 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -28,13 +28,14 @@ #include <osmocom/bsc_nat/msc.h> #include <osmocom/bsc_nat/subscr_conn.h> -struct osmo_tdef g_mgw_tdefs[] = { - { .T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, +static struct osmo_tdef g_bsc_nat_tdefs[] = { + { .T = BSC_NAT_TDEF_ASS_COMPL, .default_val = 20, .desc = "Timeout for BSSMAP Assignment Complete from BSC" }, + { .T = BSC_NAT_TDEF_MGCP, .default_val = 5, .desc = "Timeout for MGCP response from MGW" }, {} }; struct osmo_tdef_group g_bsc_nat_tdef_group[] = { - { .name = "mgw", .tdefs = g_mgw_tdefs, .desc = "MGW (Media Gateway) interface" }, + { .name = "bsc-nat", .tdefs = g_bsc_nat_tdefs, .desc = "BSCNAT" }, {} }; @@ -45,9 +46,10 @@ bsc_nat = talloc_zero(tall_ctx, struct bsc_nat); OSMO_ASSERT(bsc_nat); + bsc_nat->tdefs = g_bsc_nat_tdefs; + osmo_tdefs_reset(bsc_nat->tdefs); + bsc_nat->mgw.pool = mgcp_client_pool_alloc(bsc_nat); - bsc_nat->mgw.tdefs = g_mgw_tdefs; - osmo_tdefs_reset(bsc_nat->mgw.tdefs); bsc_nat->cn.sccp_inst = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); OSMO_ASSERT(bsc_nat->cn.sccp_inst); diff --git a/src/osmo-bsc-nat/subscr_conn_fsm.c b/src/osmo-bsc-nat/subscr_conn_fsm.c index 848204d..8a58ac1 100644 --- a/src/osmo-bsc-nat/subscr_conn_fsm.c +++ b/src/osmo-bsc-nat/subscr_conn_fsm.c @@ -31,8 +31,6 @@ #include <osmocom/bsc_nat/subscr_conn_fsm.h> #define X(s) (1 << (s)) -#define TIMEOUT_MGW 10 -#define TIMEOUT_BSC 20 enum subscr_conn_fsm_states { SUBSCR_CONN_FSM_ST_IDLE, @@ -44,6 +42,19 @@ SUBSCR_CONN_FSM_ST_WAITING_FOR_CLEAR_COMMAND, }; +static const struct osmo_tdef_state_timeout subscr_conn_fsm_timeouts[32] = { + [SUBSCR_CONN_FSM_ST_IDLE] = {}, + [SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_CRCX_CN] = { .T = BSC_NAT_TDEF_MGCP }, + [SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_MDCX_CN] = { .T = BSC_NAT_TDEF_MGCP }, + [SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_CRCX_RAN] = { .T = BSC_NAT_TDEF_MGCP }, + [SUBSCR_CONN_FSM_ST_WAITING_FOR_ASSIGNMENT_COMPLETE] = { .T = BSC_NAT_TDEF_ASS_COMPL }, + [SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_COMPLETE_MDCX_RAN] = { .T = BSC_NAT_TDEF_MGCP }, + [SUBSCR_CONN_FSM_ST_WAITING_FOR_CLEAR_COMMAND] = {}, /* Call in progress, no timeout */ +}; + +#define subscr_conn_fsm_state_chg(fi, NEXT_STATE) \ + osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, subscr_conn_fsm_timeouts, g_bsc_nat->tdefs, -1) + static int tx_ass_req_to_ran(struct subscr_conn *subscr_conn) { const struct mgcp_conn_peer *rtp_info; @@ -122,7 +133,7 @@ { switch (event) { case SUBSCR_CONN_FSM_EV_BSSMAP_ASSIGNMENT_REQUEST: - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_CRCX_CN, TIMEOUT_MGW, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_CRCX_CN); break; case SUBSCR_CONN_FSM_EV_MGCP_EP_TERM: /* This event is expected, as we terminate the MGCP EP in @@ -148,14 +159,14 @@ if (call_id < 0) { LOGPFSML(fi, LOGL_ERROR, "Failed to get next_id_mgw, aborting assignment request processing\n"); bssmap_tx_assignment_failure_cn(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); } /* MGCP EP */ mgcp_client = mgcp_client_pool_get(g_bsc_nat->mgw.pool); OSMO_ASSERT(mgcp_client); subscr_conn->ep = osmo_mgcpc_ep_alloc(subscr_conn->fi, SUBSCR_CONN_FSM_EV_MGCP_EP_TERM, mgcp_client, - g_bsc_nat->mgw.tdefs, "SUBSCR-CONN-EP", + g_bsc_nat->tdefs, "SUBSCR-CONN-EP", mgcp_client_rtpbridge_wildcard(mgcp_client)); /* MGCP CRCX CN */ @@ -173,12 +184,12 @@ switch (event) { case SUBSCR_CONN_FSM_EV_MGCP_EP_OK: LOGPFSML(fi, LOGL_DEBUG, "Rx MGCP OK\n"); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_MDCX_CN, TIMEOUT_MGW, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_MDCX_CN); break; case SUBSCR_CONN_FSM_EV_MGCP_EP_FAIL: LOGPFSML(fi, LOGL_ERROR, "MGCP failure, aborting assignment request processing\n"); bssmap_tx_assignment_failure_cn(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); break; default: OSMO_ASSERT(false); @@ -208,12 +219,12 @@ switch (event) { case SUBSCR_CONN_FSM_EV_MGCP_EP_OK: LOGPFSML(fi, LOGL_DEBUG, "Rx MGCP OK\n"); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_CRCX_RAN, TIMEOUT_MGW, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_REQUEST_CRCX_RAN); break; case SUBSCR_CONN_FSM_EV_MGCP_EP_FAIL: LOGPFSML(fi, LOGL_ERROR, "MGCP failure, aborting assignment request processing\n"); bssmap_tx_assignment_failure_cn(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); break; default: OSMO_ASSERT(false); @@ -240,15 +251,15 @@ LOGPFSML(fi, LOGL_DEBUG, "Rx MGCP OK\n"); if (tx_ass_req_to_ran(subscr_conn) < 0) { bssmap_tx_assignment_failure_cn(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); return; } - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_WAITING_FOR_ASSIGNMENT_COMPLETE, TIMEOUT_BSC, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_WAITING_FOR_ASSIGNMENT_COMPLETE); break; case SUBSCR_CONN_FSM_EV_MGCP_EP_FAIL: LOGPFSML(fi, LOGL_ERROR, "MGCP failure, aborting assignment request processing\n"); bssmap_tx_assignment_failure_cn(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); break; default: OSMO_ASSERT(false); @@ -259,13 +270,13 @@ { switch (event) { case SUBSCR_CONN_FSM_EV_BSSMAP_ASSIGNMENT_COMPLETE: - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_COMPLETE_MDCX_RAN, TIMEOUT_MGW, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_PROCESSING_ASSIGNMENT_COMPLETE_MDCX_RAN); break; case SUBSCR_CONN_FSM_EV_BSSMAP_ASSIGNMENT_FAILURE: /* The original bssmap message gets forwarded from RAN to CN by * bssmap_ran_handle_assignment_failure() already, so just * reset the FSM to idle here (clears the mgw endpoint). */ - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); break; case SUBSCR_CONN_FSM_EV_BSSMAP_CLEAR_COMMAND: /* Dialing an invalid number results in receiving a clear @@ -273,7 +284,7 @@ * The original message gets forwarded from CN to RAN by * bssmap_cn_handle_clear_cmd() already, so just reset the FSM * to idle here (clears the mgw endpoint). */ - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); break; default: OSMO_ASSERT(false); @@ -306,18 +317,16 @@ if (tx_ass_compl_to_cn(subscr_conn) < 0) { bssmap_tx_assignment_failure_cn(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); bssmap_tx_assignment_failure_ran(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); return; } - /* No timeout for ST_WAITING_FOR_CLEAR_COMMAND, as the FSM will - * stay in this state until the call is done. */ - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_WAITING_FOR_CLEAR_COMMAND, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_WAITING_FOR_CLEAR_COMMAND); break; case SUBSCR_CONN_FSM_EV_MGCP_EP_FAIL: LOGPFSML(fi, LOGL_ERROR, "MGCP failure, aborting assignment complete processing\n"); bssmap_tx_assignment_failure_cn(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); bssmap_tx_assignment_failure_ran(subscr_conn, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); break; default: OSMO_ASSERT(false); @@ -331,7 +340,7 @@ /* The original bssmap message gets forwarded from CN to RAN by * bssmap_cn_handle_clear_cmd() already, so just reset the FSM * to idle here (clears the mgw endpoint). */ - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); break; default: OSMO_ASSERT(false); @@ -341,7 +350,7 @@ int subscr_conn_fsm_timer_cb(struct osmo_fsm_inst *fi) { LOGPFSML(fi, LOGL_ERROR, "Timeout reached, reset FSM to idle\n"); - osmo_fsm_inst_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE, 0, 0); + subscr_conn_fsm_state_chg(fi, SUBSCR_CONN_FSM_ST_IDLE); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ib34e6ccc34901ebc37d2dbe347d9644cb70921ca Gerrit-Change-Number: 28249 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: logs: also record which BTS is signaling a SAPI REJECT

by iedemam

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28390 ) Change subject: logs: also record which BTS is signaling a SAPI REJECT ...................................................................... logs: also record which BTS is signaling a SAPI REJECT Change-Id: I4d25cc4cf55b03c7311ba58cf6feae06c3028a5d --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/28390/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 6d6f57c..225f457 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -71,12 +71,14 @@ { int rc; struct msgb *resp; + struct gsm_bts *bts; if (!msc_connected(conn)) return; - LOGP(DMSC, LOGL_NOTICE, "Tx MSC SAPI N REJECT (dlci=0x%02x, cause='%s')\n", - dlci, gsm0808_cause_name(cause)); + bts = conn_get_bts(conn); + LOGP(DMSC, LOGL_NOTICE, "(bts=%d) Tx MSC SAPI N REJECT (dlci=0x%02x, cause='%s')\n", + bts->nr, dlci, gsm0808_cause_name(cause)); resp = gsm0808_create_sapi_reject_cause(dlci, cause); rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_SAPI_N_REJECT)); rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4d25cc4cf55b03c7311ba58cf6feae06c3028a5d Gerrit-Change-Number: 28390 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022