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

Change in osmo-bsc[master]: SI13: Always send ext_info

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27537 ) Change subject: SI13: Always send ext_info ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If96de3e0d77503cf6344dfbc611f9260ac3281aa Gerrit-Change-Number: 27537 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Mar 2022 19:20:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: SI13: constify and copy si13_default

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27542 ) Change subject: SI13: constify and copy si13_default ...................................................................... SI13: constify and copy si13_default It's really confusing having a "default" struct whose inner values are changing based on previous state. Let's make it const and copy it over every time we need to modify it, to avoid dragging previous state over and over. Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 --- M src/osmo-bsc/system_information.c 1 file changed, 16 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/27542/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 797c556..1f8d8da 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1200,7 +1200,7 @@ return l2_plen + rc; } -static struct osmo_gsm48_si13_info si13_default = { +const static struct osmo_gsm48_si13_info si13_default = { .cell_opts = { .nmo = GPRS_NMO_II, .t3168 = 2000, @@ -1238,6 +1238,7 @@ { struct gsm48_system_information_type_13 *si13 = (struct gsm48_system_information_type_13 *) GSM_BTS_SI(bts, t); + struct osmo_gsm48_si13_info si13_info = si13_default; int ret; memset(si13, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); @@ -1246,43 +1247,43 @@ si13->header.skip_indicator = 0; si13->header.system_information = GSM48_MT_RR_SYSINFO_13; - si13_default.rac = bts->gprs.rac; - si13_default.net_ctrl_ord = bts->gprs.net_ctrl_ord; + si13_info.rac = bts->gprs.rac; + si13_info.net_ctrl_ord = bts->gprs.net_ctrl_ord; - si13_default.cell_opts.ctrl_ack_type_use_block = + si13_info.cell_opts.ctrl_ack_type_use_block = bts->gprs.ctrl_ack_type_use_block; /* Information about the other SIs */ - si13_default.bcch_change_mark = bts->bcch_change_mark; + si13_info.bcch_change_mark = bts->bcch_change_mark; switch (bts->gprs.mode) { case BTS_GPRS_EGPRS: - si13_default.cell_opts.ext_info.egprs_supported = 1; + si13_info.cell_opts.ext_info.egprs_supported = 1; /* Whether EGPRS capable MSs shall use EGPRS PACKET CHANNEL REQUEST */ if (bts->gprs.egprs_pkt_chan_request) - si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 1; + si13_info.cell_opts.ext_info.use_egprs_p_ch_req = 1; else - si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0; + si13_info.cell_opts.ext_info.use_egprs_p_ch_req = 0; break; case BTS_GPRS_GPRS: case BTS_GPRS_NONE: - si13_default.cell_opts.ext_info.egprs_supported = 0; - si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0; + si13_info.cell_opts.ext_info.egprs_supported = 0; + si13_info.cell_opts.ext_info.use_egprs_p_ch_req = 0; break; } if (osmo_bts_has_feature(&bts->features, BTS_FEAT_PAGING_COORDINATION)) - si13_default.cell_opts.ext_info.bss_paging_coordination = 1; + si13_info.cell_opts.ext_info.bss_paging_coordination = 1; else - si13_default.cell_opts.ext_info.bss_paging_coordination = 0; + si13_info.cell_opts.ext_info.bss_paging_coordination = 0; - si13_default.cell_opts.ext_info.ccn_active = bts->gprs.ccn.forced_vty ? + si13_info.cell_opts.ext_info.ccn_active = bts->gprs.ccn.forced_vty ? bts->gprs.ccn.active : osmo_bts_has_feature(&bts->model->features, BTS_FEAT_CCN); - si13_default.pwr_ctrl_pars.alpha = bts->gprs.pwr_ctrl.alpha; + si13_info.pwr_ctrl_pars.alpha = bts->gprs.pwr_ctrl.alpha; - ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_default); + ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_info); if (ret < 0) return ret; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3ae4dd017dd4dad10c0365d21727666dd8e9fd41 Gerrit-Change-Number: 27542 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: jenkins: Validate IEs are added to tlv_definition

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27535 ) Change subject: jenkins: Validate IEs are added to tlv_definition ...................................................................... jenkins: Validate IEs are added to tlv_definition It was recently found that several IEs which were added in the header file were not actually added to the tlv_definition, and hence the tlv parser failed to decode them. Let's make sure we don't foget to add new IEs in the future. Related: SYS#5891 Change-Id: I1f6c274ea86b5803bbf1d845473b98078f46d1ad --- M contrib/jenkins_common.sh 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index b86a479..c39b356 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -12,6 +12,22 @@ verify_value_string_arrays_are_terminated.py +# Validate enum fields in header are added to tlv_definition in source file (SYS#5891): + +verify_gsm0808_tlv_definition() { + set +x; + enums=$(grep "GSM0808_IE_" include/osmocom/gsm/protocol/gsm_08_08.h | grep "=" | awk '{ print $1 }') + counted_enums=$(for f in $enums; do printf "%-60s %s\n" "$f" "$(grep -c "\[$f\]" src/gsm/gsm0808.c)"; done) + missing_enums=$(echo "$counted_enums" | grep -v GSM0808_IE_RESERVED | grep "0$" || true) + if [ "x$missing_enums" != "x" ]; then + echo "Missing IEs in src/gsm/gsm0808.c!" + echo "$missing_enums" + exit 1 + fi + set -x; +} +verify_gsm0808_tlv_definition + prep_build() { _src_dir="$1" _build_dir="$2" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1f6c274ea86b5803bbf1d845473b98078f46d1ad Gerrit-Change-Number: 27535 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: system_information: Move all si13 specific val update to generate_si13()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27541 ) Change subject: system_information: Move all si13 specific val update to generate_si13() ...................................................................... system_information: Move all si13 specific val update to generate_si13() Change-Id: I6e920d1c8d8e1673194c88929586e8a1f22e09c5 --- M src/osmo-bsc/system_information.c 1 file changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/27541/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 45f9860..797c556 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1255,11 +1255,21 @@ /* Information about the other SIs */ si13_default.bcch_change_mark = bts->bcch_change_mark; - /* Whether EGPRS capable MSs shall use EGPRS PACKET CHANNEL REQUEST */ - if (bts->gprs.egprs_pkt_chan_request && si13_default.cell_opts.ext_info.egprs_supported) - si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 1; - else + switch (bts->gprs.mode) { + case BTS_GPRS_EGPRS: + si13_default.cell_opts.ext_info.egprs_supported = 1; + /* Whether EGPRS capable MSs shall use EGPRS PACKET CHANNEL REQUEST */ + if (bts->gprs.egprs_pkt_chan_request) + si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 1; + else + si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0; + break; + case BTS_GPRS_GPRS: + case BTS_GPRS_NONE: + si13_default.cell_opts.ext_info.egprs_supported = 0; si13_default.cell_opts.ext_info.use_egprs_p_ch_req = 0; + break; + } if (osmo_bts_has_feature(&bts->features, BTS_FEAT_PAGING_COORDINATION)) si13_default.cell_opts.ext_info.bss_paging_coordination = 1; @@ -1306,16 +1316,11 @@ switch (bts->gprs.mode) { case BTS_GPRS_EGPRS: - si_info.gprs_ind.present = 1; - si13_default.cell_opts.ext_info.egprs_supported = 1; - break; case BTS_GPRS_GPRS: si_info.gprs_ind.present = 1; - si13_default.cell_opts.ext_info.egprs_supported = 0; break; case BTS_GPRS_NONE: si_info.gprs_ind.present = 0; - si13_default.cell_opts.ext_info.egprs_supported = 0; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6e920d1c8d8e1673194c88929586e8a1f22e09c5 Gerrit-Change-Number: 27541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: SI13: Always send ext_info

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27537 to look at the new patch set (#4). Change subject: SI13: Always send ext_info ...................................................................... SI13: Always send ext_info Values in ext_info are modified in several places, so it's difficult validating whether we deviate from default. Let's always send it so that we always have a clear view on what the MS uses. This fixes a bug where paging_coordination or ccn_active would not be announced if GPRS was not enabled. Related: SYS#5894 Change-Id: If96de3e0d77503cf6344dfbc611f9260ac3281aa --- M src/osmo-bsc/system_information.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/27537/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If96de3e0d77503cf6344dfbc611f9260ac3281aa Gerrit-Change-Number: 27537 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: bts_vty.c: Fix typo in comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27540 ) Change subject: bts_vty.c: Fix typo in comment ...................................................................... bts_vty.c: Fix typo in comment Change-Id: Id4c49e93fe5b4eaa4efdac116df34853f359dd98 --- M src/osmo-bsc/bts_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 0c7259b..d675922 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1376,7 +1376,7 @@ return CMD_WARNING; } - /* Can't use osmo_sockaddr_str_to_sockaddr() because the port would be overriden */ + /* Can't use osmo_sockaddr_str_to_sockaddr() because the port would be overridden */ bts->site_mgr->gprs.nsvc[idx].remote.u.sas.ss_family = remote.af; switch (remote.af) { case AF_INET: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c49e93fe5b4eaa4efdac116df34853f359dd98 Gerrit-Change-Number: 27540 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: SI13: Always send ext_info

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27537 ) Change subject: SI13: Always send ext_info ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27537/comment/ca7a6f31_1c45ee74 PS2, Line 1218: overriden > overridden Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If96de3e0d77503cf6344dfbc611f9260ac3281aa Gerrit-Change-Number: 27537 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Mar 2022 19:02:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: bts_vty.c: Fix typo in comment

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27540 ) Change subject: bts_vty.c: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c49e93fe5b4eaa4efdac116df34853f359dd98 Gerrit-Change-Number: 27540 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Mar 2022 19:02:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: SI13: Make sure egprs_supported field is always updated

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27538 ) Change subject: SI13: Make sure egprs_supported field is always updated ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id2c2319044da474642c4cc710baa27cfee4fb592 Gerrit-Change-Number: 27538 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 18 Mar 2022 19:02:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: bts_vty.c: Fix typo in comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27540 ) Change subject: bts_vty.c: Fix typo in comment ...................................................................... bts_vty.c: Fix typo in comment Change-Id: Id4c49e93fe5b4eaa4efdac116df34853f359dd98 --- M src/osmo-bsc/bts_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/27540/1 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 0c7259b..d675922 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1376,7 +1376,7 @@ return CMD_WARNING; } - /* Can't use osmo_sockaddr_str_to_sockaddr() because the port would be overriden */ + /* Can't use osmo_sockaddr_str_to_sockaddr() because the port would be overridden */ bts->site_mgr->gprs.nsvc[idx].remote.u.sas.ss_family = remote.af; switch (remote.af) { case AF_INET: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c49e93fe5b4eaa4efdac116df34853f359dd98 Gerrit-Change-Number: 27540 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022