pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32603 )
Change subject: bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART
......................................................................
bbtransc/rcarrier: Fix statechg done twice upon NM_EV_RX_OPSTART
When the NM_EV_RX_OPSTART event is received, it will call bts model
specific function bts_model_opstart(), which is responisble for
answering back with NM_EV_OPSTART_ACK or NM_EV_OPSTART_NACK.
Since that answer could be done sequentially in same callback code path,
we could end up twice at the end of the st_op_disabled_offline()
function checking for statechg (due to reentring that function).
As a result, one can see the following message appear during OML
bring up:
nm_bb_transc_fsm.c:185 NM_BBTRANSC_OP(bts0-trx0){ENABLED}: transition to state ENABLED not permitted!
Fix the issue by avoiding ending up at the end of the function in code
paths which should not be triggering any change.
The case of bbtransc is a bit different than that of rcarrier for
NM_EV_RX_SETATTR, since the former really doesn't receive any such
message from the BSC yet, so if we checked for that one before
continuing, it would never go on.
Change-Id: I5184a33dd8da9244e8aacf3ab8bb8930f732a136
---
M src/common/nm_bb_transc_fsm.c
M src/common/nm_radio_carrier_fsm.c
2 files changed, 30 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/32603/1
diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c
index d42130a..57ccdfa 100644
--- a/src/common/nm_bb_transc_fsm.c
+++ b/src/common/nm_bb_transc_fsm.c
@@ -136,7 +136,7 @@
&bb_transc->mo, bb_transc);
bb_transc->mo.setattr_success = rc == 0;
oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
- break;
+ return;
case NM_EV_RX_OPSTART:
#if 0
/* Disabled because osmo-bsc doesn't send SetAttr on BB_TRANSC object */
@@ -146,7 +146,7 @@
}
#endif
bts_model_opstart(trx->bts, &bb_transc->mo, bb_transc);
- break;
+ return;
case NM_EV_OPSTART_ACK:
bb_transc->mo.opstart_success = true;
oml_mo_opstart_ack(&bb_transc->mo);
diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c
index d7590bc..851f71c 100644
--- a/src/common/nm_radio_carrier_fsm.c
+++ b/src/common/nm_radio_carrier_fsm.c
@@ -120,14 +120,14 @@
&trx->mo, trx);
trx->mo.setattr_success = rc == 0;
oml_fom_ack_nack_copy_msg(setattr_data->msg, rc);
- break;
+ break; /* check statechg below */
case NM_EV_RX_OPSTART:
if (!trx->mo.setattr_success) {
oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM);
return;
}
bts_model_opstart(trx->bts, &trx->mo, trx);
- break;
+ return;
case NM_EV_OPSTART_ACK:
trx->mo.opstart_success = true;
oml_mo_opstart_ack(&trx->mo);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32603
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I5184a33dd8da9244e8aacf3ab8bb8930f732a136
Gerrit-Change-Number: 32603
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32601 )
Change subject: deps/Makefile: Change remote gerrit->gitea for titan.ProtocolModules.BSSMAP
......................................................................
deps/Makefile: Change remote gerrit->gitea for titan.ProtocolModules.BSSMAP
It was decided that the preferred way to maintain our eclipse titan
forked repos is through gitea, not through gerrit. Hence, update the
remote to point to the gitea repo. The gerrit one will probably be
removed at some point.
Related: OS#6011
Change-Id: I69f8e207a28b8ea424d8fa4f23bdcaa3ba2e1345
---
M deps/Makefile
1 file changed, 18 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/32601/1
diff --git a/deps/Makefile b/deps/Makefile
index b8b072e..d4f209a 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -67,10 +67,10 @@
titan.ProtocolEmulations.SCCP \
titan.ProtocolModules.BSSGP_v13.0.0
-OSMOGERRIT_REPOS= titan.ProtocolModules.BSSMAP \
- osmo-uecups
+OSMOGERRIT_REPOS= osmo-uecups
-OSMOGITEA_REPOS= titan.ProtocolModules.MAP \
+OSMOGITEA_REPOS= titan.ProtocolModules.BSSMAP \
+ titan.ProtocolModules.MAP \
titan.TestPorts.USB \
titan.TestPorts.AF_PACKET
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32601
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: I69f8e207a28b8ea424d8fa4f23bdcaa3ba2e1345
Gerrit-Change-Number: 32601
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32600 )
Change subject: Makefile: workaround Eclipse Gitlab rate limiting
......................................................................
Makefile: workaround Eclipse Gitlab rate limiting
Got this while pulling in the entire set of deps:
"""
remote: You have reached the limit of requests you can make to Eclipse GitLab.
This could be caused by too many open tabs, which query the GitLab server in
the background. Please close unused tabs, or put them to sleep so they don't
issue requests needlessly.
"""
Change-Id: I5866154a6af88875a446e092f0926cdc4a1a9fc4
---
M Makefile
1 file changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/32600/1
diff --git a/Makefile b/Makefile
index 4b6a5e2..c399714 100644
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,11 @@
default: deps all
+# Eclipse GitLab has rate limiting and sometimes to many concurrent conns fail.
+# If -jN fails, retry with -j1.
.PHONY: deps
deps:
- $(MAKE) $(PARALLEL_MAKE) -C deps
+ ($(MAKE) $(PARALLEL_MAKE) -C deps || $(MAKE) -j1 -C deps)
# deps-update target for backwards compat; now does the same as 'make deps'
.PHONY: deps-update
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32600
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: I5866154a6af88875a446e092f0926cdc4a1a9fc4
Gerrit-Change-Number: 32600
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32596 )
Change subject: layer23: Introduce apn_fsm
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
File src/host/layer23/src/common/apn_fsm.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/32596/comment/56a36e9c_2f81617a
PS2, Line 139: apn_fsm_state_chg(fi, APN_ST_INACTIVE);
> The problem is that I can't simply implement everything at the same time in one commit, that would be impossible to review. Pushing this in small bits allows other people already testing and contributing too.
Sure, just asking questions to understand the patches better, and to make sure some things are intentional where it's not obvious to me. Thanks for the explanation!
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32596
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I2cc732dfb020d31ab89025e7e22276b819dcb24a
Gerrit-Change-Number: 32596
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 04 May 2023 10:57:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32596 )
Change subject: layer23: Introduce apn_fsm
......................................................................
Patch Set 2:
(2 comments)
File src/host/layer23/src/common/apn_fsm.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/32596/comment/eca4f8ba_9327ce0b
PS2, Line 103: apn_fsm_state_chg(fi, APN_ST_DISABLED);
> Don't we need to check *((bool *)data)? I guess the assumption is that it is false here, as I unders […]
In theory it's not really needed, since in this state we know for sure the current state is to have GPRS enabled, so I'd expect the event to be "disable" here, but yeah, let's test it to make sure.
https://gerrit.osmocom.org/c/osmocom-bb/+/32596/comment/5ec1a663_fa8a80e9
PS2, Line 139: apn_fsm_state_chg(fi, APN_ST_INACTIVE);
> * is this correct, receiving CTX_ACC and then going to inactive here? […]
Yes, because it's "DEACT".
I left out REJ for now, we are not even implementing most of deactivation anyway so far, and I need to figure out how to trigger app-specific code to instruct GMM/SM layers to do stuff from the common/ code.
So yes, this FSM will probably be extended in the future. The problem is that I can't simply implement everything at the same time in one commit, that would be impossible to review. Pushing this in small bits allows other people already testing and contributing too.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32596
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I2cc732dfb020d31ab89025e7e22276b819dcb24a
Gerrit-Change-Number: 32596
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 04 May 2023 10:47:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment