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

[S] Change in pysim[master]: pySim-shell: fix verify_adm command
by laforge 20 Jul '23

20 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33850 ) Change subject: pySim-shell: fix verify_adm command ...................................................................... pySim-shell: fix verify_adm command The comman verify_adm does no longer work since the verify_adm method is no longer available in the card base classes (cards.py). Let's use the verify_chv method from SimCardCommands instead. Change-Id: Ic87e1bff221b10d33d36da32b589e2737f6ca9cd --- M pySim-shell.py 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 3b56bfd..2e332d3 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -781,7 +781,7 @@ "cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid)) if pin_adm: - self._cmd.card.verify_adm(h2b(pin_adm)) + self._cmd.card._scc.verify_chv(self._cmd.card._adm_chv_num, h2b(pin_adm)) else: raise ValueError("error: cannot authenticate, no adm-pin!") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic87e1bff221b10d33d36da32b589e2737f6ca9cd Gerrit-Change-Number: 33850 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: cards: fix swapped PIN mapping number
by laforge 20 Jul '23

20 Jul '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33849 ) Change subject: cards: fix swapped PIN mapping number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5680d2deee855ef316a98058e8c8ff8cf4edbbb2 Gerrit-Change-Number: 33849 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 15:44:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: cards: fix swapped PIN mapping number
by laforge 20 Jul '23

20 Jul '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33849 ) Change subject: cards: fix swapped PIN mapping number ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I also saw this when I read the code, but I thought it must be correct if it has been in place for many years like this. I just moved it from one class to another class, but it always was 0xA0 before. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5680d2deee855ef316a98058e8c8ff8cf4edbbb2 Gerrit-Change-Number: 33849 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 15:43:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-shell: fix verify_adm command
by laforge 20 Jul '23

20 Jul '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33850 ) Change subject: pySim-shell: fix verify_adm command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic87e1bff221b10d33d36da32b589e2737f6ca9cd Gerrit-Change-Number: 33850 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 15:42:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: Fix LOGPTBFDL macro log category
by pespin 20 Jul '23

20 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33851 ) Change subject: rlcmac: Fix LOGPTBFDL macro log category ...................................................................... rlcmac: Fix LOGPTBFDL macro log category Change-Id: I7f90981a114070ff13c508f0c6800cc1dd2cfe14 --- M include/osmocom/gprs/rlcmac/tbf_dl.h 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/51/33851/1 diff --git a/include/osmocom/gprs/rlcmac/tbf_dl.h b/include/osmocom/gprs/rlcmac/tbf_dl.h index 104b6e6..fe0b2ef 100644 --- a/include/osmocom/gprs/rlcmac/tbf_dl.h +++ b/include/osmocom/gprs/rlcmac/tbf_dl.h @@ -74,6 +74,6 @@ } #define LOGPTBFDL(dl_tbf, lvl, fmt, args...) \ - LOGP(g_rlcmac_log_cat[OSMO_GPRS_RLCMAC_LOGC_TBFUL], lvl, "TBF(DL:NR-%" PRIu8 ":TLLI-%08x) " fmt, \ + LOGP(g_rlcmac_log_cat[OSMO_GPRS_RLCMAC_LOGC_TBFDL], lvl, "TBF(DL:NR-%" PRIu8 ":TLLI-%08x) " fmt, \ (dl_tbf)->tbf.nr, (dl_tbf)->tbf.gre->tlli, \ ## args) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7f90981a114070ff13c508f0c6800cc1dd2cfe14 Gerrit-Change-Number: 33851 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: vty: Allow space in network name
by pespin 20 Jul '23

20 Jul '23

Attention is currently required from: neels, laforge, matanp. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33848 ) Change subject: vty: Allow space in network name ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Not sure if other osmo programs may also need the same patch? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie85e98790d6917a30c84333203cbc00c4ceb97e8 Gerrit-Change-Number: 33848 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Thu, 20 Jul 2023 15:36:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: cards: fix swapped PIN mapping number
by dexter 20 Jul '23

20 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33849 ) Change subject: cards: fix swapped PIN mapping number ...................................................................... cards: fix swapped PIN mapping number The constant for _adm_chv_num is swapped. It should be 0x0A, rather than 0xA0 Change-Id: I5680d2deee855ef316a98058e8c8ff8cf4edbbb2 --- M pySim/cards.py 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/33849/1 diff --git a/pySim/cards.py b/pySim/cards.py index c6a68fc..c87c488 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -101,7 +101,7 @@ self._scc.cla_byte = "00" self._scc.sel_ctrl = "0004" # request an FCP # See also: ETSI TS 102 221, Table 9.3 - self._adm_chv_num = 0xA0 + self._adm_chv_num = 0x0A def probe(self) -> bool: # EF.DIR is a mandatory EF on all ICCIDs; however it *may* also exist on a TS 51.011 SIM -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5680d2deee855ef316a98058e8c8ff8cf4edbbb2 Gerrit-Change-Number: 33849 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pySim-shell: fix verify_adm command
by dexter 20 Jul '23

20 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33850 ) Change subject: pySim-shell: fix verify_adm command ...................................................................... pySim-shell: fix verify_adm command The comman verify_adm does no longer work since the verify_adm method is no longer available in the card base classes (cards.py). Let's use the verify_chv method from SimCardCommands instead. Change-Id: Ic87e1bff221b10d33d36da32b589e2737f6ca9cd --- M pySim-shell.py 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/50/33850/1 diff --git a/pySim-shell.py b/pySim-shell.py index 3b56bfd..2e332d3 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -781,7 +781,7 @@ "cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid)) if pin_adm: - self._cmd.card.verify_adm(h2b(pin_adm)) + self._cmd.card._scc.verify_chv(self._cmd.card._adm_chv_num, h2b(pin_adm)) else: raise ValueError("error: cannot authenticate, no adm-pin!") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic87e1bff221b10d33d36da32b589e2737f6ca9cd Gerrit-Change-Number: 33850 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: vty: Allow space in network name
by matanp 20 Jul '23

20 Jul '23

Attention is currently required from: neels, laforge, matanp. Hello Jenkins Builder, neels, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/33848 to look at the new patch set (#2). Change subject: vty: Allow space in network name ...................................................................... vty: Allow space in network name Change-Id: Ie85e98790d6917a30c84333203cbc00c4ceb97e8 --- M src/libmsc/msc_vty.c M tests/test_nodes.vty 2 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/48/33848/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie85e98790d6917a30c84333203cbc00c4ceb97e8 Gerrit-Change-Number: 33848 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-msc[master]: vty: Allow space in network name
by matanp 20 Jul '23

20 Jul '23

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33848 ) Change subject: vty: Allow space in network name ...................................................................... vty: Allow space in network name Change-Id: Ie85e98790d6917a30c84333203cbc00c4ceb97e8 --- M src/libmsc/msc_vty.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/48/33848/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index d1b74c8..944c1ea 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -131,7 +131,7 @@ DEFUN(cfg_net_name_short, cfg_net_name_short_cmd, - "short name NAME", + "short name .NAME", "Set the short GSM network name\n" NAME_CMD_STR NAME_STR) { osmo_talloc_replace_string(gsmnet, &gsmnet->name_short, argv[0]); @@ -140,7 +140,7 @@ DEFUN(cfg_net_name_long, cfg_net_name_long_cmd, - "long name NAME", + "long name .NAME", "Set the long GSM network name\n" NAME_CMD_STR NAME_STR) { osmo_talloc_replace_string(gsmnet, &gsmnet->name_long, argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie85e98790d6917a30c84333203cbc00c4ceb97e8 Gerrit-Change-Number: 33848 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 0