Change in osmo-bsc[master]: osmo_bsc_main.c: fix CCCH_CONF computation: use pchan_from_config

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15934 )

Change subject: osmo_bsc_main.c: fix CCCH_CONF computation: use pchan_from_config
......................................................................

osmo_bsc_main.c: fix CCCH_CONF computation: use pchan_from_config

As can be seen from include/osmocom/bsc/gsm_data.h:

  - pchan_from_config - channel configuration from the VTY/config
    (can be changed from the VTY at runtime, should not affect
    the existing RSL/OML connections);
  - pchan_on_init - channel configuration after the OML link is
    established (pchan_from_config is copied here);
  - pchan_is - the *actual* channel configuration currently active.

Since we call bootstrap_bts() during the initialization, even before
establishing any OML/RSL connections, neither pchan_on_init nor
pchan_is can be used. Let's use pchan_from_config instead.

This change fixes the problem discovered by @mqng2 and reported
together with https://gerrit.osmocom.org/c/osmo-bsc/+/15909:

  CCCH_CONF in System Information Type 3 does not reflect the
  actual channel configuration, and always indicates a single
  CCCH combined with SDCCH. This also misleads the lchan
  allocation algorithm during the MO connection establishment.

Change-Id: I8f9d7aa27f24b55732a4de933bc834ed930806fd
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Verified
  pespin: Looks good to me, but someone else must approve
  mqng2: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index f63a388..41e810b 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -463,7 +463,7 @@
 	bts->si_common.chan_desc.mscr = 1;
 
 	/* Determine the value of CCCH_CONF. Is TS0/C0 combined? */
-	if (bts->c0->ts[0].pchan_is != GSM_PCHAN_CCCH) {
+	if (bts->c0->ts[0].pchan_from_config != GSM_PCHAN_CCCH) {
 		bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_C;
 
 		/* Limit reserved block to 2 on combined channel according to
@@ -476,9 +476,9 @@
 		}
 	} else { /* Non-combined TS0/C0 configuration */
 		/* There can be additional CCCHs on even timeslot numbers */
-		n += (bts->c0->ts[2].pchan_is == GSM_PCHAN_CCCH);
-		n += (bts->c0->ts[4].pchan_is == GSM_PCHAN_CCCH);
-		n += (bts->c0->ts[6].pchan_is == GSM_PCHAN_CCCH);
+		n += (bts->c0->ts[2].pchan_from_config == GSM_PCHAN_CCCH);
+		n += (bts->c0->ts[4].pchan_from_config == GSM_PCHAN_CCCH);
+		n += (bts->c0->ts[6].pchan_from_config == GSM_PCHAN_CCCH);
 		bts->si_common.chan_desc.ccch_conf = (n << 1);
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15934
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I8f9d7aa27f24b55732a4de933bc834ed930806fd
Gerrit-Change-Number: 15934
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: mqng2 <minh-quang.nguyen at nutaq.com>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191105/4b470537/attachment.htm>