June 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-netif[master]: stream: Add IPA send function/IPA-mode read to cli
by arehbein 26 Jun '23

26 Jun '23

Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33204 to look at the new patch set (#3). Change subject: stream: Add IPA send function/IPA-mode read to cli ...................................................................... stream: Add IPA send function/IPA-mode read to cli - Also: Adapt ipa-stream-client example to work alongside new change Related: OS#5753 Change-Id: I042700af6614dd1879514dca0482e05b5ff22cb7 --- M examples/ipa-stream-client.c M include/osmocom/netif/stream.h M src/stream.c M tests/stream/stream_test.c M tests/stream/stream_test.ok 5 files changed, 75 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/04/33204/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I042700af6614dd1879514dca0482e05b5ff22cb7 Gerrit-Change-Number: 33204 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-netif[master]: stream: Add IPA send function/IPA-mode read to srv
by arehbein 26 Jun '23

26 Jun '23

Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 to look at the new patch set (#3). Change subject: stream: Add IPA send function/IPA-mode read to srv ...................................................................... stream: Add IPA send function/IPA-mode read to srv Also: Adapt the example to work with the new changes. Related OS#5753, OS#5751 Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 --- M examples/ipa-stream-server.c M include/osmocom/netif/stream.h M src/stream.c M tests/stream/stream_test.c M tests/stream/stream_test.ok 5 files changed, 138 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/01/33201/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-pcu[master]: Avoid re-assigning DL TBF over PACCH upon duplicate FinalACKs received
by pespin 26 Jun '23

26 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33454 ) Change subject: Avoid re-assigning DL TBF over PACCH upon duplicate FinalACKs received ...................................................................... Avoid re-assigning DL TBF over PACCH upon duplicate FinalACKs received Due to the fn-advance feature, we schedule DL blocks in advance, which may make several retransmitted DL ACK/NACK [RRBP] be in flight, and hence several of them may be answered by the MS. When the first one is received, we attempt to initiate a PktDlAss over PACCH if new DL data was received meanwhile from SGSN. However, if we receive duplicates of that final PKT CTRL ACK, we don't want to re-initiate it again, since it is already ongoing. Related: OS#5471 Change-Id: Idc204aba61ad98f75853dcd46200f5dcc4139203 --- M src/tbf_dl.cpp M src/tbf_dl_fsm.c 2 files changed, 29 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/54/33454/1 diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 40442c3..f4439d3 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -1053,9 +1053,7 @@ int gprs_rlcmac_dl_tbf::rcvd_dl_final_ack() { uint16_t received; - int rc = 0; - - osmo_fsm_inst_dispatch(this->state_fi, TBF_EV_FINAL_ACK_RECVD, NULL); + int rc; /* range V(A)..V(S)-1 */ received = m_window.count_unacked(); @@ -1064,10 +1062,7 @@ m_tx_counter = 0; m_window.reset(); - /* check for LLC PDU in the LLC Queue */ - if (llc_queue_size(llc_queue()) > 0) - /* we have more data so we will re-use this tbf */ - rc = ms_new_dl_tbf_assigned_on_pacch(ms(), dl_tbf_as_tbf(this)); + rc = osmo_fsm_inst_dispatch(this->state_fi, TBF_EV_FINAL_ACK_RECVD, NULL); return rc; } diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c index ba7fc5a..557fb7a 100644 --- a/src/tbf_dl_fsm.c +++ b/src/tbf_dl_fsm.c @@ -260,8 +260,10 @@ static void st_wait_release_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv; + struct GprsMs *ms = tbf_ms(ctx->tbf); - /* T3192 is running on the MS and has also been armed by this FSM now. + /* This state was entered because FinalACK was received; now T3192 is + * running on the MS and has also been armed by this FSM. * During that time, it is possible to reach the MS over PACCH to assign * new DL TBF. * Upon T3192 expiration, FSM will transition to TBF_ST_WAIT_REUSE_TFI @@ -270,6 +272,12 @@ */ mod_ass_type(ctx, GPRS_RLCMAC_FLAG_CCCH, false); + + /* check for LLC PDU in the LLC Queue */ + if (llc_queue_size(ms_llc_queue(ms)) > 0) { + /* we have more data so we will re-use this tbf */ + ms_new_dl_tbf_assigned_on_pacch(ms, ctx->tbf); + } } static void st_wait_release(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idc204aba61ad98f75853dcd46200f5dcc4139203 Gerrit-Change-Number: 33454 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: Avoid using UL TBF in RELEASE state to assign DL TBF over PACCH
by pespin 26 Jun '23

26 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33453 ) Change subject: Avoid using UL TBF in RELEASE state to assign DL TBF over PACCH ...................................................................... Avoid using UL TBF in RELEASE state to assign DL TBF over PACCH In RELEASE state, the UL TBF is considered not available anymore, and we are simply waiting in order to be able to reuse the allocated resources (just in case it was still around). Hence, a UL TBF in that state should not be selectable to initiate a DL TBF assignment over PACCH. Related: OS#5472 Change-Id: Ia11f7802779cfeea15a71bddad9f7e0c6c1afb11 --- M src/gprs_ms.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/53/33453/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index dda2f29..06d012c 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -1106,7 +1106,8 @@ if (!ul_tbf) return true; if (ul_tbf_contention_resolution_done(ul_tbf) && - !tbf_ul_ack_waiting_cnf_final_ack(ul_tbf)) + !tbf_ul_ack_waiting_cnf_final_ack(ul_tbf) && + tbf_state(ul_tbf_as_tbf(ul_tbf)) != TBF_ST_RELEASING) return true; return false; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia11f7802779cfeea15a71bddad9f7e0c6c1afb11 Gerrit-Change-Number: 33453 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: ASCI: Add decoding of mobile identity in TALKER INDICATION
by pespin 26 Jun '23

26 Jun '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33446 ) Change subject: ASCI: Add decoding of mobile identity in TALKER INDICATION ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I331fac82e3c15abb01f554b2e70576100f2eea2d Gerrit-Change-Number: 33446 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 26 Jun 2023 10:25:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: ASCI: Add decoding of mobile identity in TALKER INDICATION
by jolly 26 Jun '23

26 Jun '23

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33446 ) Change subject: ASCI: Add decoding of mobile identity in TALKER INDICATION ...................................................................... Patch Set 2: (2 comments) File src/gsm/gsm48.c: https://gerrit.osmocom.org/c/libosmocore/+/33446/comment/8d5a4ea3_a9509c38 PS1, Line 959: if (l3_len < sizeof(*gh) + 4 + 2) > This is the minimum message size according to TS 44.018 9.1.44. Done https://gerrit.osmocom.org/c/libosmocore/+/33446/comment/bc56ff66_6d9f1000 PS1, Line 961: if (gh->data[0] != 3) > This is the fixed length of the first IE. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I331fac82e3c15abb01f554b2e70576100f2eea2d Gerrit-Change-Number: 33446 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jun 2023 10:25:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: ASCI: Add decoding of mobile identity in TALKER INDICATION
by jolly 26 Jun '23

26 Jun '23

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/33446 to look at the new patch set (#2). Change subject: ASCI: Add decoding of mobile identity in TALKER INDICATION ...................................................................... ASCI: Add decoding of mobile identity in TALKER INDICATION gsm48.c provides a function to decode mobile identity from various messages. TALKER INDICATION is sent by the talking subscriber of a voice group call to idenitfy the current talker. The mobile identity is required to distinguish between calling subscriber and other subscribers. Related: OS#4854 Change-Id: I331fac82e3c15abb01f554b2e70576100f2eea2d --- M src/gsm/gsm48.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/33446/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I331fac82e3c15abb01f554b2e70576100f2eea2d Gerrit-Change-Number: 33446 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-pcu[master]: tbf_ul: Avoid processing rx UL bocks for UL TBFs in RELEASING state
by pespin 26 Jun '23

26 Jun '23

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33415 to look at the new patch set (#2). Change subject: tbf_ul: Avoid processing rx UL bocks for UL TBFs in RELEASING state ...................................................................... tbf_ul: Avoid processing rx UL bocks for UL TBFs in RELEASING state Change-Id: I1da9b665b9ed83a644ea798008d456d6298b7460 --- M src/tbf_ul.cpp 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/15/33415/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1da9b665b9ed83a644ea798008d456d6298b7460 Gerrit-Change-Number: 33415 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmocore[master]: ASCI: Add decoding of mobile identity in TALKER INDICATION
by jolly 26 Jun '23

26 Jun '23

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33446 ) Change subject: ASCI: Add decoding of mobile identity in TALKER INDICATION ...................................................................... Patch Set 1: (2 comments) File src/gsm/gsm48.c: https://gerrit.osmocom.org/c/libosmocore/+/33446/comment/982a0fe4_d6a5e1e0 PS1, Line 959: if (l3_len < sizeof(*gh) + 4 + 2) > what are this offsets? This is the minimum message size according to TS 44.018 9.1.44. https://gerrit.osmocom.org/c/libosmocore/+/33446/comment/a7f59606_fc57b1ca PS1, Line 961: if (gh->data[0] != 3) > what's this value about? This is the fixed length of the first IE. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I331fac82e3c15abb01f554b2e70576100f2eea2d Gerrit-Change-Number: 33446 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jun 2023 09:07:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: tlv: Fix IE.from_dict() method
by laforge 26 Jun '23

26 Jun '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33451 ) Change subject: tlv: Fix IE.from_dict() method ...................................................................... tlv: Fix IE.from_dict() method The existing IE.from_dict() method *supposedly* accepts a dict as input value, but it actually expects the raw decoded value, unless it is a nested IE. This is inconsistent in various ways, and results in a bug visible at a higher layer, such as files like EF.{DOMAIN,IMPI,IMPU}, which are transparent files containing a single BER-TLV IE. Decoding such files worked, but re-encoding them did not, due to the fact that we'd pass a dict to the from_dict method, which then gets assigned to self.decoded and further passed along to any later actual encoder function like to_bytes or to_tlv. In that instance, the dict might be handed to a self._construct which has no idea how to process the dict, as it expects the raw decoded value. Change-Id: I3dd5204510e5c32ef1c4a999258d87cb3f1df8c8 Closes: OS#6073 Related: OS#6072 --- M pySim/tlv.py 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/33451/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index a5baa23..bd95505 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -161,7 +161,10 @@ self.children = self.nested_collection.from_dict(decoded) else: self.children = [] - self.decoded = decoded + expected_key_name = camel_to_snake(type(self).__name__) + if not expected_key_name in decoded: + raise ValueError("Dict %s doesn't contain expected key %s" % (decoded, expected_key_name)) + self.decoded = decoded[expected_key_name] def is_constructed(self): """Is this IE constructed by further nested IEs?""" @@ -388,7 +391,7 @@ if k in self.members_by_name: cls = self.members_by_name[k] inst = cls() - inst.from_dict(i[k]) + inst.from_dict({k: i[k]}) res.append(inst) else: raise ValueError('%s: Unknown TLV Class %s in %s; expected %s' % -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3dd5204510e5c32ef1c4a999258d87cb3f1df8c8 Gerrit-Change-Number: 33451 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0