Attention is currently required from: pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-gprs/+/31949
to look at the new patch set (#2).
Change subject: rlcmac: fix handling of TIMESLOT_ALLOCATION in handle_pkt_dl_ass()
......................................................................
rlcmac: fix handling of TIMESLOT_ALLOCATION in handle_pkt_dl_ass()
The TIMESLOT_ALLOCATION is a timeslot mask with MSB=TS0 and LSB=TS7:
0 1 2 3 4 5 6 7 TS# in TIMESLOT_ALLOCATION
0 1 2 3 4 5 6 7 'i' value in the loop, current rshift
7 6 5 4 3 2 1 0 correct rshift in the loop (this patch)
The current logic checking state of each timeslot is wrong, we
actually need to shift by (7 - N) to check state of timeslot N.
Change-Id: I36c52e282ee02c5136a645eb73a9631b95355c34
Related: OS#5500
---
M src/rlcmac/tbf_dl_ass_fsm.c
1 file changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/49/31949/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31949
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I36c52e282ee02c5136a645eb73a9631b95355c34
Gerrit-Change-Number: 31949
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31949 )
Change subject: rlcmac: fix handling of TIMESLOT_ALLOCATION in handle_pkt_dl_ass()
......................................................................
rlcmac: fix handling of TIMESLOT_ALLOCATION in handle_pkt_dl_ass()
The TIMESLOT_ALLOCATION is a timeslot mask with MSB=TS0 and LSB=TS7:
7 6 5 4 3 2 1 0 TS# in TIMESLOT_ALLOCATION
0 1 2 3 4 5 6 7 'i' value in the loop
The current logic checking state of each timeslot is wrong, we
actually need to shift by (7 - N) to check state of timeslot N.
Change-Id: I36c52e282ee02c5136a645eb73a9631b95355c34
Related: OS#5500
---
M src/rlcmac/tbf_dl_ass_fsm.c
1 file changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/49/31949/1
diff --git a/src/rlcmac/tbf_dl_ass_fsm.c b/src/rlcmac/tbf_dl_ass_fsm.c
index 74e1853..365772a 100644
--- a/src/rlcmac/tbf_dl_ass_fsm.c
+++ b/src/rlcmac/tbf_dl_ass_fsm.c
@@ -110,7 +110,7 @@
ctx->alloc.num_ts = 0;
for (unsigned int i = 0; i < ARRAY_SIZE(ctx->alloc.ts); i++) {
- ctx->alloc.ts[i].allocated = (dlass->TIMESLOT_ALLOCATION >> i) & 0x01;
+ ctx->alloc.ts[i].allocated = (dlass->TIMESLOT_ALLOCATION >> (7 - i)) & 0x01;
if (ctx->alloc.ts[i].allocated)
ctx->alloc.num_ts++;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31949
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I36c52e282ee02c5136a645eb73a9631b95355c34
Gerrit-Change-Number: 31949
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels, pespin, daniel.
Hello osmith, Jenkins Builder, neels, laforge, daniel,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/31940
to look at the new patch set (#2).
Change subject: Fix Lb/A SCCP conn lookup after recent regression in optimization patch
......................................................................
Fix Lb/A SCCP conn lookup after recent regression in optimization patch
In osmo-bsc, there's currently 0..1 Lb links and 0..N A links, where N
is the number of MSC, but links can be shared in the underlaying stack
(struct osmo_sccp_instance), hence range 0..N of different
osmo_sccp_instance (identified by PC).
Even more, the Lb and A link can share the same underlaying stack, so
osmo-bsc can end up with only 1 struct osmo_sccp_instance shared by all
the above mentioned links in case all are configured under the same PC.
Total range A+Lb is 0..(1+N).
A struct gsm_subscriber_conn stores 2 struct sccp_instance*, one for
Lb (conn->lcs.lb.*)and one for A (conn->sccp.*).
They can actually point to the same sccp_instance or to different ones,
as explained above, depending on the configured setup. In any case, a
gsm_subscriber_conn needs 2 rb_nodes since it can hold
any of the 2 conn_ids independently (A or Lb).
The previous patch forgot to add that 2nd rb_node as well as some
initialization and release code for the Lb conn. This patch addresses
that.
When the 2nd rb_node, a problem when iterating the rbtree appears: how to
find out the "conn" pointer from the rb_node pointer, since the rb_node pointer
can be any of the 2 rb_nodes inside the struct at a different offsets.
In order to solve that problem, a new struct bscp_sccp_conn_node is
added, which holds all the relevant information used by the rbtree lookup code
in a generic way (rb_node and conn_id), plus a backpointer to the struct
bsc_gsm_subcriber it relates too.
Fixes: 85062ccad31e9fb73e0256a5ee556c6ae0a16449
Change-Id: If42d93adee71d646766929a09bc01ae92b734ef3
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_sccp.c
M src/osmo-bsc/bsc_subscr_conn_fsm.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/handover_fsm.c
M src/osmo-bsc/lb.c
M src/osmo-bsc/lchan_rtp_fsm.c
M src/osmo-bsc/osmo_bsc_sigtran.c
M tests/bsc/bsc_test.c
9 files changed, 111 insertions(+), 54 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/31940/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31940
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If42d93adee71d646766929a09bc01ae92b734ef3
Gerrit-Change-Number: 31940
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels, pespin, daniel.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31940 )
Change subject: Fix Lb SCCP conn lookup after recent regression in optimization patch
......................................................................
Patch Set 1: Code-Review-1
(1 comment)
Patchset:
PS1:
I think this needs further study in terms of the SCCP/sigtran rlated data structures.
MTP/M3UA route on point codes. So one Instance of SCCP receives all SCCP messages for that given PC. Within that PC they must uniquely identify the connection purely by the local reference. So the point codes are per "SCCP instance" and not per application/user (Lb, A).
If you encapsulate an osmo_sccp_instance into bsc_sccp_inst, and assume there are separate SCCP instances for a And Lb, then you would also have two of those bsc_sccp_inst use the same functions on each of those, not needing functions replicated with user-specific suffixes like next_conn_id_{a,lb}()
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31940
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If42d93adee71d646766929a09bc01ae92b734ef3
Gerrit-Change-Number: 31940
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 16 Mar 2023 15:14:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment