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

[L] Change in osmo-hnbgw[master]: sccp: allow separate cs7 for IuPS and IuCS

by pespin

Attention is currently required from: neels, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323 ) Change subject: sccp: allow separate cs7 for IuPS and IuCS ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: As said, I'll add a +1 when you provide a .cfg file in the commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea1824f1c586723d989c80a909bae16bd2866e08 Gerrit-Change-Number: 32323 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 May 2023 08:33:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in libosmocore[master]: gpsr_ns2_udp: Use osmo_io_fd instead of osmo_fd

by pespin

Attention is currently required from: laforge, daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30936 ) Change subject: gpsr_ns2_udp: Use osmo_io_fd instead of osmo_fd ...................................................................... Patch Set 11: (1 comment) File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/30936/comment/3ffa88d4_e8b36a8c PS11, Line 226: const struct msgb *msg, > do we need to register an empty call-back function if it does nothing? shouldn't we simply allow reg […] See my "Answering myself here" previous comment in this commit. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id776d2d9f35c304620f3d5b94492148dd987f5a0 Gerrit-Change-Number: 30936 Gerrit-PatchSet: 11 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 02 May 2023 08:31:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add getting neighbor list

by matanp

Attention is currently required from: fixeria. matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32565 ) Change subject: ctrl: Add getting neighbor list ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/bts_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/32565/comment/7209665a_1a1e39b8 PS1, Line 543: si2 > For the sake of consistency with existing `neighbor-list {add,del,mode}` commands, I would omit the […] Yes, I planned the next commit to be with `si5` for the `manual-si5` mode -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icba0b7d92f4c67e617d707ca651d674f0d1ba8a7 Gerrit-Change-Number: 32565 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 May 2023 06:51:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add getting neighbor list

by fixeria

Attention is currently required from: matanp. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32565 ) Change subject: ctrl: Add getting neighbor list ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/bts_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/32565/comment/6cb0f4bf_3c4f4ee7 PS1, Line 543: si2 For the sake of consistency with existing `neighbor-list {add,del,mode}` commands, I would omit the `si2` here. Is there anything specific to `System Information Type 2`? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icba0b7d92f4c67e617d707ca651d674f0d1ba8a7 Gerrit-Change-Number: 32565 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Tue, 02 May 2023 06:24:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add getting neighbor list

by matanp

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32565 ) Change subject: ctrl: Add getting neighbor list ...................................................................... ctrl: Add getting neighbor list Change-Id: Icba0b7d92f4c67e617d707ca651d674f0d1ba8a7 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/32565/1 diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 7f4413f..ecd58f4 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -514,6 +514,34 @@ CTRL_CMD_DEFINE(bts_c0_power_red, "c0-power-reduction"); +static int get_bts_neighbor_list_si2(struct ctrl_cmd *cmd, void *data) +{ + int i; + const struct gsm_bts *bts = cmd->node; + const struct bitvec *bv = &bts->si_common.neigh_list; + + cmd->reply = talloc_strdup(cmd, ""); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + for (i = 0; i < bv->data_len * 8; i++) { + if (!bitvec_get_bit_pos(bv, i)) + continue; + + cmd->reply = talloc_asprintf_append(cmd->reply, i == 0 ? "%u" : " %u", i); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + } + + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_RO(bts_neighbor_list_si2, "neighbor-list si2"); + static int verify_bts_neighbor_list_add_del(struct ctrl_cmd *cmd, const char *value, void *_data) { int arfcn; @@ -976,6 +1004,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rf_state); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rf_states); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_c0_power_red); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si2); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_add); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_del); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_mode); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icba0b7d92f4c67e617d707ca651d674f0d1ba8a7 Gerrit-Change-Number: 32565 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add cell reselection hysteresis control

by matanp

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32515 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ctrl: Add cell reselection hysteresis control ...................................................................... ctrl: Add cell reselection hysteresis control Change-Id: Ia96f6656d99381c039a4b3fd02674215fbbaec91 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 48 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index bd8a442..e087f8d 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -802,6 +802,44 @@ CTRL_CMD_DEFINE(bts_cell_reselection_penalty_time, "cell-reselection-penalty-time"); +static int verify_bts_cell_reselection_hysteresis(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + const int cell_reselection_hysteresis = atoi(value); + + if (cell_reselection_hysteresis < 0 || cell_reselection_hysteresis > 14) { + cmd->reply = "Value is out of range"; + return 1; + } else if (cell_reselection_hysteresis % 2 != 0) { + cmd->reply = "Value must be even"; + return 1; + } + + return 0; +} + +static int get_bts_cell_reselection_hysteresis(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + cmd->reply = talloc_asprintf(cmd, "%u", bts->si_common.cell_sel_par.cell_resel_hyst * 2); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_bts_cell_reselection_hysteresis(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + bts->si_common.cell_sel_par.cell_resel_hyst = atoi(cmd->value) / 2; + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(bts_cell_reselection_hysteresis, "cell-reselection-hysteresis"); + int bsc_bts_ctrl_cmds_install(void) { int rc = 0; @@ -826,6 +864,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_del_uarfcn); 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 |= neighbor_ident_ctrl_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia96f6656d99381c039a4b3fd02674215fbbaec91 Gerrit-Change-Number: 32515 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add setting access control class

by matanp

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32520 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ctrl: Add setting access control class ...................................................................... ctrl: Add setting access control class Change-Id: I7abbf0adc3798e9224834a68d7cdce4bbe03c9a3 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 88 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved matanp: Verified Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 2d714a8..7f4413f 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -882,6 +882,83 @@ CTRL_CMD_DEFINE_RO(bts_rach_access_control_class, "rach-access-control-classes"); +static int verify_access_control_class(struct ctrl_cmd *cmd, const char *value) +{ + int acc; + + if (strcmp(value, "emergency") == 0) + return 0; + + acc = atoi(value); + + if (acc < 0 || acc > 15) { + cmd->reply = "Value is out of range"; + return 1; + } else if (acc == 10) { + cmd->reply = "Access control class 10 does not exist, consider using \"emergency\" instead"; + return 1; + } + + return 0; +} + +static int set_access_control_class(struct ctrl_cmd *cmd, bool allow) +{ + int acc; + struct gsm_bts *bts = cmd->node; + + if (strcmp(cmd->value, "emergency") == 0) { + if (allow) + bts->si_common.rach_control.t2 &= ~0x4; + else + bts->si_common.rach_control.t2 |= 0x4; + cmd->reply = "OK"; + return CTRL_CMD_REPLY; + } + + acc = atoi(cmd->value); + if (acc < 8) + if (allow) + bts->si_common.rach_control.t3 &= ~(0x1 << acc); + else + bts->si_common.rach_control.t3 |= (0x1 << acc); + else + if (allow) + bts->si_common.rach_control.t2 &= ~(0x1 << (acc - 8)); + else + bts->si_common.rach_control.t2 |= (0x1 << (acc - 8)); + + if (acc < 10) + acc_mgr_perm_subset_changed(&bts->acc_mgr, &bts->si_common.rach_control); + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +static int verify_bts_rach_access_control_class_bar(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_access_control_class(cmd, value); +} + +static int set_bts_rach_access_control_class_bar(struct ctrl_cmd *cmd, void *data) +{ + return set_access_control_class(cmd, false); +} + +CTRL_CMD_DEFINE_WO(bts_rach_access_control_class_bar, "rach-access-control-class bar"); + +static int verify_bts_rach_access_control_class_allow(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_access_control_class(cmd, value); +} + +static int set_bts_rach_access_control_class_allow(struct ctrl_cmd *cmd, void *data) +{ + return set_access_control_class(cmd, true); +} + +CTRL_CMD_DEFINE_WO(bts_rach_access_control_class_allow, "rach-access-control-class allow"); + int bsc_bts_ctrl_cmds_install(void) { int rc = 0; @@ -908,6 +985,8 @@ 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_rach_access_control_class); + 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 |= neighbor_ident_ctrl_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7abbf0adc3798e9224834a68d7cdce4bbe03c9a3 Gerrit-Change-Number: 32520 Gerrit-PatchSet: 5 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add getting access control class

by matanp

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32519 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ctrl: Add getting access control class ...................................................................... ctrl: Add getting access control class Change-Id: I279249f9047f5edacc9edf3d231e3e74023fc84e --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 52 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index e087f8d..2d714a8 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -840,6 +840,48 @@ CTRL_CMD_DEFINE(bts_cell_reselection_hysteresis, "cell-reselection-hysteresis"); +/* Return space concatenated set of pairs <class>,<barred/allowed> */ +static int get_bts_rach_access_control_class(struct ctrl_cmd *cmd, void *data) +{ + int i; + const struct gsm_bts *bts = cmd->node; + + cmd->reply = talloc_strdup(cmd, ""); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + for (i = 0; i < 8; i++) { + cmd->reply = talloc_asprintf_append(cmd->reply, + i == 0 ? "%u,%s" : " %u,%s", + i, bts->si_common.rach_control.t3 & (0x1 << i) ? "barred" : "allowed"); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + } + + for (i = 0; i < 8; i++) { + if (i != 2) + cmd->reply = talloc_asprintf_append(cmd->reply, + " %u,%s", + i + 8, bts->si_common.rach_control.t2 & (0x1 << i) ? "barred" : "allowed"); + else + cmd->reply = talloc_asprintf_append(cmd->reply, + " emergency,%s", + bts->si_common.rach_control.t2 & (0x1 << i) ? "barred" : "allowed"); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + } + + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_RO(bts_rach_access_control_class, "rach-access-control-classes"); + int bsc_bts_ctrl_cmds_install(void) { int rc = 0; @@ -865,6 +907,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_rach_access_control_class); rc |= neighbor_ident_ctrl_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I279249f9047f5edacc9edf3d231e3e74023fc84e Gerrit-Change-Number: 32519 Gerrit-PatchSet: 5 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add setting access control class

by matanp

Attention is currently required from: daniel. matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32520 ) Change subject: ctrl: Add setting access control class ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7abbf0adc3798e9224834a68d7cdce4bbe03c9a3 Gerrit-Change-Number: 32520 Gerrit-PatchSet: 5 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 19:16:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add penalty time control

by matanp

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32498 ) Change subject: ctrl: Add penalty time control ...................................................................... ctrl: Add penalty time control The penalty time gives the duration for which the temporary offset is applied. Change-Id: Idfdd54dec72fb5f52eee22df018161d75b8c48c8 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 74 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 5ac1e0d..bd8a442 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -741,6 +741,67 @@ CTRL_CMD_DEFINE(bts_cell_reselection_offset, "cell-reselection-offset"); +static int verify_bts_cell_reselection_penalty_time(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int penalty_time; + + if (strcmp(value, "reserved") == 0) + return 0; + + penalty_time = atoi(value); + + if (penalty_time < 20 || penalty_time > 620) { + cmd->reply = "Value is out of range"; + return 1; + } else if (penalty_time % 20 != 0) { + cmd->reply = "Value must be a multiple of 20"; + return 1; + } + + return 0; +} + +/* According to 3GPP TS 45.008, PENALTY_TIME in the Control parameters section */ +static int get_bts_cell_reselection_penalty_time(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + if (!bts->si_common.cell_ro_sel_par.present) { + cmd->reply = "0"; + return CTRL_CMD_REPLY; + } + + if (bts->si_common.cell_ro_sel_par.penalty_time == 31) { + cmd->reply = "reserved"; + return CTRL_CMD_REPLY; + } + + /* Calculate the penalty time in seconds */ + cmd->reply = talloc_asprintf(cmd, "%u", (bts->si_common.cell_ro_sel_par.penalty_time * 20) + 20); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_bts_cell_reselection_penalty_time(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + bts->si_common.cell_ro_sel_par.present = 1; + + if (strcmp(cmd->value, "reserved") == 0) + bts->si_common.cell_ro_sel_par.penalty_time = 31; + else + bts->si_common.cell_ro_sel_par.penalty_time = (atoi(cmd->value) - 20) / 20; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(bts_cell_reselection_penalty_time, "cell-reselection-penalty-time"); + int bsc_bts_ctrl_cmds_install(void) { int rc = 0; @@ -764,6 +825,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_del_earfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_del_uarfcn); 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 |= neighbor_ident_ctrl_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idfdd54dec72fb5f52eee22df018161d75b8c48c8 Gerrit-Change-Number: 32498 Gerrit-PatchSet: 7 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-pcu[master]: er_ccu_l1_if: use one ccu_desr per timeslot

by fixeria

Attention is currently required from: laforge, pespin, keith, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32423 ) Change subject: er_ccu_l1_if: use one ccu_desr per timeslot ...................................................................... Patch Set 2: (1 comment) File src/ericsson-rbs/er_ccu_descr.h: https://gerrit.osmocom.org/c/osmo-pcu/+/32423/comment/f63b3502_4ae42410 PS1, Line 52: 8 > I am also not so happy with this. I was searching for a define constant, but I couldn't fine one. […] I wouldn't bother adding this to libosmocore. It's a well-known constant for everyone working with GSM, which is not that hard to remember (compared to number of frames in a multiframe, for instance). I am fine with writing `foo[8]` in `*.h` files and then using `ARRAY_SIZE(foo)` in `*.c` files. Maybe clarify the field name a but? How about `ts_ccu_descr` or `per_ts_ccu_descr`? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I09a51f34ce0edef79a797c4686c7b1d27c376e49 Gerrit-Change-Number: 32423 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 17:48:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-bts[master]: oml: gsm_objclass2{mo,obj}(): cosmetic: return immediately

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32563 ) Change subject: oml: gsm_objclass2{mo,obj}(): cosmetic: return immediately ...................................................................... oml: gsm_objclass2{mo,obj}(): cosmetic: return immediately Change-Id: Ie2fb927ac7f71103a1e0e693718771dd36139223 Related: OS#5966 --- M src/common/oml.c 1 file changed, 28 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/32563/1 diff --git a/src/common/oml.c b/src/common/oml.c index 7ab1bc2..9d9778e 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1739,49 +1739,40 @@ enum abis_nm_nack_cause *c) { struct gsm_bts_trx *trx; - struct gsm_abis_mo *mo = NULL; switch (obj_class) { case NM_OC_BTS: - mo = &bts->mo; - break; + return &bts->mo; case NM_OC_RADIO_CARRIER: if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) goto nm_nack_trxnr_unkn; - mo = &trx->mo; - break; + return &trx->mo; case NM_OC_BASEB_TRANSC: if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) goto nm_nack_trxnr_unkn; - mo = &trx->bb_transc.mo; - break; + return &trx->bb_transc.mo; case NM_OC_CHANNEL: if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) goto nm_nack_trxnr_unkn; if (obj_inst->ts_nr >= TRX_NR_TS) goto nm_nack_objinst_unkn; - mo = &trx->ts[obj_inst->ts_nr].mo; - break; + return &trx->ts[obj_inst->ts_nr].mo; case NM_OC_SITE_MANAGER: - mo = &g_bts_sm->mo; - break; + return &g_bts_sm->mo; case NM_OC_GPRS_NSE: if (obj_inst->bts_nr > 0) goto nm_nack_objinst_unkn; - mo = &g_bts_sm->gprs.nse.mo; - break; + return &g_bts_sm->gprs.nse.mo; case NM_OC_GPRS_CELL: - mo = &bts->gprs.cell.mo; - break; + return &bts->gprs.cell.mo; case NM_OC_GPRS_NSVC: if (obj_inst->bts_nr > 0) goto nm_nack_objinst_unkn; if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) goto nm_nack_objinst_unkn; - mo = &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr].mo; - break; + return &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr].mo; } - return mo; + return NULL; nm_nack_trxnr_unkn: if (c != NULL) @@ -1800,49 +1791,40 @@ enum abis_nm_nack_cause *c) { struct gsm_bts_trx *trx; - void *obj = NULL; switch (obj_class) { case NM_OC_BTS: - obj = bts; - break; + return bts; case NM_OC_RADIO_CARRIER: if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) goto nm_nack_trxnr_unkn; - obj = trx; - break; + return trx; case NM_OC_BASEB_TRANSC: if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) goto nm_nack_trxnr_unkn; - obj = &trx->bb_transc; - break; + return &trx->bb_transc; case NM_OC_CHANNEL: if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) goto nm_nack_trxnr_unkn; if (obj_inst->ts_nr >= TRX_NR_TS) goto nm_nack_objinst_unkn; - obj = &trx->ts[obj_inst->ts_nr]; - break; + return &trx->ts[obj_inst->ts_nr]; case NM_OC_SITE_MANAGER: - obj = g_bts_sm; - break; + return g_bts_sm; case NM_OC_GPRS_NSE: if (obj_inst->bts_nr > 0) goto nm_nack_objinst_unkn; - obj = &g_bts_sm->gprs.nse; - break; + return &g_bts_sm->gprs.nse; case NM_OC_GPRS_CELL: - obj = &bts->gprs.cell; - break; + return &bts->gprs.cell; case NM_OC_GPRS_NSVC: if (obj_inst->bts_nr > 0) goto nm_nack_objinst_unkn; if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) goto nm_nack_objinst_unkn; - obj = &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr]; - break; + return &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr]; } - return obj; + return NULL; nm_nack_trxnr_unkn: if (c != NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie2fb927ac7f71103a1e0e693718771dd36139223 Gerrit-Change-Number: 32563 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-bts[master]: oml: gsm_objclass2{mo,obj}(): set cause for unknown obj_class

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32564 ) Change subject: oml: gsm_objclass2{mo,obj}(): set cause for unknown obj_class ...................................................................... oml: gsm_objclass2{mo,obj}(): set cause for unknown obj_class This patch makes BTS_Tests_OML.TC_wrong_obj_class pass. Change-Id: I30e109a7c86e651fb7055a80ef0656d8563475c8 Fixes: OS#5966 --- M src/common/oml.c 1 file changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/32564/1 diff --git a/src/common/oml.c b/src/common/oml.c index 9d9778e..361f59e 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1740,7 +1740,7 @@ { struct gsm_bts_trx *trx; - switch (obj_class) { + switch ((enum abis_nm_obj_class)obj_class) { case NM_OC_BTS: return &bts->mo; case NM_OC_RADIO_CARRIER: @@ -1771,8 +1771,11 @@ if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) goto nm_nack_objinst_unkn; return &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr].mo; + default: + if (c != NULL) + *c = NM_NACK_OBJCLASS_NOTSUPP; + return NULL; } - return NULL; nm_nack_trxnr_unkn: if (c != NULL) @@ -1792,7 +1795,7 @@ { struct gsm_bts_trx *trx; - switch (obj_class) { + switch ((enum abis_nm_obj_class)obj_class) { case NM_OC_BTS: return bts; case NM_OC_RADIO_CARRIER: @@ -1823,8 +1826,11 @@ if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) goto nm_nack_objinst_unkn; return &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr]; + default: + if (c != NULL) + *c = NM_NACK_OBJCLASS_NOTSUPP; + return NULL; } - return NULL; nm_nack_trxnr_unkn: if (c != NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I30e109a7c86e651fb7055a80ef0656d8563475c8 Gerrit-Change-Number: 32564 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon: do not call l1sched_prim_dequeue() at ul_bid != 0

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32058 ) Change subject: trxcon: do not call l1sched_prim_dequeue() at ul_bid != 0 ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic0bbe2ab6c0ccd96c1f8af8aa17ac88adf7f88ed Gerrit-Change-Number: 32058 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 01 May 2023 12:52:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libosmocore[master]: vty: fix vty->index for implicit go_parent_node

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32562 ) Change subject: vty: fix vty->index for implicit go_parent_node ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File include/osmocom/vty/vty.h: https://gerrit.osmocom.org/c/libosmocore/+/32562/comment/ed6e0b2c_856dbc3c PS1, Line 64: void *index; Better add new fields at the end of struct? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id408c678d18ba19b1c1394c3fb657536153d2094 Gerrit-Change-Number: 32562 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 06:52:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in libosmocore[master]: vty: show bug in implicit go_parent_node

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32561 ) Change subject: vty: show bug in implicit go_parent_node ...................................................................... Patch Set 1: (1 comment) File tests/vty/vty_transcript_test.c: https://gerrit.osmocom.org/c/libosmocore/+/32561/comment/72973edc_92f06250 PS1, Line 344: talloc_asprintf(root_ctx, argv[0]); `-Werror=format-security`: should be `...(root_ctx, "%s", argv[0]);`. But I think we can simply use `talloc_strdup()` here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2472daed7436a1947655b06d34eb217e595bc7f3 Gerrit-Change-Number: 32561 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 06:25:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add setting access control class

by fixeria

Attention is currently required from: daniel, matanp. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32520 ) Change subject: ctrl: Add setting access control class ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7abbf0adc3798e9224834a68d7cdce4bbe03c9a3 Gerrit-Change-Number: 32520 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Mon, 01 May 2023 06:06:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add getting access control class

by fixeria

Attention is currently required from: laforge, daniel, matanp. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32519 ) Change subject: ctrl: Add getting access control class ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I279249f9047f5edacc9edf3d231e3e74023fc84e Gerrit-Change-Number: 32519 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Mon, 01 May 2023 06:06:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add cell reselection hysteresis control

by fixeria

Attention is currently required from: pespin, matanp. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32515 ) Change subject: ctrl: Add cell reselection hysteresis control ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia96f6656d99381c039a4b3fd02674215fbbaec91 Gerrit-Change-Number: 32515 Gerrit-PatchSet: 3 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Mon, 01 May 2023 06:05:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: ctrl: Add penalty time control

by fixeria

Attention is currently required from: pespin, matanp, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32498 ) Change subject: ctrl: Add penalty time control ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idfdd54dec72fb5f52eee22df018161d75b8c48c8 Gerrit-Change-Number: 32498 Gerrit-PatchSet: 6 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 06:04:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in libosmocore[master]: vty: show bug in implicit go_parent_node

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32561 ) Change subject: vty: show bug in implicit go_parent_node ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/32561/comment/4e42409e_87f30a8d PS1, Line 26: there is no legacy vty_go_parent() function that sets the correct : index via a switch(). maybe we should get rid of all of those vty_go_parent legacy functions in master, at least after a libosmocore containing this current fix has been releaesd? if you agree, feel free to create a related issue and self-assign it. thanks. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2472daed7436a1947655b06d34eb217e595bc7f3 Gerrit-Change-Number: 32561 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 02:52:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon: use non-blocking stderr logging by default

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32518 ) Change subject: trxcon: use non-blocking stderr logging by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8cbfd9b4644f8442cbedc7e452ba79816923fc10 Gerrit-Change-Number: 32518 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 02:50:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in libosmocore[master]: vty: show bug in implicit go_parent_node

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32561 ) Change subject: vty: show bug in implicit go_parent_node ...................................................................... vty: show bug in implicit go_parent_node Add test to show a problem in VTY node exiting. Back in 2017 when I introduced VTY config file scopes by indenting [1], I actually mistook the vty->priv for the vty->index that we use everywhere to link to the state for our VTY nodes. The intention was that each VTY node child level has its own object linked to it by the vty->index pointer. When the config file leaves a scope, the vty->index should reflect the parent object. Instead I implemented that for the vty->priv pointer only, but we don't use that. Why did this bug not show? A problem happens only if: - a node that uses vty->index is nested inside a node that also uses vty->index. - config sets parent node attributes after a child node. - there is no legacy vty_go_parent() function that sets the correct index via a switch(). [1] "VTY: implicit node exit by de-indenting, not parent lookup" 4a31ffa2f0097d96201f80305a0495c57552f0ad I24cbb3f6de111f2d31110c3c484c066f1153aac9 Change-Id: I2472daed7436a1947655b06d34eb217e595bc7f3 --- M tests/vty/vty_transcript_test.c M tests/vty/vty_transcript_test.vty 2 files changed, 138 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/32561/1 diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c index 1754b67..ccef927 100644 --- a/tests/vty/vty_transcript_test.c +++ b/tests/vty/vty_transcript_test.c @@ -211,6 +211,9 @@ enum { ATTR_TEST_NODE = _LAST_OSMOVTY_NODE + 1, + NEST_A_NODE, + NEST_B_NODE, + NEST_C_NODE, }; static struct cmd_node attr_test_node = { @@ -315,6 +318,62 @@ return CMD_SUCCESS; } +static struct cmd_node nest_a_node = { + NEST_A_NODE, + "%s(config-a)# ", + 1 +}; + +static struct cmd_node nest_b_node = { + NEST_B_NODE, + "%s(config-b)# ", + 1 +}; + +static struct cmd_node nest_c_node = { + NEST_C_NODE, + "%s(config-c)# ", + 1 +}; + +DEFUN(cfg_nest_a, cfg_nest_a_cmd, + "nest NAME", + "Enter nest level a\n" + "Set a name to mark the node's state\n") +{ + vty->index = talloc_asprintf(root_ctx, argv[0]); + vty->node = NEST_A_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_nest_b, cfg_nest_b_cmd, + "nest NAME", + "Enter nest level b\n" + "Set a name to mark the node's state\n") +{ + vty->index = talloc_asprintf(root_ctx, argv[0]); + vty->node = NEST_B_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_nest_c, cfg_nest_c_cmd, + "nest NAME", + "Enter nest level c\n" + "Set a name to mark the node's state\n") +{ + vty->index = talloc_asprintf(root_ctx, argv[0]); + vty->node = NEST_C_NODE; + return CMD_SUCCESS; +} + +DEFUN(cfg_nest_state, cfg_nest_state_cmd, + "state", + "Show this node's mark\n") +{ + vty_out(vty, "%s%s", (const char *)vty->index, VTY_NEWLINE); + return CMD_SUCCESS; +} + static void init_vty_cmds(void) { install_element_ve(&single0_cmd); @@ -336,6 +395,17 @@ install_element(ATTR_TEST_NODE, &cfg_app_attr_unbelievable_magnificent_cmd); install_element(ATTR_TEST_NODE, &cfg_app_attr_unbelievable_wonderful_cmd); install_element(ATTR_TEST_NODE, &cfg_attr_hidden_app_attr_unbelievable_cmd); + + install_element(CONFIG_NODE, &cfg_nest_a_cmd); + install_node(&nest_a_node, NULL); + install_element(NEST_A_NODE, &cfg_nest_b_cmd); + install_node(&nest_b_node, NULL); + install_element(NEST_B_NODE, &cfg_nest_c_cmd); + install_node(&nest_c_node, NULL); + + install_element(NEST_A_NODE, &cfg_nest_state_cmd); + install_element(NEST_B_NODE, &cfg_nest_state_cmd); + install_element(NEST_C_NODE, &cfg_nest_state_cmd); } int main(int argc, char **argv) diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index 7b8241e..79c9f4c 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -177,3 +177,37 @@ [expert-mode] But can be seen in the expert mode vty_transcript_test(config-attr-test)# app-hidden-unbelievable? app-hidden-unbelievable Hidden, but still unbelievable help message + +vty_transcript_test(config-attr-test)# exit + +vty_transcript_test(config)# nest A +vty_transcript_test(config-a)# state +A +vty_transcript_test(config-a)# nest B +vty_transcript_test(config-b)# state +B +vty_transcript_test(config-b)# nest C +vty_transcript_test(config-c)# state +C +vty_transcript_test(config-c)# exit +vty_transcript_test(config-b)# state +C +vty_transcript_test(config-b)# ### ^ EXPECTED ERROR: this should say B +vty_transcript_test(config-b)# exit +vty_transcript_test(config-a)# state +C +vty_transcript_test(config-a)# ### ^ EXPECTED ERROR: this should say A +vty_transcript_test(config-a)# nest B2 +vty_transcript_test(config-b)# state +B2 +vty_transcript_test(config-b)# nest C2 +vty_transcript_test(config-c)# state +C2 +vty_transcript_test(config-c)# exit +vty_transcript_test(config-b)# state +C2 +vty_transcript_test(config-b)# ### ^ EXPECTED ERROR: this should say B2 +vty_transcript_test(config-b)# exit +vty_transcript_test(config-a)# state +C2 +vty_transcript_test(config-a)# ### ^ EXPECTED ERROR: this should say A -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2472daed7436a1947655b06d34eb217e595bc7f3 Gerrit-Change-Number: 32561 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in libosmocore[master]: vty: fix vty->index for implicit go_parent_node

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32562 ) Change subject: vty: fix vty->index for implicit go_parent_node ...................................................................... vty: fix vty->index for implicit go_parent_node After this patch, most vty_go_parent() functions are really obsolete, as originally intended: A vty_go_parent() is only needed if the program requires an action to run on VTY node exit. vty_transcript_test.vty shows the fixed behavior. For details, see preceding patch "vty: show bug in implicit go_parent_node" I2472daed7436a1947655b06d34eb217e595bc7f3 Change-Id: Id408c678d18ba19b1c1394c3fb657536153d2094 --- M include/osmocom/vty/vty.h M src/vty/command.c M tests/vty/vty_transcript_test.vty 3 files changed, 27 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/32562/1 diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h index ed9f439..155501e 100644 --- a/include/osmocom/vty/vty.h +++ b/include/osmocom/vty/vty.h @@ -61,6 +61,7 @@ /*! private data, specified by creator */ void *priv; + void *index; /*! Node status of this vty */ int node; diff --git a/src/vty/command.c b/src/vty/command.c index 1e76474..a60b544 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -2438,6 +2438,7 @@ llist_del(&parent->entry); vty->node = parent->node; vty->priv = parent->priv; + vty->index = parent->index; if (vty->indent) talloc_free(vty->indent); vty->indent = parent->indent; @@ -2648,6 +2649,7 @@ struct vty_parent_node this_node = { .node = vty->node, .priv = vty->priv, + .index = vty->index, .indent = vty->indent, }; struct vty_parent_node *parent = vty_parent(vty); @@ -2923,6 +2925,7 @@ this_node = (struct vty_parent_node){ .node = vty->node, .priv = vty->priv, + .index = vty->index, .indent = vty->indent, }; diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index 79c9f4c..7df2a60 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -191,12 +191,10 @@ C vty_transcript_test(config-c)# exit vty_transcript_test(config-b)# state -C -vty_transcript_test(config-b)# ### ^ EXPECTED ERROR: this should say B +B vty_transcript_test(config-b)# exit vty_transcript_test(config-a)# state -C -vty_transcript_test(config-a)# ### ^ EXPECTED ERROR: this should say A +A vty_transcript_test(config-a)# nest B2 vty_transcript_test(config-b)# state B2 @@ -205,9 +203,7 @@ C2 vty_transcript_test(config-c)# exit vty_transcript_test(config-b)# state -C2 -vty_transcript_test(config-b)# ### ^ EXPECTED ERROR: this should say B2 +B2 vty_transcript_test(config-b)# exit vty_transcript_test(config-a)# state -C2 -vty_transcript_test(config-a)# ### ^ EXPECTED ERROR: this should say A +A -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id408c678d18ba19b1c1394c3fb657536153d2094 Gerrit-Change-Number: 32562 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix log msg typo 'Unsupportedccept'

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32529 ) Change subject: fix log msg typo 'Unsupportedccept' ...................................................................... fix log msg typo 'Unsupportedccept' Change-Id: I8e334ec84809b69bfff36f95adf21f6e6ae041e1 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index a504e4a..395cca7 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -323,7 +323,7 @@ break; default: - LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Unsupportedccept UE ID (present=%d)\n", ue_id->present); + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Unsupported HNBAP UE Identity type (present=%d)\n", ue_id->present); return -1; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I8e334ec84809b69bfff36f95adf21f6e6ae041e1 Gerrit-Change-Number: 32529 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: less code dup in mem free of hnbgw_rx_ue_register_req()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32528 ) Change subject: less code dup in mem free of hnbgw_rx_ue_register_req() ...................................................................... less code dup in mem free of hnbgw_rx_ue_register_req() Related: SYS#6297 Change-Id: I433127f90bf6f82baf33c516f327f84d081ad69c --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 15 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 980c6b0..a504e4a 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -518,13 +518,12 @@ else rc = hnbgw_tx_ue_register_rej_tmsi(ctx, &ies.uE_Identity); /* all has been handled by TMSI, skip the IMSI code below */ - hnbap_free_ueregisterrequesties(&ies); - return rc; + goto free_and_return_rc; default: LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "UE-REGISTER-REQ with unsupported UE Id type %d\n", ies.uE_Identity.present); - hnbap_free_ueregisterrequesties(&ies); - return rc; + rc = -ENOTSUP; + goto free_and_return_rc; } LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "UE-REGISTER-REQ ID_type=%d imsi=%s cause=%ld\n", @@ -534,7 +533,6 @@ if (!ue) ue = ue_allocated = ue_context_alloc(ctx, imsi, 0); - hnbap_free_ueregisterrequesties(&ies); /* Send UERegisterAccept */ rc = hnbgw_tx_ue_register_acc(ue); if (rc < 0) { @@ -543,6 +541,8 @@ if (ue_allocated) ue_context_free(ue_allocated); } +free_and_return_rc: + hnbap_free_ueregisterrequesties(&ies); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I433127f90bf6f82baf33c516f327f84d081ad69c Gerrit-Change-Number: 32528 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 ) Change subject: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff ...................................................................... hnbgw: add TC_sccp_cr_limit: test CR data length cutoff Depends: If35697234796af8943691b2de62218e7dc93a08c libosmo-sccp Change-Id: Ia68dad973ef18513b52f5accb5264c557c7295ea --- M hnbgw/HNBGW_Tests.ttcn M library/Osmocom_Types.ttcn 2 files changed, 143 insertions(+), 28 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index e9693fe..698c1a2 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -181,7 +181,8 @@ boolean ps_domain, MgcpParameters mgcp_pars optional, HnbConfig hnb optional, - boolean separate_sccp_cr, + boolean expect_separate_sccp_cr, + integer tx_sccp_cr_data_len, charstring pfcp_local_addr } @@ -557,7 +558,7 @@ } /* create an expect on the Iu side for the random NAS portion */ - if (g_pars.separate_sccp_cr) { + if (g_pars.expect_separate_sccp_cr) { f_ran_register_sccp_cr_without_payload(); } else { var template (omit) octetstring nas := f_ranap_extract_l3(valueof(tx)); @@ -567,7 +568,7 @@ /* send it via Iuh (creating a RUA connection) */ RUA.send(RUA_Conn_Req:{g_pars.ps_domain, tx}); - if (g_pars.separate_sccp_cr) { + if (g_pars.expect_separate_sccp_cr) { /* Acknowledge the empty SCCP CR. RAN_Emulation does the confirmation, no need to respond. */ BSSAP.receive(tr_RANAP_Conn_Req()); } @@ -621,8 +622,8 @@ return rx; } -/* build a RANAP InitialUE based on the TestHdlrParams */ -friend function f_build_initial_ue(TestHdlrParams pars) return RANAP_PDU { +private function f_build_initial_ue_with_nas(TestHdlrParams pars, octetstring nas) + return RANAP_PDU { var LAI lai := { pLMNidentity := hex2oct(pars.hnb.lai.mcc_mnc), lAC := int2oct(pars.hnb.lai.lac, 2), @@ -634,27 +635,65 @@ sAC := int2oct(pars.hnb.sac, 2), iE_Extensions := omit } - var octetstring nas; - if (pars.separate_sccp_cr) { - /* SCCP CR has a payload length limit of 130 bytes. To trigger this limit, the RANAP + NAS PDU has to be - * > 130 bytes. It doesn't need to be 131 bytes in the NAS PDU alone, but let's just make it definitely - * large enough. */ - nas := f_rnd_octstring(131); - } else { - nas := f_rnd_octstring(10); - } var IuSignallingConnectionIdentifier sigc_id := int2bit(f_rnd_int(1000), 24); var GlobalRNC_ID grnc_id := { pLMNidentity := lai.pLMNidentity, rNC_ID := 2342 } - + var template RANAP_PDU ret; if (pars.ps_domain) { var RAC rac := '00'O; - return valueof(ts_RANAP_initialUE_PS(lai, rac, sai, nas, sigc_id, grnc_id)); + ret := ts_RANAP_initialUE_PS(lai, rac, sai, nas, sigc_id, grnc_id); } else { - return valueof(ts_RANAP_initialUE_CS(lai, sai, nas, sigc_id, grnc_id)); + ret := ts_RANAP_initialUE_CS(lai, sai, nas, sigc_id, grnc_id); } + return valueof(ret); +} + +/* build a RANAP InitialUE based on the TestHdlrParams */ +friend function f_build_initial_ue(TestHdlrParams pars) return RANAP_PDU { + + var octetstring nas; + + if (pars.tx_sccp_cr_data_len == 0) { + nas := f_rnd_octstring(10); + } else { + /* The test asks for an exact number of Optional Data bytes. */ + + /* First see what size the RANAP part of the payload data is, + * to adjust the NAS PDU size to the size requested by the test (pars.tx_sccp_cr_data_len). */ + var RANAP_PDU initial_ue := f_build_initial_ue_with_nas(pars, '00'O); + + var octetstring ranap_plus_one_byte_nas := enc_RANAP_PDU(initial_ue); + var integer ranap_length := lengthof(ranap_plus_one_byte_nas) - 1; + + log("ranap_plus_one_byte_nas = ", lengthof(ranap_plus_one_byte_nas), " bytes, ", initial_ue, " = ", + ranap_plus_one_byte_nas); + log("ranap_length = ", ranap_length); + + /* SCCP CR has a payload length limit of 130 bytes. To trigger this limit, the RANAP + NAS PDU has to be + * > 130 bytes. It doesn't need to be 131 bytes in the NAS PDU alone, but let's just make it definitely + * large enough. To test for this limit, pars.tx_sccp_cr_data_len asks for a specific amount of data len. */ + nas := f_rnd_octstring(pars.tx_sccp_cr_data_len - ranap_length); + } + + var RANAP_PDU ret := f_build_initial_ue_with_nas(pars, nas); + + if (pars.tx_sccp_cr_data_len != 0) { + for (var integer attempts := 0; attempts < 2; attempts := attempts + 1) { + var octetstring check_len := enc_RANAP_PDU(ret); + log("final RANAP PDU length = ", lengthof(check_len)); + if (lengthof(check_len) == pars.tx_sccp_cr_data_len) { + return ret; + } + nas := f_rnd_octstring(lengthof(nas) + (pars.tx_sccp_cr_data_len - lengthof(check_len))); + log("that was off, changed NAS length to ", lengthof(nas), " and trying again"); + ret := f_build_initial_ue_with_nas(pars, nas); + } + setverdict(fail, "Ended up with wrong Optional Data length"); + mtc.stop; + } + return ret; } /* build a RANAP RAB AssignmentResponse based on the TestHdlrParams */ @@ -756,12 +795,13 @@ private template (value) TestHdlrParams t_pars(integer imsi_suffix, boolean ps_domain := false, integer hnb_idx := 0, - boolean separate_sccp_cr := false) := { + boolean expect_separate_sccp_cr := false, integer tx_sccp_cr_data_len := 0) := { hnb_idx := hnb_idx, imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, hnb := omit, /* filled in later */ - separate_sccp_cr := separate_sccp_cr, + expect_separate_sccp_cr := expect_separate_sccp_cr, + tx_sccp_cr_data_len := tx_sccp_cr_data_len, pfcp_local_addr := mp_pfcp_ip_local } @@ -792,11 +832,17 @@ vc_conn.done; } -private function f_vty_set_sccp_cr_max_payload_len(TELNETasp_PT pt, integer val := 999999) +private function f_vty_set_sccp_max_optional_data(TELNETasp_PT pt, integer val := -1) { + var charstring valstr; + if (val < 0) { + valstr := "standard"; + } else { + valstr := int2str(val); + } f_vty_enter_config(pt); - f_vty_transceive(pt, "hnbgw"); - f_vty_transceive(pt, "sccp cr max-payload-len " & int2str(val)); + f_vty_transceive(pt, "cs7 instance 0"); + f_vty_transceive(pt, "sccp max-optional-data " & valstr); f_vty_transceive(pt, "end"); } @@ -807,13 +853,13 @@ f_init(); f_start_hnbs(); - f_vty_set_sccp_cr_max_payload_len(HNBGWVTY, 0); + f_vty_set_sccp_max_optional_data(HNBGWVTY, 0); - vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(1, separate_sccp_cr := true)); + vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(1, expect_separate_sccp_cr := true)); vc_conn.done; /* reset */ - f_vty_set_sccp_cr_max_payload_len(HNBGWVTY); + f_vty_set_sccp_max_optional_data(HNBGWVTY); } testcase TC_ranap_ps_initial_ue_empty_cr() runs on test_CT { var ConnHdlr vc_conn; @@ -822,13 +868,65 @@ f_init(); f_start_hnbs(); - f_vty_set_sccp_cr_max_payload_len(HNBGWVTY, 0); + f_vty_set_sccp_max_optional_data(HNBGWVTY, 0); - vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(2, true, separate_sccp_cr := true)); + vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(2, true, expect_separate_sccp_cr := true)); vc_conn.done; /* reset */ - f_vty_set_sccp_cr_max_payload_len(HNBGWVTY); + f_vty_set_sccp_max_optional_data(HNBGWVTY); +} + +type record Testdata_CR_Limit { + integer data_len, + integer max_optional_data, + boolean expect_separate_sccp_cr +}; +type record of Testdata_CR_Limit Testdata_CR_Limits; + +testcase TC_sccp_cr_limit() runs on test_CT { + g_num_hnbs := 1; + f_init(); + f_start_hnbs(); + + const Testdata_CR_Limits tests := { + { data_len := 130, max_optional_data := -1, expect_separate_sccp_cr := false }, + { data_len := 131, max_optional_data := -1, expect_separate_sccp_cr := true }, + + { data_len := 100, max_optional_data := 100, expect_separate_sccp_cr := false }, + { data_len := 101, max_optional_data := 100, expect_separate_sccp_cr := true }, + + { data_len := 200, max_optional_data := 200, expect_separate_sccp_cr := false }, + { data_len := 201, max_optional_data := 200, expect_separate_sccp_cr := true } + }; + + var integer csps; + for (csps := 0; csps < 2; csps := csps + 1) { + var boolean ps_domain := (csps > 0); + + var integer i; + for (i := 0; i < lengthof(tests); i := i + 1) { + var Testdata_CR_Limit t := tests[i]; + f_logp(HNBGWVTY, + "TEST PART TC_sccp_cr_limit ps_domain=" & f_bool2str(ps_domain) + & " data_len=" & int2str(t.data_len) + & " max_optional_data=" & int2str(t.max_optional_data) + & " expect_separate_sccp_cr=" & f_bool2str(t.expect_separate_sccp_cr) + ); + + f_vty_set_sccp_max_optional_data(HNBGWVTY, t.max_optional_data); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), + t_pars(100 + i, + ps_domain := ps_domain, + expect_separate_sccp_cr := t.expect_separate_sccp_cr, + tx_sccp_cr_data_len := t.data_len)); + vc_conn.done; + } + } + + /* reset */ + f_vty_set_sccp_max_optional_data(HNBGWVTY); } /* Reply to a received CRCX with an OK (or the reply configured in cpars), using the given parameters. diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index dc4fd65..52490ca 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -336,6 +336,13 @@ type record of ro_integer roro_integer; +function f_bool2str(boolean val) return charstring { + if (val) { + return "true"; + } else { + return "false"; + } +} } with { encode "RAW"; variant "FIELDORDER(msb)" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 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: Ia68dad973ef18513b52f5accb5264c557c7295ea Gerrit-Change-Number: 32362 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 ) Change subject: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff ...................................................................... Patch Set 3: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362/comment/72a0df6a_34fe… PS1, Line 625: private function f_build_initial__nas(TestHdlrParams pars, octetstring nas) > I wanted to make it like a "private" function, in C I'd have put a leading underscore. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 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: Ia68dad973ef18513b52f5accb5264c557c7295ea Gerrit-Change-Number: 32362 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 00:24:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 ) Change subject: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: re-add vote after trivial rename -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 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: Ia68dad973ef18513b52f5accb5264c557c7295ea Gerrit-Change-Number: 32362 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 01 May 2023 00:23:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 to look at the new patch set (#3). Change subject: hnbgw: add TC_sccp_cr_limit: test CR data length cutoff ...................................................................... hnbgw: add TC_sccp_cr_limit: test CR data length cutoff Depends: If35697234796af8943691b2de62218e7dc93a08c libosmo-sccp Change-Id: Ia68dad973ef18513b52f5accb5264c557c7295ea --- M hnbgw/HNBGW_Tests.ttcn M library/Osmocom_Types.ttcn 2 files changed, 143 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/32362/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32362 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: Ia68dad973ef18513b52f5accb5264c557c7295ea Gerrit-Change-Number: 32362 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: fix mscpool for large msc NRs

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32554 ) Change subject: fix mscpool for large msc NRs ...................................................................... fix mscpool for large msc NRs Use the proper type that can handle the entire range of MSC numbers we allow on the VTY, we have: #define MSC_NR_RANGE "<0-1000>" Before this patch, MSC pool round robin would glitch around for any 'msc' numbers 'msc 256' thru 'msc 1000'. Change-Id: I98bee022c1a78508554d2ff4a10fbce3c53f1128 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_08_08.c 2 files changed, 19 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6e81610..c2bd7ad 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -930,10 +930,10 @@ /* msc configuration */ struct llist_head mscs; - uint8_t mscs_round_robin_next_nr; + unsigned int mscs_round_robin_next_nr; /* Emergency calls potentially select a different set of MSCs, so to not mess up the normal round-robin * behavior, emergency calls need a separate round-robin counter. */ - uint8_t mscs_round_robin_next_emerg_nr; + unsigned int mscs_round_robin_next_emerg_nr; /* rf ctl related bits */ int mid_call_timeout; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 769cec4..692e35c 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -182,7 +182,7 @@ struct bsc_msc_data *msc_target = NULL; struct bsc_msc_data *msc_round_robin_next = NULL; struct bsc_msc_data *msc_round_robin_first = NULL; - uint8_t round_robin_next_nr; + unsigned int round_robin_next_nr; int16_t nri_v = -1; bool is_null_nri = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I98bee022c1a78508554d2ff4a10fbce3c53f1128 Gerrit-Change-Number: 32554 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: fix length check in abis_rsl_rx_rll()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32421 ) Change subject: fix length check in abis_rsl_rx_rll() ...................................................................... fix length check in abis_rsl_rx_rll() In abis_rsl_rx_rll(), we do the following header length check -- quick challenge, can you spot the two bugs hidden here? struct abis_rsl_rll_hdr *rllh; if (msgb_l2len(msg) > sizeof(struct abis_rsl_common_hdr) + sizeof(*rllh)) msg->l3h = &rllh->data[3]; Fix these bugs: - struct abis_rsl_common_hdr is already included as the first member of abis_rsl_rll_hdr, no need to add that. - We are going to be accessing rrlh->data[3], so we must check for at least sizeof(*rllh) + 4. Change-Id: Ie4aee615c8c904ae8308ec0074d8bc5208137061 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 26 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6370942..2fc640b 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2500,8 +2500,7 @@ switch (rllh->c.msg_type) { case RSL_MT_DATA_IND: LOG_LCHAN(msg->lchan, LOGL_DEBUG, "SAPI=%u DATA INDICATION\n", sapi); - if (msgb_l2len(msg) > - sizeof(struct abis_rsl_common_hdr) + sizeof(*rllh) && + if (msgb_l2len(msg) > (sizeof(*rllh) + 3) && rllh->data[0] == RSL_IE_L3_INFO) { msg->l3h = &rllh->data[3]; return gsm0408_rcvmsg(msg, rllh->link_id); @@ -2543,8 +2542,7 @@ msg->lchan->sapis[sapi] = LCHAN_SAPI_MS; osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_RLL_ESTABLISH_IND, msg); - if (msgb_l2len(msg) > - sizeof(struct abis_rsl_common_hdr) + sizeof(*rllh) && + if (msgb_l2len(msg) > (sizeof(*rllh) + 3) && rllh->data[0] == RSL_IE_L3_INFO) { msg->l3h = &rllh->data[3]; return gsm0408_rcvmsg(msg, rllh->link_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie4aee615c8c904ae8308ec0074d8bc5208137061 Gerrit-Change-Number: 32421 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

2024

2023

2022

gerrit-log May 2023