January 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: ctrl: Add rach max transmission
by matanp 14 Jan '24

14 Jan '24

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email ) Change subject: ctrl: Add rach max transmission ...................................................................... ctrl: Add rach max transmission Change-Id: I34c92cbbcaa46235481a491f4c6ff723b671fff1 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 43 insertions(+), 0 deletions(-) Approvals: matanp: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 0c6e280..f4e13a1 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -1382,6 +1382,39 @@ CTRL_CMD_DEFINE(bts_rach_cell_barred, "rach-cell-barred"); +static int verify_bts_rach_max_trans(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int max_trans = atoi(cmd->value); + + if ((max_trans != 1) && (max_trans != 2) && (max_trans != 4) && (max_trans != 7)) + return 1; + + return 0; +} + +static int get_bts_rach_max_trans(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + cmd->reply = talloc_asprintf(cmd, "%u", rach_max_trans_raw2val(bts->si_common.rach_control.max_trans)); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_bts_rach_max_trans(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + bts->si_common.rach_control.max_trans = rach_max_trans_val2raw(atoi(cmd->value)); + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(bts_rach_max_trans, "rach-max-transmission"); + /* Return space concatenated set of tuples <UARFCN>,<scrambling code>,<diversity bit> */ static int get_bts_neighbor_list_si2quater_uarfcn(struct ctrl_cmd *cmd, void *data) { @@ -1488,6 +1521,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_bar); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_allow); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_cell_barred); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_max_trans); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si2quater_uarfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si2quater_earfcn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I34c92cbbcaa46235481a491f4c6ff723b671fff1 Gerrit-Change-Number: 35554 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: ctrl: Add ms max power
by matanp 14 Jan '24

14 Jan '24

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email ) Change subject: ctrl: Add ms max power ...................................................................... ctrl: Add ms max power Change-Id: I703057b0ad15ca56abf2b6223d5a5f4b33d944d8 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: matanp: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index f4e13a1..acbe68a 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -253,6 +253,7 @@ CTRL_CMD_DEFINE_RANGE(bts_bsic, "bsic", struct gsm_bts, bsic, 0, 63); CTRL_CMD_DEFINE_RANGE(bts_rach_max_delay, "rach-max-delay", struct gsm_bts, rach_max_delay, 1, 127); CTRL_CMD_DEFINE_RANGE(bts_rach_expiry_timeout, "rach-expiry-timeout", struct gsm_bts, rach_expiry_timeout, 4, 64); +CTRL_CMD_DEFINE_RANGE(bts_ms_max_power, "ms-max-power", struct gsm_bts, ms_max_power, 0, 40); static int set_bts_apply_config(struct ctrl_cmd *cmd, void *data) { @@ -1515,6 +1516,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_offset); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_penalty_time); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_hysteresis); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_ms_max_power); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_radio_link_timeout); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rxlev_access_min); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I703057b0ad15ca56abf2b6223d5a5f4b33d944d8 Gerrit-Change-Number: 35555 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: ctrl: Add rach max transmission
by matanp 14 Jan '24

14 Jan '24

matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email ) Change subject: ctrl: Add rach max transmission ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I34c92cbbcaa46235481a491f4c6ff723b671fff1 Gerrit-Change-Number: 35554 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Sun, 14 Jan 2024 10:51:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ctrl: Add ms max power
by matanp 14 Jan '24

14 Jan '24

matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email ) Change subject: ctrl: Add ms max power ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I703057b0ad15ca56abf2b6223d5a5f4b33d944d8 Gerrit-Change-Number: 35555 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Sun, 14 Jan 2024 10:51:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ctrl: Add ms max power
by fixeria 14 Jan '24

14 Jan '24

Attention is currently required from: matanp. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email ) Change subject: ctrl: Add ms max power ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I703057b0ad15ca56abf2b6223d5a5f4b33d944d8 Gerrit-Change-Number: 35555 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Sun, 14 Jan 2024 10:18:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ctrl: Add rach max transmission
by fixeria 14 Jan '24

14 Jan '24

Attention is currently required from: matanp. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email ) Change subject: ctrl: Add rach max transmission ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I34c92cbbcaa46235481a491f4c6ff723b671fff1 Gerrit-Change-Number: 35554 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Sun, 14 Jan 2024 10:17:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: TLV: Add DGI encoding of "GP Scripting Language Annex B"
by fixeria 14 Jan '24

14 Jan '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35556?usp=email ) Change subject: TLV: Add DGI encoding of "GP Scripting Language Annex B" ...................................................................... Patch Set 1: (1 comment) File pySim/utils.py: https://gerrit.osmocom.org/c/pysim/+/35556/comment/0e862b02_027bacfe PS1, Line 365: t `t: int`? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35556?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie29ab7eb39f3165f3d695fcc1f02051338095697 Gerrit-Change-Number: 35556 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 14 Jan 2024 10:15:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: TLV: Add DGI encoding of "GP Scripting Language Annex B"
by laforge 14 Jan '24

14 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35556?usp=email ) Change subject: TLV: Add DGI encoding of "GP Scripting Language Annex B" ...................................................................... TLV: Add DGI encoding of "GP Scripting Language Annex B" The DGI encoding is specified in Annex B of the "GlobalPlatform Systems Scripting Language Specification v1.1.0" which is an "archived" specification that is no longer published by GlobalPlatform, despite it being referenced from the GlobalPlatform Card Specification v2.3, which is the basis of the GSMA eSIM specifications. For some reason it was the belief of the specification authors that yet another format of TLV encoding is needed, in addition to the BER-TLV and COMPREHENSION-TLV used by the very same specifications. The encoding of the tag is not really specified anywhere, but I've only seen 16-bit examples. The encoding of the length is specified and implemented here accordingly. Change-Id: Ie29ab7eb39f3165f3d695fcc1f02051338095697 --- M pySim/tlv.py M pySim/utils.py 2 files changed, 81 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/56/35556/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 826f02f..b3e386a 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -302,6 +302,27 @@ return bertlv_encode_len(len(val)) +class DGI_TLV_IE(TLV_IE): + """TLV_IE formated as GlobalPlatform Systems Scripting Language Specification v1.1.0 Annex B.""" + + def __init__(self, **kwargs): + super().__init__(**kwargs) + + @classmethod + def _parse_tag_raw(cls, do: bytes) -> Tuple[int, bytes]: + return dgi_parse_tag_raw(do) + + @classmethod + def _parse_len(cls, do: bytes) -> Tuple[int, bytes]: + return dgi_parse_len(do) + + def _encode_tag(self) -> bytes: + return dgi_encode_tag(self._compute_tag()) + + def _encode_len(self, val: bytes) -> bytes: + return dgi_encode_len(len(val)) + + class TLV_IE_Collection(metaclass=TlvCollectionMeta): # we specify the metaclass so any downstream subclasses will automatically use it """A TLV_IE_Collection consists of multiple TLV_IE classes identified by their tags. diff --git a/pySim/utils.py b/pySim/utils.py index 6523d98..9df2698 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -358,6 +358,41 @@ return (tagdict, length, value, remainder) +def dgi_parse_tag_raw(binary: bytes) -> Tuple[int, bytes]: + # In absence of any clear spec guidance we assume it's always 16 bit + return int.from_bytes(binary[:2], 'big'), binary[2:] + +def dgi_encode_tag(t) -> bytes: + return t.to_bytes(2, 'big') + +def dgi_encode_len(length: int) -> bytes: + """Encode a single Length value according to GlobalPlatform Systems Scripting Language + Specification v1.1.0 Annex B. + Args: + length : length value to be encoded + Returns: + binary output data of encoded length field + """ + if length < 255: + return length.to_bytes(1, 'big') + elif length <= 0xffff: + return b'\xff' + length.to_bytes(2, 'big') + else: + raise ValueError("Length > 32bits not supported") + +def dgi_parse_len(binary: bytes) -> Tuple[int, bytes]: + """Parse a single Length value according to GlobalPlatform Systems Scripting Language + Specification v1.1.0 Annex B. + Args: + binary : binary input data of BER-TLV length field + Returns: + Tuple of (length, remainder) + """ + if binary[0] == 255: + return ((binary[0] << 8) | binary[1:]), binary[2:] + else: + return binary[0], binary[1:] + # IMSI encoded format: # For IMSI 0123456789ABCDE: # -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35556?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie29ab7eb39f3165f3d695fcc1f02051338095697 Gerrit-Change-Number: 35556 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: ctrl: Add ms max power
by matanp 14 Jan '24

14 Jan '24

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email ) Change subject: ctrl: Add ms max power ...................................................................... ctrl: Add ms max power Change-Id: I703057b0ad15ca56abf2b6223d5a5f4b33d944d8 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/35555/1 diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index f4e13a1..acbe68a 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -253,6 +253,7 @@ CTRL_CMD_DEFINE_RANGE(bts_bsic, "bsic", struct gsm_bts, bsic, 0, 63); CTRL_CMD_DEFINE_RANGE(bts_rach_max_delay, "rach-max-delay", struct gsm_bts, rach_max_delay, 1, 127); CTRL_CMD_DEFINE_RANGE(bts_rach_expiry_timeout, "rach-expiry-timeout", struct gsm_bts, rach_expiry_timeout, 4, 64); +CTRL_CMD_DEFINE_RANGE(bts_ms_max_power, "ms-max-power", struct gsm_bts, ms_max_power, 0, 40); static int set_bts_apply_config(struct ctrl_cmd *cmd, void *data) { @@ -1515,6 +1516,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_offset); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_penalty_time); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_hysteresis); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_ms_max_power); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_radio_link_timeout); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rxlev_access_min); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35555?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I703057b0ad15ca56abf2b6223d5a5f4b33d944d8 Gerrit-Change-Number: 35555 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: ctrl: Add rach max transmission
by matanp 14 Jan '24

14 Jan '24

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email ) Change subject: ctrl: Add rach max transmission ...................................................................... ctrl: Add rach max transmission Change-Id: I34c92cbbcaa46235481a491f4c6ff723b671fff1 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/35554/1 diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 0c6e280..f4e13a1 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -1382,6 +1382,39 @@ CTRL_CMD_DEFINE(bts_rach_cell_barred, "rach-cell-barred"); +static int verify_bts_rach_max_trans(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int max_trans = atoi(cmd->value); + + if ((max_trans != 1) && (max_trans != 2) && (max_trans != 4) && (max_trans != 7)) + return 1; + + return 0; +} + +static int get_bts_rach_max_trans(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + cmd->reply = talloc_asprintf(cmd, "%u", rach_max_trans_raw2val(bts->si_common.rach_control.max_trans)); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_bts_rach_max_trans(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + bts->si_common.rach_control.max_trans = rach_max_trans_val2raw(atoi(cmd->value)); + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(bts_rach_max_trans, "rach-max-transmission"); + /* Return space concatenated set of tuples <UARFCN>,<scrambling code>,<diversity bit> */ static int get_bts_neighbor_list_si2quater_uarfcn(struct ctrl_cmd *cmd, void *data) { @@ -1488,6 +1521,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_bar); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_allow); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_cell_barred); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_max_trans); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si2quater_uarfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si2quater_earfcn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35554?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I34c92cbbcaa46235481a491f4c6ff723b671fff1 Gerrit-Change-Number: 35554 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 0