- gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: scripts/osmocom-packages-docker: docker run --rm

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27148 ) Change subject: scripts/osmocom-packages-docker: docker run --rm ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I357ae8071d27088a2c0a74f962ac1589bff43a70 Gerrit-Change-Number: 27148 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:17:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: treewide: fix missing --rm for "docker run"

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27160 ) Change subject: treewide: fix missing --rm for "docker run" ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I48b01c43fedf379b8a565eaab0369806d7831bd8 Gerrit-Change-Number: 27160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:16:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: treewide: fix missing --rm for "docker run"

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27160 ) Change subject: treewide: fix missing --rm for "docker run" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I48b01c43fedf379b8a565eaab0369806d7831bd8 Gerrit-Change-Number: 27160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:15:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: treewide: fix missing --rm for "docker run"

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27160 ) Change subject: treewide: fix missing --rm for "docker run" ...................................................................... Patch Set 1: Code-Review-1 (3 comments) Patchset: PS1: CR-1 for duplicate --rm. File common/pipework: https://gerrit.osmocom.org/c/docker-playground/+/27160/comment/984340e1_6f6… PS1, Line 426: --rm Do you think we should submit a bug report or PR to the upstream? https://github.com/jpetazzo/pipework File ttcn3-ggsn-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/27160/comment/1c779c8b_a2b… PS1, Line 62: --rm \ It's already here. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I48b01c43fedf379b8a565eaab0369806d7831bd8 Gerrit-Change-Number: 27160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:15:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Add tests for Iuh->Iu disconnect

by daniel

daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27111 ) Change subject: hnbgw: Add tests for Iuh->Iu disconnect ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27111 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: I8c1858382483af94542af9eb6977d360f26fdaef Gerrit-Change-Number: 27111 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/Native_Functions: add f_inet6_ntoa()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 ) Change subject: library/Native_Functions: add f_inet6_ntoa() ...................................................................... library/Native_Functions: add f_inet6_ntoa() We have f_inet_ntoa() for converting IPv4 addresses to strings, but so far there was no similar function for IPv6 addresses. Change-Id: I0858cf8cb44a6673e19f3496c362d68fcdd7b18d --- M library/Native_FunctionDefs.cc M library/Native_Functions.ttcn 2 files changed, 15 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Native_FunctionDefs.cc b/library/Native_FunctionDefs.cc index 78ca4d1..7139a62 100644 --- a/library/Native_FunctionDefs.cc +++ b/library/Native_FunctionDefs.cc @@ -76,6 +76,19 @@ return CHARSTRING(str); } +CHARSTRING f__inet6__ntoa(const OCTETSTRING& in) +{ + char buf[INET6_ADDRSTRLEN] = { 0 }; + TTCN_Buffer ttcn_buffer(in); + + const void *src = (const void *)ttcn_buffer.get_data(); + const char *str = inet_ntop(AF_INET6, src, buf, sizeof(buf)); + if (str == NULL) + fprintf(stderr, "inet_ntop failed: %s\n", strerror(errno)); + + return CHARSTRING((const char *)buf); +} + CHARSTRING f__str__tolower(const CHARSTRING& in) { TTCN_Buffer ttcn_buffer(in); diff --git a/library/Native_Functions.ttcn b/library/Native_Functions.ttcn index c43004a..c9cc948 100644 --- a/library/Native_Functions.ttcn +++ b/library/Native_Functions.ttcn @@ -11,6 +11,8 @@ external function f_inet_ntoa(in octetstring oct) return charstring; /* like inet_ntoa() but input is host byte order */ external function f_inet_hntoa(in octetstring oct) return charstring; + /* direct import of inet_ntop(AF_INET6) C function, input net byte order */ + external function f_inet6_ntoa(in octetstring oct) return charstring; /* convert content of charstring to lower-case using tolower(3) */ external function f_str_tolower(in charstring input) return charstring; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 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: I0858cf8cb44a6673e19f3496c362d68fcdd7b18d Gerrit-Change-Number: 27146 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: common/pipework: deduplicate

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27159 ) Change subject: common/pipework: deduplicate ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I88ff40ca69c9ee76bef9bb8f24f66ca9d5ac751a Gerrit-Change-Number: 27159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:00:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: make/Makefile: always use docker run --rm

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27158 ) Change subject: make/Makefile: always use docker run --rm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iea063aa39a08397ea64d2018b433991a130e7f56 Gerrit-Change-Number: 27158 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:59:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in pysim[master]: tlv: Function for flattening the list-of-dict output of TLV decoder

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27163 ) Change subject: tlv: Function for flattening the list-of-dict output of TLV decoder ...................................................................... tlv: Function for flattening the list-of-dict output of TLV decoder Before: { "FcpTemplate": [ { "FileDescriptor": { "shareable": true, "file_type": "df", "structure": "no_info_given" } }, { "FileIdentifier": "3f00" }, { "ProprietaryInformation": [ { "UiccCharacteristics": "71" }, { "AvailableMemory": 123052 } ] }, { "LifeCycleStatusInteger": "operational_activated" }, { "SecurityAttribReferenced": { "ef_arr_file_id": "2f06", "ef_arr_record_nr": 2 } }, { "PinStatusTemplate_DO": [ { "PS_DO": "40" }, { "KeyReference": 1 }, { "KeyReference": 129 } ] }, { "TotalFileSize": 187809 } ] } After: { "FcpTemplate": { "FileDescriptor": { "shareable": true, "file_type": "df", "structure": "no_info_given" }, "FileIdentifier": "3f00", "ProprietaryInformation": { "UiccCharacteristics": "71", "AvailableMemory": 123052 }, "LifeCycleStatusInteger": "operational_activated", "SecurityAttribReferenced": { "ef_arr_file_id": "2f06", "ef_arr_record_nr": 2 }, "PinStatusTemplate_DO": { "PS_DO": "40", "KeyReference": 129 }, "TotalFileSize": 187809 } } Change-Id: Ia5ad8f1d3b0d47ebdb1856b0feaba120bad3eef9 --- M pySim/tlv.py M pySim/ts_102_221.py 2 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/27163/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index ba1aa9f..71338ab 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -404,3 +404,30 @@ def to_tlv(self): return self.to_bytes() + + +def flatten_dict_lists(inp): + """hierarchically flatten each list-of-dicts into a single dict. This is useful to + make the output of hierarchical TLV decoder structures flatter and more easy to read.""" + def are_all_elements_dict(l): + for e in l: + if not isinstance(e, dict): + return False + return True + + if isinstance(inp, list): + if are_all_elements_dict(inp): + # flatten into one shared dict + newdict = {} + for e in inp: + key = list(e.keys())[0] + newdict[key] = e[key] + inp = newdict + # process result as any native dict + return {k:flatten_dict_lists(inp[k]) for k in inp.keys()} + else: + return [flatten_dict_lists(x) for x in inp] + elif isinstance(inp, dict): + return {k:flatten_dict_lists(inp[k]) for k in inp.keys()} + else: + return inp diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index b9a94b7..3f8c49d 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -794,7 +794,7 @@ """ETSI TS 102 221 Section 11.1.1.3""" t = FcpTemplate() t.from_tlv(h2b(resp_hex)) - return t.to_dict() + return flatten_dict_lists(t.to_dict()) @staticmethod def match_with_card(scc: SimCardCommands) -> bool: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia5ad8f1d3b0d47ebdb1856b0feaba120bad3eef9 Gerrit-Change-Number: 27163 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: pySim-shell: export: allow export as JSON instead of hex

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27164 ) Change subject: pySim-shell: export: allow export as JSON instead of hex ...................................................................... pySim-shell: export: allow export as JSON instead of hex The primary use case of the --json option is to systematically execute all of our decoder classes in order to find bugs. As we don't have encoders for all files yet, the output generated by 'export --json' will in many cases not be executable as script again, unlike the normal 'export' output. Change-Id: Idd820f8e3af70ebcbf82037b56fd2ae9655afbc5 --- M pySim-shell.py 1 file changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/27164/1 diff --git a/pySim-shell.py b/pySim-shell.py index 6bbe9ed..875dd64 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -457,7 +457,7 @@ self._cmd.poutput(directory_str) self._cmd.poutput("%d files" % len(selectables)) - def walk(self, indent=0, action=None, context=None): + def walk(self, indent=0, action=None, context=None, as_json=False): """Recursively walk through the file system, starting at the currently selected DF""" files = self._cmd.rs.selected_file.get_selectables( flags=['FNAMES', 'ANAMES']) @@ -489,12 +489,12 @@ # If the DF was skipped, we never have entered the directory # below, so we must not move up. if skip_df == False: - self.walk(indent + 1, action, context) + self.walk(indent + 1, action, context, as_json) fcp_dec = self._cmd.rs.select("..", self._cmd) elif action: df_before_action = self._cmd.rs.selected_file - action(f, context) + action(f, context, as_json) # When walking through the file system tree the action must not # always restore the currently selected file to the file that # was selected before executing the action() callback. @@ -506,7 +506,7 @@ """Display a filesystem-tree with all selectable files""" self.walk() - def export(self, filename, context): + def export(self, filename, context, as_json=False): """ Select and export a single file """ context['COUNT'] += 1 df = self._cmd.rs.selected_file @@ -537,23 +537,36 @@ self._cmd.poutput("select " + self._cmd.rs.selected_file.name) if structure == 'transparent': - result = self._cmd.rs.read_binary() - self._cmd.poutput("update_binary " + str(result[0])) + if as_json: + result = self._cmd.rs.read_binary_dec() + self._cmd.poutput("update_binary_decoded '%s'" % json.dumps(result[0], cls=JsonEncoder)) + else: + result = self._cmd.rs.read_binary() + self._cmd.poutput("update_binary " + str(result[0])) elif structure == 'cyclic' or structure == 'linear_fixed': # Use number of records specified in select response if 'num_of_rec' in fd: num_of_rec = fd['num_of_rec'] for r in range(1, num_of_rec + 1): - result = self._cmd.rs.read_record(r) - self._cmd.poutput("update_record %d %s" % - (r, str(result[0]))) + if as_json: + result = self._cmd.rs.read_record(r) + self._cmd.poutput("update_record_decoded %d '%s'" % (r, json.dumps(result[0], cls=JsonEncoder))) + else: + result = self._cmd.rs.read_record_dec(r) + self._cmd.poutput("update_record %d %s" % (r, str(result[0]))) + # When the select response does not return the number of records, read until we hit the # first record that cannot be read. else: r = 1 while True: try: - result = self._cmd.rs.read_record(r) + if as_json: + result = self._cmd.rs.read_record_dec(r) + self._cmd.poutput("update_record_decoded %d '%s'" % (r, json.dumps(result[0], cls=JsonEncoder))) + else: + result = self._cmd.rs.read_record(r) + self._cmd.poutput("update_record %d %s" % (r, str(result[0]))) except SwMatchError as e: # We are past the last valid record - stop if e.sw_actual == "9402": @@ -561,8 +574,6 @@ # Some other problem occurred else: raise e - self._cmd.poutput("update_record %d %s" % - (r, str(result[0]))) r = r + 1 elif structure == 'ber_tlv': tags = self._cmd.rs.retrieve_tags() @@ -591,6 +602,8 @@ export_parser = argparse.ArgumentParser() export_parser.add_argument( '--filename', type=str, default=None, help='only export specific file') + export_parser.add_argument( + '--json', action='store_true', help='export as JSON (less reliable)') @cmd2.with_argparser(export_parser) def do_export(self, opts): @@ -598,9 +611,9 @@ context = {'ERR': 0, 'COUNT': 0, 'BAD': [], 'DF_SKIP': 0, 'DF_SKIP_REASON': []} if opts.filename: - self.export(opts.filename, context) + self.export(opts.filename, context, opts.json) else: - self.walk(0, self.export, context) + self.walk(0, self.export, context, opts.json) self._cmd.poutput(boxed_heading_str("Export summary")) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Idd820f8e3af70ebcbf82037b56fd2ae9655afbc5 Gerrit-Change-Number: 27164 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log