laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36577?usp=email )
Change subject: xua_asp_fsm: Fix 'Event AS_ASSIGNED not permitted'
......................................................................
xua_asp_fsm: Fix 'Event AS_ASSIGNED not permitted'
The event case handling (ignore it) was added in a commit some time ago,
but it forgot to add it to the allstate_event_mask in the xua_fsm (it
was added only in the ipa_fsm, which is the one using it).
This bug should in theory be harmless since the only code dispatching
the signal is not checking the return code of osmo_fsm_inst_dispatch().
Related: SYS#5914
Fixes: 57444690212b1576eaf0a7156448ba2d27c59050
Change-Id: Iaead46bbc40b923763bc3dbe4d24d8952822de4a
---
M src/xua_asp_fsm.c
1 file changed, 20 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index fadcde9..97391bb 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -769,7 +769,8 @@
.allstate_event_mask = S(XUA_ASP_E_SCTP_COMM_DOWN_IND) |
S(XUA_ASP_E_SCTP_RESTART_IND) |
S(XUA_ASP_E_ASPSM_BEAT) |
- S(XUA_ASP_E_ASPSM_BEAT_ACK),
+ S(XUA_ASP_E_ASPSM_BEAT_ACK) |
+ S(XUA_ASP_E_AS_ASSIGNED),
.allstate_action = xua_asp_allstate,
.cleanup = xua_asp_fsm_cleanup,
};
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36577?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Iaead46bbc40b923763bc3dbe4d24d8952822de4a
Gerrit-Change-Number: 36577
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36578?usp=email )
Change subject: bsc: Early shutdown upon BSSMAP RESET-ACK timeout
......................................................................
bsc: Early shutdown upon BSSMAP RESET-ACK timeout
Change-Id: I75e098d387562267d5851bc753e27e40186827ed
---
M bsc/BSC_Tests.ttcn
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 1fc42ba..5e4ebbc 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -941,13 +941,15 @@
}
[] BSSAP.receive { repeat; }
[] T.timeout {
- log("BSSMAP: Timeout waiting for RESET-ACK after sending RESET");
/* If we received a RESET after ours was sent, it
may be a race condition where the other peer beacame
available after we sent it, but we are in a desired
state anyway, so go forward. */
if (not reset_received) {
- setverdict(fail);
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "BSSMAP: Timeout waiting for RESET-ACK after sending RESET");
+ } else {
+ log("BSSMAP: Timeout waiting for RESET-ACK after sending RESET");
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36578?usp=email
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: I75e098d387562267d5851bc753e27e40186827ed
Gerrit-Change-Number: 36578
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged