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

[M] Change in libosmo-netif[master]: ipa: Add segmentation callback
by arehbein 10 Jul '23

10 Jul '23

Attention is currently required from: laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33652 ) Change subject: ipa: Add segmentation callback ...................................................................... Patch Set 3: (1 comment) File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/comment/fce00bd6_801c1ae5 PS2, Line 378: MSG_CB_IPA_PROTO_EXT_IS_SET_OFFSET > can you explain those variables more? "MSGB_CB_IPA_PROTO_EXT is clear but what is "IS_SET_OFFSET"? […] It's the offset for the variable that tells us if the extended IPA protocol information is set in the cb array. I have added a comment -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 Gerrit-Change-Number: 33652 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 09 Jul 2023 21:25:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
by arehbein 10 Jul '23

10 Jul '23

Attention is currently required from: arehbein. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 to look at the new patch set (#13). Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... stream: Add client-side (segmentation) support for IPA With this commit, IPA segmentation is taken care of by setting the segmentation callback provided by libosmo-netif. Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Depends: libosmocore.git I5ff2f1416f294ac84b4240fd96da4aa3255fb27b Related: OS#5753, OS#5751 Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 --- M include/osmocom/netif/stream.h M src/stream.c M tests/stream/stream_test.c M tests/stream/stream_test.ok 4 files changed, 330 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/98/33198/13 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-netif[master]: ipa: Add segmentation callback
by arehbein 10 Jul '23

10 Jul '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/+/33652 to look at the new patch set (#3). Change subject: ipa: Add segmentation callback ...................................................................... ipa: Add segmentation callback Also: Add helper functions used in later commits Related: OS#5753 Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 --- M include/osmocom/netif/ipa.h M src/ipa.c 2 files changed, 103 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/52/33652/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 Gerrit-Change-Number: 33652 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

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA
by arehbein 10 Jul '23

10 Jul '23

Attention is currently required from: arehbein, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 to look at the new patch set (#10). Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... stream: Add server-side (segmentation) support for IPA With this commit, IPA segmentation can be taken care of by setting the segmentation callback osmo_ipa_segmentation_cb(). Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Related: OS#5753, OS#5751 Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c --- M include/osmocom/netif/ipa.h 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, 388 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/97/33197/10 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 10 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-netif[master]: example: Remove calls to osmo_ipa_process_msg()
by arehbein 10 Jul '23

10 Jul '23

Attention is currently required from: arehbein, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33205 to look at the new patch set (#11). Change subject: example: Remove calls to osmo_ipa_process_msg() ...................................................................... example: Remove calls to osmo_ipa_process_msg() That call now happens up the call stack in IPA mode Related: OS#5753 Change-Id: I53283ec7bd7f07dfa612681ae84af93d5cd098b9 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c 2 files changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/05/33205/11 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53283ec7bd7f07dfa612681ae84af93d5cd098b9 Gerrit-Change-Number: 33205 Gerrit-PatchSet: 11 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-netif[master]: stream: Add IPA send function, pull IPA headers in segm. cb
by arehbein 10 Jul '23

10 Jul '23

Attention is currently required from: arehbein. Hello Jenkins Builder, pespin, 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 (#11). Change subject: stream: Add IPA send function, pull IPA headers in segm. cb ...................................................................... stream: Add IPA send function, pull IPA headers in segm. cb Also: Adapt the example to work with the new changes. Related OS#5753, OS#5751 Depends: libosmocore.git Ifc7cf0629e93864bfb3e36c64143d4ccc777e4b6 Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/ipa.h M include/osmocom/netif/stream.h M src/ipa.c M src/stream.c M tests/stream/stream_test.c M tests/stream/stream_test.ok 8 files changed, 154 insertions(+), 80 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/01/33201/11 -- 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: 11 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: ts_102_222: Remove unneeded imports
by laforge 09 Jul '23

09 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33663 ) Change subject: ts_102_222: Remove unneeded imports ...................................................................... ts_102_222: Remove unneeded imports Change-Id: I0fc54a042f03ecf707fde81a859c7dd65a7009cc --- M pySim/ts_102_222.py 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/33663/1 diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py index f8fdddb..a4ea453 100644 --- a/pySim/ts_102_222.py +++ b/pySim/ts_102_222.py @@ -23,9 +23,6 @@ from cmd2 import CommandSet, with_default_category, with_argparser import argparse -from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map -from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map - from pySim.exceptions import * from pySim.utils import h2b, swap_nibbles, b2h, JsonEncoder -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0fc54a042f03ecf707fde81a859c7dd65a7009cc Gerrit-Change-Number: 33663 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: pySim/commands.py: Better type annotations
by laforge 09 Jul '23

09 Jul '23

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33658 to look at the new patch set (#3). Change subject: pySim/commands.py: Better type annotations ...................................................................... pySim/commands.py: Better type annotations Change-Id: I68081b5472188f80a964ca48d5ec1f03adc70c4a --- M pySim/commands.py M pySim/utils.py 2 files changed, 64 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/58/33658/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I68081b5472188f80a964ca48d5ec1f03adc70c4a Gerrit-Change-Number: 33658 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: pySim/tlv.py: Fix TLV_IE_Collection from_dict with nested collections
by laforge 09 Jul '23

09 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33662 ) Change subject: pySim/tlv.py: Fix TLV_IE_Collection from_dict with nested collections ...................................................................... pySim/tlv.py: Fix TLV_IE_Collection from_dict with nested collections This is all quite complicated. In general, the TLV_IE.to_dict() method obviously is expected to return a dict (with key equal to the snake-case name of the class, value to the decode IE value). This single-entry dict can then be passed back to the from_dict() method to build the binary representation. However, with a TLV_IE_Collection, any TLV_IE can occur any number of times, so we need an array to represent it (dict would need unique key, which doesn't exist in multiple instances of same TLV IE). Hence, the TLV_IE_Collection.to_dict() method actually returns a list of dicts, rather than a dict itself. Each dict in the list represents one TLV_IE. When encoding such a TLV_IE_Collection back from the list-of-dicts, we so far didn't handle this special case and tried to de-serialize with a class-name-keyed dict, which doesn't work. This patch fixes a regression in the aram_store_ref_ar_do pySim-shell command which got introduced in Change-Id I3dd5204510e5c32ef1c4a999258d87cb3f1df8c8 While we're fixing it, add some additional comments to why things are how they are. Change-Id: Ibdd30cf1652c864f167b1b655b49a87941e15fd5 --- M pySim/tlv.py 1 file changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/33662/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 3e245b5..827972f 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -386,12 +386,21 @@ of dicts, where they key indicates the name of the TLV_IE subclass to use.""" # list of instances of TLV_IE collection member classes appearing in the data res = [] + # iterate over members of the list passed into "decoded" for i in decoded: + # iterate over all the keys (typically one!) within the current list item dict for k in i.keys(): + # check if we have a member identified by the dict key if k in self.members_by_name: + # resolve the class for that name; create an instance of it cls = self.members_by_name[k] inst = cls() - inst.from_dict({k: i[k]}) + if cls.nested_collection_cls: + # in case of collections, we want to pass the raw "value" portion to from_dict, + # as to_dict() below intentionally omits the collection-class-name as key + inst.from_dict(i[k]) + else: + inst.from_dict({k: i[k]}) res.append(inst) else: raise ValueError('%s: Unknown TLV Class %s in %s; expected %s' % @@ -400,6 +409,8 @@ return res def to_dict(self): + # we intentionally return not a dict, but a list of dicts. We could prefix by + # self.__class__.__name__, but that is usually some meaningless auto-generated collection name. return [x.to_dict() for x in self.children] def to_bytes(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibdd30cf1652c864f167b1b655b49a87941e15fd5 Gerrit-Change-Number: 33662 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pySim/tlv.py: Don't create an exception from within raise
by laforge 09 Jul '23

09 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33661 ) Change subject: pySim/tlv.py: Don't create an exception from within raise ...................................................................... pySim/tlv.py: Don't create an exception from within raise An invalid variable used in a raise ValueError() would cause a further exception, depriving the user of a meaningful error message. Change-Id: I6eb31b91bd69c311f07ff259a424edc58b57529a --- M pySim/tlv.py 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/33661/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 22a14cd..3e245b5 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -395,7 +395,7 @@ res.append(inst) else: raise ValueError('%s: Unknown TLV Class %s in %s; expected %s' % - (self, i[0], decoded, self.members_by_name.keys())) + (self, k, decoded, self.members_by_name.keys())) self.children = res return res -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6eb31b91bd69c311f07ff259a424edc58b57529a Gerrit-Change-Number: 33661 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0