Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28046 )
Change subject: Introduce new signal S_NM_RUNNING_CHG and implement it for rcarrier,bbtransc
......................................................................
Patch Set 5:
(2 comments)
File src/osmo-bsc/nm_bb_transc_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28046/comment/9f5a3181_ec64f309
PS2, Line 56: }
> the point is if teh function is prefixed nm_obj_* and you don't want to change the function name, th […]
nm_obj here is used in the sense of "The NM Object this FSM is handling", which is a bb_transc in this case. So it's based on the context of the current FSM, the function is static/internal/private after all. There's no such "struct nm_obj" at all.
This way when these functions are used in each FSM state function, they look a lot similar, so it's easy to follow the FSM logic more easily, and see that all basically do the same, each on the NM object they are managing.
But if this really causes trouble to you I'll change the name and be done with it, though I really prefer it the way it is now.
File src/osmo-bsc/nm_rcarrier_fsm.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28046/comment/823c57a8_232e1431
PS2, Line 43: static void nm_obj_becomes_enabled_disabled(struct gsm_bts_trx *trx, bool running)
> then pass some generic object and have the called function use gsm_objclass2obj() to de-reference th […]
ACK I'll change the function name.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28046
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I206d4c7863a77fbab6a600126742a6a6b8fc3614
Gerrit-Change-Number: 28046
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 13 May 2022 10:06:41 +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: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28094 )
Change subject: smscb: "Warning Security Information is always present in ETWS
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28094
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib1b8e4af37b1f9f9398b81dad29942e82218c70b
Gerrit-Change-Number: 28094
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 13 May 2022 10:04:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28039 )
Change subject: Update current NM object state before signalling S_NM_STATECHG
......................................................................
Update current NM object state before signalling S_NM_STATECHG
This way code triggered through signal has an updated view of the object
tree when running generic code which queries the current state of
objects.
This way for instance one can use APIs like trx_is_usable() or alike.
Change-Id: Ib46234e3f3e446e866d27b0dfee65edf4af4d2ba
---
M src/osmo-bsc/abis_nm.c
M src/osmo-bsc/abis_om2000.c
2 files changed, 8 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index a460f3e..8eeba89 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -230,8 +230,10 @@
nsd.new_state.administrative = adm_state;
- osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);
+ /* Update current state before emitting signal: */
nm_state->administrative = adm_state;
+
+ osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);
return 0;
}
@@ -296,10 +298,10 @@
nsd.new_state.operational != nsd.old_state.operational ||
nsd.new_state.availability != nsd.old_state.availability) {
DEBUGPC(DNM, "\n");
- /* Update the operational state of a given object in our in-memory data
+ /* Update the state of a given object in our in-memory data
* structures and send an event to the higher layer */
- osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);
*nm_state = nsd.new_state;
+ osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);
} else {
DEBUGPC(DNM, "(No State change detected)\n");
}
diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c
index 04c783b..1deab13 100644
--- a/src/osmo-bsc/abis_om2000.c
+++ b/src/osmo-bsc/abis_om2000.c
@@ -992,9 +992,10 @@
break;
}
- osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);
-
+ /* Update current state before emitting signal: */
nm_state->availability = nsd.new_state.availability;
+
+ osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);
}
static void update_op_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo, uint8_t op_state)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28039
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib46234e3f3e446e866d27b0dfee65edf4af4d2ba
Gerrit-Change-Number: 28039
Gerrit-PatchSet: 6
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 )
Change subject: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq
......................................................................
Patch Set 1:
(1 comment)
File library/GTP_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091/comment/e2ea7313_7090…
PS1, Line 399: ts_ChargingCharacteristics
> You cannot pass 'omit' (as default value) to this template. […]
Indeed, sorry I started passing the whole ChargingCharacteristics_GTPC and later found it made more sense to only pass the OCT2 through the other templates. I'll add the wrapper function.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091
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: Ia0f74041d2107afeaa36b94e33474370b7b07c0e
Gerrit-Change-Number: 28091
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 13 May 2022 09:47:40 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28099 )
Change subject: Add new Manuall "OsmoBSC CBSP Protocol Specification"
......................................................................
Patch Set 1:
(5 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc/+/28099/comment/3e33668e_c5a89657
PS1, Line 7: Add new Manuall "OsmoBSC CBSP Protocol Specification"
Manual
File doc/manuals/cbsp/messages.adoc:
https://gerrit.osmocom.org/c/osmo-bsc/+/28099/comment/c1323f8c_289cad5d
PS1, Line 15: | TS 48.049 § | This document § | Message | <-/-> | Received/Sent by OsmoBSC
what is the "<-/->" column indicating? it's not clear to me.
https://gerrit.osmocom.org/c/osmo-bsc/+/28099/comment/d7ef04b1_887eea96
PS1, Line 59: The RESET FAILURE message hence only occurs if the CBC were to identify
So you mean here osmo-bsc never sends RESET FAILURE, but that a CBC implementation connected the other side could send one? It's a bit confusing, because in the previous paragraph you say there's no condition where it could happen.
File doc/manuals/cbsp/procedures.adoc:
https://gerrit.osmocom.org/c/osmo-bsc/+/28099/comment/2278f9fc_56603917
PS1, Line 34: of OsmoBTS and OsmoPCU):
maybe describe which versions, as in > 1.7.0 or whatever.
https://gerrit.osmocom.org/c/osmo-bsc/+/28099/comment/f18dd689_273849e9
PS1, Line 69: persistent in the BSC and if Cells reboot / restart during the duration
cellswithout caps?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28099
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2e18e167281fac3abaf380089ff883738ebaa0a0
Gerrit-Change-Number: 28099
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 13 May 2022 09:44:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28071 )
Change subject: input/ipaccess: Avoid extra poll() call when e1i_ts tx queue becomes empty
......................................................................
input/ipaccess: Avoid extra poll() call when e1i_ts tx queue becomes empty
Before this patch, the logic (both for delayed tx and immediate tx)
always left the WRITE flag set, and relied on an extra call back from
the main loop (poll()) to disable the flag until it found out there was
nothing else to send.
Instead, let's disable it immediatelly at the time we submit the last
message in the queue.
Change-Id: I0e5da5d1342f352d0e2bca9ee39c768bccb2c8d5
---
M src/input/ipaccess.c
1 file changed, 17 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index ca48d21..07fd814 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -477,12 +477,24 @@
}
}
+static bool e1i_ts_has_pending_tx_msgs(struct e1inp_ts *e1i_ts)
+{
+ struct e1inp_sign_link *link;
+ llist_for_each_entry(link, &e1i_ts->sign.sign_links, list) {
+ if (!llist_empty(&link->tx_list)) {
+ return true;
+ }
+ }
+ return false;
+}
+
static void timeout_ts1_write(void *data)
{
struct e1inp_ts *e1i_ts = (struct e1inp_ts *)data;
/* trigger write of ts1, due to tx delay timer */
- ts_want_write(e1i_ts);
+ if (e1i_ts_has_pending_tx_msgs(e1i_ts))
+ ts_want_write(e1i_ts);
}
static int __handle_ts1_write(struct osmo_fd *bfd, struct e1inp_line *line)
@@ -535,9 +547,11 @@
/* set tx delay timer for next event */
osmo_timer_setup(&e1i_ts->sign.tx_timer, timeout_ts1_write, e1i_ts);
osmo_timer_schedule(&e1i_ts->sign.tx_timer, 0, e1i_ts->sign.delay);
- }
-
+ } else {
out:
+ if (!e1i_ts_has_pending_tx_msgs(e1i_ts))
+ osmo_fd_write_disable(bfd);
+ }
msgb_free(msg);
return ret;
err:
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28071
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I0e5da5d1342f352d0e2bca9ee39c768bccb2c8d5
Gerrit-Change-Number: 28071
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-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged