Attention is currently required from: lynxis lazus.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/29907
to look at the new patch set (#2).
Change subject: fsm: add ignore_invalid_event_mask bit-mask
......................................................................
fsm: add ignore_invalid_event_mask bit-mask
An invalid fsm event is an event which is not valid in the current fsm state.
Such invalid events will be logged and osmo_fsm_inst_dispatch() return != 0.
To prevent this log message which could be misleading for the user, the code needed
to add this event to the allstate_event_mask or add it independent to each state.
Or as alternative create a proxy function in front of osmo_fsm_inst_dispatch()
which checks the fsm state before dispatching the signal.
By using ignore_invalid_events the logline can be ignored for certain events
while for others the old behaviour is still preserved.
Related: SYS#6145
Change-Id: Id010ade76de83ccf428f2d18e9f85bcce1d1ea2c
---
M include/osmocom/core/fsm.h
M src/fsm.c
2 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/29907/2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29907
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Id010ade76de83ccf428f2d18e9f85bcce1d1ea2c
Gerrit-Change-Number: 29907
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: newpatchset
lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29907 )
Change subject: fsm: add ignore_invalid_events bit-mask
......................................................................
fsm: add ignore_invalid_events bit-mask
An invalid fsm event is an event which is not valid in the current fsm state.
Such invalid events will be logged and osmo_fsm_inst_dispatch() return != 0.
To prevent this log message which could be misleading for the user, the code needed
to add this event to the allstate_event_mask or add it independent to each state.
Or as alternative create a proxy function in front of osmo_fsm_inst_dispatch()
which checks the fsm state before dispatching the signal.
By using ignore_invalid_events the logline can be ignored for certain events
while for others the old behaviour is still preserved.
Related: SYS#6145
Change-Id: Id010ade76de83ccf428f2d18e9f85bcce1d1ea2c
---
M include/osmocom/core/fsm.h
M src/fsm.c
2 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/29907/1
diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h
index 5e5b091..36e4aa4 100644
--- a/include/osmocom/core/fsm.h
+++ b/include/osmocom/core/fsm.h
@@ -81,6 +81,16 @@
const struct value_string *event_names;
/*! graceful exit function, called at the beginning of termination */
void (*pre_term)(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause);
+ /*! bit-mask of events which will be ignored if they are not valid in the current fsm state.
+ *
+ * An invalid event is an event which is neither part of the allstat_event_mask nor state->in_event_mask.
+ * If an invalid event is dispatched to an fsm, the fsm core will log it (error) and
+ * osmo_fsm_inst_dispatch() will return != 0.
+ *
+ * To silence those log lines and change the return code of osmo_fsm_inst_dispatch, add the
+ * event to ignore_invalid_events.
+ */
+ uint32_t ignore_invalid_events;
};
/*! a single instanceof an osmocom finite state machine */
diff --git a/src/fsm.c b/src/fsm.c
index 9333cac..114b97c 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -865,6 +865,9 @@
}
if (!((1 << event) & fs->in_event_mask)) {
+ if ((1 << event) & fsm->ignore_invalid_events)
+ return 0;
+
LOGPFSMLSRC(fi, LOGL_ERROR, file, line,
"Event %s not permitted\n",
osmo_fsm_event_name(fsm, event));
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29907
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Id010ade76de83ccf428f2d18e9f85bcce1d1ea2c
Gerrit-Change-Number: 29907
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, pespin.
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29792 )
Change subject: linuxlist: add llist_entry_empty()
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> I agree with Harald. Not sure if adding this one will make us shoot on our own foot.
Ok. Any ideas how to improve?
I dislike initializing llist "entries" by pointing it to itself. This should be only done for llist "heads".
What is the correct value for an llist "entry" which isn't part of a queue?
Should it be NULL? Should it be POISON1/2? Should it be something else?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29792
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia4afe3e77f53728db1d139bded5925183dca011f
Gerrit-Change-Number: 29792
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 27 Oct 2022 20:35:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: arehbein.
Hello Jenkins Builder, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/29903
to look at the new patch set (#4).
Change subject: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote
......................................................................
gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote
Related: OS#5085
Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0
---
M src/gb/gprs_ns2_internal.h
M src/gb/gprs_ns2_vc_fsm.c
M src/gb/gprs_ns2_vty.c
M tests/gb/gprs_ns2_vty.vty
4 files changed, 27 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/29903/4
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0
Gerrit-Change-Number: 29903
Gerrit-PatchSet: 4
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin.
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28849 )
Change subject: libosmonetify SMPP
......................................................................
Patch Set 54:
(1 comment)
This change is ready for review.
File src/libsmpputil/smpp_vty.c:
https://gerrit.osmocom.org/c/osmo-msc/+/28849/comment/0c26441a_f6b9ed37
PS49, Line 190: vty_out(vty, " local-tcp-port %u%s", smsc->listen_port ? smsc->listen_port : SMPP_PORT, VTY_NEWLINE);
> not sure how that would break VTY tests. If user doesn't set it, then default port should be used.
Fine by me. Add me as reviewer if you decide to implement this.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28849
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Idc2e60af1010783e555e61b114ae61f55a89d890
Gerrit-Change-Number: 28849
Gerrit-PatchSet: 54
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 27 Oct 2022 16:07:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: comment
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/29905
to look at the new patch set (#2).
Change subject: Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1)
......................................................................
Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1)
In that state (ul_tbf=TBF_ST_FINISHED), we are unable to reach the MS to
assign a new DL TBF.
* MS Is not available in CCCH because it's attached the PDCH.
* MS won't be able to PKT_CTRL_ACK a PktDlAss on PACCH, because next
thing it will do is to PKT_CTRL_ACK the UL_ACK_NACK(FINACK=1) we
already polled it for, and immediatelly after that it will release the
UL TBF on its side and go back to packet idle mode.
Hence, we must wait for MS to send the PKT_CTRL_ACK to us in order to be
able to assign the DL TBF in PCH (CCCH).
Related: OS#5700
Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a
---
M src/gprs_ms.c
M src/gprs_ms.h
M src/pdch.cpp
M src/tbf.cpp
M src/tbf.h
M src/tbf_dl.cpp
M src/tbf_fsm.c
M tests/tbf/TbfTest.cpp
M tests/tbf/TbfTest.err
9 files changed, 230 insertions(+), 70 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/29905/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29905
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a
Gerrit-Change-Number: 29905
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
Attention is currently required from: arehbein.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29903 )
Change subject: gb/vty: Show if an NSVC is locally blocked or blocked by remote
......................................................................
Patch Set 3: Code-Review-1
(2 comments)
File include/osmocom/core/fsm.h:
https://gerrit.osmocom.org/c/libosmocore/+/29903/comment/f6898024_aedec9d7
PS3, Line 103: bool om_blocked;
From my understanding, this is an NSVC related variable. It should not be in the struct of the generic FSM implementaion. We use this FSM everywhere.
File src/gb/gprs_ns2_vc_fsm.c:
https://gerrit.osmocom.org/c/libosmocore/+/29903/comment/77bf8f08_12a117f1
PS3, Line 341:
ws
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0
Gerrit-Change-Number: 29903
Gerrit-PatchSet: 3
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 27 Oct 2022 15:22:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment