<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21714">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Allow configuring SI13 CCN_ACTIVE bit from VTY, enable by default on osmo-bts<br><br>This is required in order to tell MS that osmo-pcu now supports<br>Network Assisted Cell Change (NACC).<br><br>Other BTS are not enabled by default since NACC support is not known to<br>work nor tested there.<br><br>Depends: libosmocore.git Change-Id I61991266b95d0c13d51b47906cc07846e9cf1390<br>Related: SYS#4909<br>Change-Id: If91d85331d402c3ab9c32b70c2c66cd7ba6ceb28<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts_sysmobts.c<br>M src/osmo-bsc/system_information.c<br>4 files changed, 33 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index b81f45f..6797d1c 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -387,6 +387,10 @@</span><br><span> uint8_t net_ctrl_ord;</span><br><span> bool ctrl_ack_type_use_block;</span><br><span> bool egprs_pkt_chan_request;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool active; /* CCN_ACTIVE */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool forced_vty; /* set by VTY ? */</span><br><span style="color: hsl(120, 100%, 40%);">+ } ccn; /* TS 44.060 sec 8.8.2 */</span><br><span> } gprs;</span><br><span> </span><br><span> /* threshold (in percent) when BTS shall send CCCH LOAD IND */</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 4781217..03b87b4 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -758,6 +758,9 @@</span><br><span> bts->gprs.net_ctrl_ord, VTY_NEWLINE);</span><br><span> if (!bts->gprs.ctrl_ack_type_use_block)</span><br><span> vty_out(vty, " gprs control-ack-type-rach%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.ccn.forced_vty)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gprs ccn-active %d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.ccn.active ? 1 : 0, VTY_NEWLINE);</span><br><span> vty_out(vty, " gprs cell bvci %u%s", bts->gprs.cell.bvci,</span><br><span> VTY_NEWLINE);</span><br><span> for (i = 0; i < ARRAY_SIZE(bts->gprs.cell.timer); i++)</span><br><span>@@ -3486,6 +3489,24 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_USRATTR(cfg_bts_gprs_ccn_active,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_gprs_ccn_active_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),</span><br><span style="color: hsl(120, 100%, 40%);">+ "gprs ccn-active (0|1|default)",</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_TEXT</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set CCN_ACTIVE in the GPRS Cell Options IE on the BCCH (SI13)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Disable\n" "Enable\n" "Default based on BTS type support\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.ccn.forced_vty = strcmp(argv[0], "default") != 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gprs.ccn.forced_vty)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.ccn.active = argv[0][0] == '1';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN_USRATTR(cfg_no_bts_gprs_ctrl_ack,</span><br><span> cfg_no_bts_gprs_ctrl_ack_cmd,</span><br><span> X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),</span><br><span>@@ -7637,6 +7658,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_rac_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_net_ctrl_ord_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_ctrl_ack_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_gprs_ccn_active_cmd);</span><br><span> install_element(BTS_NODE, &cfg_no_bts_gprs_ctrl_ack_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_bvci_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_gprs_cell_timer_cmd);</span><br><span>diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c</span><br><span>index e319f2c..f24c615 100644</span><br><span>--- a/src/osmo-bsc/bts_sysmobts.c</span><br><span>+++ b/src/osmo-bsc/bts_sysmobts.c</span><br><span>@@ -61,6 +61,7 @@</span><br><span> osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_EGPRS);</span><br><span> osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_PAGING_COORDINATION);</span><br><span> osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_IPV6_NSVC);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_CCN);</span><br><span> </span><br><span> model_sysmobts.nm_att_tlvdef.def[NM_ATT_OSMO_NS_LINK_CFG].type = TLV_TYPE_TL16V;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index 10b0e4d..d018ec3 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -1206,6 +1206,7 @@</span><br><span> .pfc_supported = 0,</span><br><span> .dtm_supported = 0,</span><br><span> .bss_paging_coordination = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ccn_active = false,</span><br><span> },</span><br><span> },</span><br><span> .pwr_ctrl_pars = {</span><br><span>@@ -1255,6 +1256,11 @@</span><br><span> else</span><br><span> si13_default.cell_opts.ext_info.bss_paging_coordination = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ si13_default.cell_opts.ext_info.ccn_active = bts->gprs.ccn.forced_vty ?</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.ccn.active :</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bts_has_feature(&bts->model->features,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_FEAT_CCN);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ret = osmo_gsm48_rest_octets_si13_encode(si13->rest_octets, &si13_default);</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21714">change 21714</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/21714"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If91d85331d402c3ab9c32b70c2c66cd7ba6ceb28 </div>
<div style="display:none"> Gerrit-Change-Number: 21714 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>