Attention is currently required from: Hoernchen, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27603 )
Change subject: msc tests: fix test so they don't depend on previous test runs
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS1:
> Can you describe better the issue you are fixing here?
new version of patch was fixed, but code review from pespin not addressd. I'm also agreeing with pau and waiting for it to be addressed.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27603
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: Iebaecd28a426b15baf4729f40b46dd33da79cbae
Gerrit-Change-Number: 27603
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 05 Apr 2022 13:30:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27631 )
Change subject: libosmo-pfcp: implement PFCP header and msg handling
......................................................................
Patch Set 3: Code-Review+1
(3 comments)
File include/osmocom/pfcp/pfcp_msg.h:
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/1d5c28ce_fe655651
PS3, Line 69: static inline uint32_t osmo_pfcp_next_seq(uint32_t *seq_state)
> This function will return 1 on first call most probably. […]
I would expect no constraint whatsoevre on the starting / initial value of the sequence number. Basically every command must have a unique serial number so we can match responses to requests, and the receiver can distinguish re-transmission of a command (same seq) from a new command (different seq)
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/ca80ed75_e149434f
PS3, Line 72: (*seq_state) &= 0xffffff;
the interesting question is why we use a uint32_t variable if we only use 16 bits of it?
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/f78a1104_ebf16f72
PS3, Line 110: struct osmo_fsm_inst *peer_fi;
> Looks like these 2 groups can be in a union?
peers and sessins are orthogonal concepts, why do you think a message is only either part of a session or related to a peer? shouldn't it be both at the same time?
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27631
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I3f85ea052a6b7c064244a8093777e53a47c8c61e
Gerrit-Change-Number: 27631
Gerrit-PatchSet: 3
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 05 Apr 2022 13:24:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin, fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27644 )
Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
In general I agree we should avoid introducing SYS# ticket numbers into the codebase, as it is something that other people don't have access to. On the other hand, I don't think we should waste time by copying parts of a bug report to osmocom.org, creating a non-customer-incumbered pcap file, attaching it there and re-writing this patch now.
But in the future, let's avoid this please.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055
Gerrit-Change-Number: 27644
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-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 05 Apr 2022 13:18:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27648 )
Change subject: utils: Fix bugs in DataObject encoders
......................................................................
utils: Fix bugs in DataObject encoders
The DataObject is some weird / rarely used different code than the
normal TLV encoder/decoder. It has apparently so far only been used
for decoding, without testing the encoding side, resulting in related
bugs.
Let's fix those that I encountered today, and add a test case.
Change-Id: I31370066f43c22fc3ce9e2b9ee75986a652f6fc4
---
M pySim/utils.py
M tests/test_utils.py
2 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/pySim/utils.py b/pySim/utils.py
index 555aa82..8a7fcdb 100644
--- a/pySim/utils.py
+++ b/pySim/utils.py
@@ -1333,7 +1333,7 @@
bytes encoded in TLV format.
"""
val = self.to_bytes()
- return bytes(self._compute_tag()) + bytes(len(val)) + val
+ return bertlv_encode_tag(self._compute_tag()) + bertlv_encode_len(len(val)) + val
# 'codec' interface
def decode(self, binary: bytes) -> Tuple[dict, bytes]:
@@ -1481,7 +1481,8 @@
# 'codec' interface
def encode(self, decoded) -> bytes:
- obj = self.members_by_name(decoded[0])
+ obj = self.members_by_name[list(decoded)[0]]
+ obj.decoded = list(decoded.values())[0]
return obj.to_tlv()
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ae23461..b7f790d 100755
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -4,6 +4,22 @@
from pySim import utils
from pySim.ts_31_102 import EF_SUCI_Calc_Info
+# we don't really want to thest TS 102 221, but the underlying DataObject codebase
+from pySim.ts_102_221 import AM_DO_EF, AM_DO_DF, SC_DO
+
+class DoTestCase(unittest.TestCase):
+
+ def testSeqOfChoices(self):
+ """A sequence of two choices with each a variety of DO/TLVs"""
+ arr_seq = utils.DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO])
+ # input data
+ dec_in = [{'access_mode': ['update_erase', 'read_search_compare']}, {'control_reference_template':'PIN1'}]
+ # encode it once
+ encoded = arr_seq.encode(dec_in)
+ # decode again
+ re_decoded = arr_seq.decode(encoded)
+ self.assertEqual(dec_in, re_decoded[0])
+
class DecTestCase(unittest.TestCase):
# TS33.501 Annex C.4 test keys
hnet_pubkey_profile_b = "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1" # ID 27 in test file
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27648
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I31370066f43c22fc3ce9e2b9ee75986a652f6fc4
Gerrit-Change-Number: 27648
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27650 )
Change subject: ts_102_221: Add encode/write support of EF.ARR records
......................................................................
ts_102_221: Add encode/write support of EF.ARR records
With this change, we can also encode/write EF.ARR records, not just
decode/read.
Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182
---
M pySim/ts_102_221.py
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py
index 713d169..bf63f55 100644
--- a/pySim/ts_102_221.py
+++ b/pySim/ts_102_221.py
@@ -672,6 +672,11 @@
# 'un-flattening' decoder, and hence would be unable to encode :(
return dec[0]
+ def _encode_record_bin(self, in_json):
+ # we can only guess if we should decode for EF or DF here :(
+ arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO])
+ return arr_seq.encode_multi(in_json)
+
@with_default_category('File-Specific Commands')
class AddlShellCommands(CommandSet):
def __init__(self):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27650
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182
Gerrit-Change-Number: 27650
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged