December 2022 - gerrit-log - lists.osmocom.org

Change in osmo-pcu[master]: Convert ms_first_common_ts to struct gprs_rlcmac_pdch

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30575 ) Change subject: Convert ms_first_common_ts to struct gprs_rlcmac_pdch ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I19373939ec104d371e3e91422f018a8175cb0f89 Gerrit-Change-Number: 30575 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Dec 2022 14:47:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: bts: Adapt trx check based on bts->trx[] defined array size

by osmith

Attention is currently required from: pespin, fixeria, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30631 ) Change subject: bts: Adapt trx check based on bts->trx[] defined array size ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: this is trivial, giving +2 so the whole patchset can be merged -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5ccb5ec27bc189d17c62e7f2a59fae0b3bddf8e3 Gerrit-Change-Number: 30631 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Dec 2022 14:16:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: bts: Adapt trx check based on bts->trx[] defined array size

by osmith

Attention is currently required from: pespin, fixeria, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30631 ) Change subject: bts: Adapt trx check based on bts->trx[] defined array size ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5ccb5ec27bc189d17c62e7f2a59fae0b3bddf8e3 Gerrit-Change-Number: 30631 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Dec 2022 14:15:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: Convert tbf->control_ts to be a gprs_rlcmac_pdch*

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30620 ) Change subject: Convert tbf->control_ts to be a gprs_rlcmac_pdch* ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6a97b6528b2f9d78dfbca8fb97ab7c621f777fc7 Gerrit-Change-Number: 30620 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Dec 2022 14:14:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: pdch: Introduce APIs to print PDCH name

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30619 ) Change subject: pdch: Introduce APIs to print PDCH name ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/30619/comment/1e39a19d_aa8a51c9 PS2, Line 1346: pdch_name_buf > I am happy you agreed with Neels on doing that in another project/context; I really don't want to do […] Then I suggest doing OSMO_ASSERT here, so it's explicit. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If18cb4a48237751e0dddede6793191b36dfe386d Gerrit-Change-Number: 30619 Gerrit-PatchSet: 2 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: Fri, 16 Dec 2022 14:05:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: Convert ms_first_common_ts to struct gprs_rlcmac_pdch

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30575 ) Change subject: Convert ms_first_common_ts to struct gprs_rlcmac_pdch ...................................................................... Patch Set 3: Code-Review+1 (2 comments) File src/gprs_ms.h: https://gerrit.osmocom.org/c/osmo-pcu/+/30575/comment/13d4dc04_05578735 PS2, Line 68: _ts > Yes, all integers holding a timeslot number should be called "tn" but they are not right now. […] Looks like the proper solution would be renaming all timeslot numbers to _tn, and that's outside of scope of this patch / patchset. I think keeping _ts is fine here. https://gerrit.osmocom.org/c/osmo-pcu/+/30575/comment/f7141c3d_95e740cd PS2, Line 106: _ts > Same here, s/_ts/_pdch/. marking as resolved, see other discussion -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I19373939ec104d371e3e91422f018a8175cb0f89 Gerrit-Change-Number: 30575 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Dec 2022 14:01:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-prog: clean up csv file reader function

by dexter

Attention is currently required from: daniel. Hello daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/30632 to look at the new patch set (#2). Change subject: pySim-prog: clean up csv file reader function ...................................................................... pySim-prog: clean up csv file reader function The function that goes through the CSV file and searches for either IMSI or ICCID or picks a specific line by number is very hard to read and understand. Lets clean it up and add useful error messages Change-Id: I7ae995aa3297e77b983e59c75e1c3ef17e1d7cd4 Related: OS#5830 --- M pySim-prog.py 1 file changed, 45 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/30632/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ae995aa3297e77b983e59c75e1c3ef17e1d7cd4 Gerrit-Change-Number: 30632 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in pysim[master]: pySim-prog: clean up csv file reader function

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/30632 ) Change subject: pySim-prog: clean up csv file reader function ...................................................................... pySim-prog: clean up csv file reader function The function that goes through the CSV file and searches for either IMSI or ICCID or picks a specific line by number is very hard to read and understand. Lets clean it up and add useful error messages Change-Id: Ie05d7005bf8e960d0613811936303a4b61d9ab57 Related OS#5830 Change-Id: I7ae995aa3297e77b983e59c75e1c3ef17e1d7cd4 --- M pySim-prog.py 1 file changed, 45 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/30632/1 diff --git a/pySim-prog.py b/pySim-prog.py index ade213b..335dcc3 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -32,6 +32,7 @@ import sys import traceback import json +import csv from pySim.commands import SimCardCommands from pySim.transport import init_reader @@ -524,37 +525,73 @@ f.close() -def _read_params_csv(opts, iccid=None, imsi=None): - import csv - f = open(opts.read_csv, 'r') +def find_row_in_csv_file(csv_file_name:str, num=None, iccid=None, imsi=None): + """ + Pick a matching row in a CSV file by row number or ICCID or IMSI. When num + is not None, the search parameters iccid and imsi are ignored. When + searching for a specific ICCID or IMSI the caller must set num to None. It + is possible to search for an ICCID or an IMSI at the same time. The first + line that either contains a matching ICCID or IMSI is returned. Unused + search parameters must be set to None. + """ + + f = open(csv_file_name, 'r') cr = csv.DictReader(f) + # Make sure the CSV file contains at least the fields we are searching for + if not 'iccid' in cr.fieldnames: + raise Exception("wrong CSV file format - no field \"iccid\" or missing header!") + if not 'imsi' in cr.fieldnames: + raise Exception("wrong CSV file format - no field \"imsi\" or missing header!") + + # Enforce at least one search parameter + if not num and not iccid and not imsi: + raise Exception("no CSV file search parameters!") + # Lower-case fieldnames cr.fieldnames = [field.lower() for field in cr.fieldnames] + # Search for row + message="looking up card parameters in CSV file by:" + if num: + message += " num=" + str(num) + if iccid: + message += " iccid=" + str(iccid) + if num: + message += "(ignored)" + if imsi: + message += " imsi=" + str(imsi) + if num: + message += "(ignored)" + + print (message) i = 0 - if not 'iccid' in cr.fieldnames: - raise Exception("CSV file in wrong format!") for row in cr: - if opts.num is not None and opts.read_iccid is False and opts.read_imsi is False: + # Pick a specific row by line number (num) + if num is not None and iccid is None and imsi is None: if opts.num == i: f.close() return row - i += 1 + + # Pick the first row that contains the specified ICCID if row['iccid'] == iccid: f.close() return row + # Pick the first row that contains the specified IMSI if row['imsi'] == imsi: f.close() return row + i += 1 + f.close() + print("Could not read card parameters from CSV file, no matching entry found.") return None def read_params_csv(opts, imsi=None, iccid=None): - row = _read_params_csv(opts, iccid=iccid, imsi=imsi) + row = find_row_in_csv_file(opts.read_csv, opts.num, iccid=iccid, imsi=imsi) if row is not None: row['mcc'] = row.get('mcc', mcc_from_imsi(row.get('imsi'))) row['mnc'] = row.get('mnc', mnc_from_imsi(row.get('imsi'))) @@ -713,7 +750,6 @@ imsi = opts.imsi cp = read_params_csv(opts, imsi=imsi, iccid=iccid) if cp is None: - print("Error reading parameters from CSV file!\n") return 2 print_parameters(cp) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ae995aa3297e77b983e59c75e1c3ef17e1d7cd4 Gerrit-Change-Number: 30632 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: bts: Adapt trx check based on bts->trx[] defined array size

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30631 ) Change subject: bts: Adapt trx check based on bts->trx[] defined array size ...................................................................... bts: Adapt trx check based on bts->trx[] defined array size This way the code is not hardcoded to 8 TRX. Related: OS#5827 Change-Id: I5ccb5ec27bc189d17c62e7f2a59fae0b3bddf8e3 --- M src/bts.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/30631/1 diff --git a/src/bts.cpp b/src/bts.cpp index 06ac5a7..cf39aa4 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -632,7 +632,7 @@ unsigned int best_cnt = 0; uint8_t best_first_tfi = 0; - if (use_trx >= 0 && use_trx < 8) + if (use_trx >= 0 && use_trx < (int8_t)ARRAY_SIZE(bts->trx)) trx_from = trx_to = use_trx; else { trx_from = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/30631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5ccb5ec27bc189d17c62e7f2a59fae0b3bddf8e3 Gerrit-Change-Number: 30631 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: layer23: fix rx_l1_sim_conf(): msg->l2h is NULL, use msg->l1h

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30613 ) Change subject: layer23: fix rx_l1_sim_conf(): msg->l2h is NULL, use msg->l1h ...................................................................... Patch Set 1: (1 comment) File src/host/layer23/src/common/l1ctl.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30613/comment/91afed22_ade0df3c PS1, Line 742: LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len)); > If the pointer is NULL, it would return an empty line, see: […] AH I see msgb_l2len generated the crash. All good (TM) then. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7c68a3ad393be5fd0413e00e119a06db59672357 Gerrit-Change-Number: 30613 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Dec 2022 11:49:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022