Change in osmo-bsc[master]: BSSMAP RESET: also accept conn cfm events during ST_DISC

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Thu Oct 15 05:53:05 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20629 )

Change subject: BSSMAP RESET: also accept conn cfm events during ST_DISC
......................................................................

BSSMAP RESET: also accept conn cfm events during ST_DISC

We don't really expect connection attempts during ST_DISC, but if the user
happens to dispatch those events for whatever obscure reasons, treat them
instead of erroring about an unallowed event.

Change-Id: Ic7c60a40ff25ae647ee659259dfea769bc4592e4
---
M src/osmo-bsc/bssmap_reset.c
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  neels: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c
index 9215e90..fcf2bab 100644
--- a/src/osmo-bsc/bssmap_reset.c
+++ b/src/osmo-bsc/bssmap_reset.c
@@ -118,6 +118,17 @@
 		bssmap_reset_fsm_state_chg(fi, BSSMAP_RESET_ST_CONN);
 		break;
 
+	case BSSMAP_RESET_EV_CONN_CFM_FAILURE:
+		/* ignore */
+		break;
+
+	case BSSMAP_RESET_EV_CONN_CFM_SUCCESS:
+		/* A connection succeeded before we managed to do a RESET handshake?
+		 * Then the calling code is not taking care to check bssmap_reset_is_conn_ready().
+		 */
+		LOGPFSML(fi, LOGL_ERROR, "Connection success confirmed, but we have not seen a RESET-ACK; bug?\n");
+		break;
+
 	default:
 		OSMO_ASSERT(false);
 	}
@@ -183,6 +194,8 @@
 		     .in_event_mask = 0
 			     | S(BSSMAP_RESET_EV_RX_RESET)
 			     | S(BSSMAP_RESET_EV_RX_RESET_ACK)
+			     | S(BSSMAP_RESET_EV_CONN_CFM_FAILURE)
+			     | S(BSSMAP_RESET_EV_CONN_CFM_SUCCESS)
 			     ,
 		     .out_state_mask = 0
 			     | S(BSSMAP_RESET_ST_DISC)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20629
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic7c60a40ff25ae647ee659259dfea769bc4592e4
Gerrit-Change-Number: 20629
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201015/d39b9f0e/attachment.htm>


More information about the gerrit-log mailing list