Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33383 )
Change subject: rlcmac: BS_CV_MAX=0 should be interpreted as =1 when calculating N3104_MAX
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33383
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Ia83173afdbb25df18c7cead7857fe1b39a1ce82f
Gerrit-Change-Number: 33383
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 21 Jun 2023 11:00:26 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33382 )
Change subject: prevent bogus NCH related error message if no NCH is configured
......................................................................
prevent bogus NCH related error message if no NCH is configured
Back in Change-Id Iefde0af44a663f22462a54d68a58caa560eceb2f I
introduced indication of the NCH position in the SI1 rest octets.
However, a related ERROR messages is accidentially also printed in
case no NCH is configured at all.
Let's split the already overly-complex if clause into a separate
function which then also handles the "bts->nch.num_blocks == 0"
case as permitted.
Change-Id: Iab2120a343cb0f6553f13a821b44b3c312587579
Related: OS#5781
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 43 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index c4b5780..0757da0 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -375,6 +375,28 @@
osmo_timer_schedule(&update_connection_stats_timer, 1, 0);
}
+static bool nch_position_compatible_with_combined_ccch(const struct gsm_bts *bts)
+{
+ switch (bts->nch.num_blocks) {
+ case 0:
+ /* no NCH enabled, so we are fine */
+ return true;
+ case 1:
+ if (bts->nch.first_block == 0 || bts->nch.first_block == 1)
+ return true;
+ break;
+ case 2:
+ if (bts->nch.first_block == 0)
+ return true;
+ break;
+ default:
+ break;
+ }
+
+ /* anything else is not permitted */
+ return false;
+}
+
static void bootstrap_bts(struct gsm_bts *bts)
{
unsigned int n = 0;
@@ -394,8 +416,7 @@
bts->si_common.chan_desc.bs_ag_blks_res = 2;
}
- if (!(bts->nch.num_blocks == 1 && (bts->nch.first_block == 0 || bts->nch.first_block == 1)) &&
- !(bts->nch.num_blocks == 2 && bts->nch.first_block == 0)) {
+ if (!nch_position_compatible_with_combined_ccch(bts)) {
LOG_BTS(bts, DNM, LOGL_ERROR, "CCCH is combined with SDCCHs, but NCH position/size is "
"incompatible with that. Please fix your config!\n");
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33382
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Iab2120a343cb0f6553f13a821b44b3c312587579
Gerrit-Change-Number: 33382
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin, daniel.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33335 )
Change subject: Set stream_cli/srv name to contain ASP + sockname
......................................................................
Patch Set 9: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33335
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I05bc5f6c7795f62c1814c1c774287b41ee85a475
Gerrit-Change-Number: 33335
Gerrit-PatchSet: 9
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
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: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 21 Jun 2023 10:50:33 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33383 )
Change subject: rlcmac: BS_CV_MAX=0 should be interpreted as =1 when calculating N3104_MAX
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33383
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Ia83173afdbb25df18c7cead7857fe1b39a1ce82f
Gerrit-Change-Number: 33383
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 21 Jun 2023 10:47:55 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, pespin, daniel.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33335 )
Change subject: Set stream_cli/srv name to contain ASP + sockname
......................................................................
Patch Set 9: Code-Review+1
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/libosmo-sccp/+/33335/comment/9ccfb7f1_1ae24d52
PS6, Line 21: asp0,(r=::1:2905<->l=::ffff:127.0.0.2:35911)
> I think the example is now wrong (_ instead of ,). […]
Done
File src/osmo_ss7.c:
https://gerrit.osmocom.org/c/libosmo-sccp/+/33335/comment/f6f6311f_87750505
PS5, Line 2102: ,%
> I think that comma may later end up in FSM names which might in turn get exported via CTRL or counte […]
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33335
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I05bc5f6c7795f62c1814c1c774287b41ee85a475
Gerrit-Change-Number: 33335
Gerrit-PatchSet: 9
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
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: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 21 Jun 2023 10:38:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment