<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24600">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">handover_ctrl: add control interface for handover settings<br><br>The VTY handover_vtc.c offers a large number of handover specific<br>settings. Those settings are (with one exception) auto generated using<br>macros. Lets add an equivalent for the control interface that uses the<br>same auto generation mechanisms.<br><br>Change-Id: I12f143906818fd6b16e8783157cbb1eb51e49ffc<br>Depends: libosmocore I53fc207677f52b1dc748b01d58424839cdba807c<br>Related: SYS#5369<br>---<br>M doc/manuals/chapters/control.adoc<br>M include/osmocom/bsc/Makefile.am<br>A include/osmocom/bsc/handover_ctrl.h<br>M src/osmo-bsc/Makefile.am<br>A src/osmo-bsc/handover_ctrl.c<br>M src/osmo-bsc/osmo_bsc_ctrl.c<br>M tests/handover/Makefile.am<br>7 files changed, 254 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/control.adoc b/doc/manuals/chapters/control.adoc</span><br><span>index 85696a0..2585126 100644</span><br><span>--- a/doc/manuals/chapters/control.adoc</span><br><span>+++ b/doc/manuals/chapters/control.adoc</span><br><span>@@ -40,6 +40,34 @@</span><br><span> |bts.N.rf_state|RO|No|"<oper>,<admin>,<pol>"|See <<rfs>> for details.</span><br><span> |bts.N.trx.M.arfcn|RW|No|"<arfcn>"|Set/Get ARFCN (value between (0, 1023)).</span><br><span> |bts.N.trx.M.max-power-reduction|RW|No|"<mpr>"|See <<mpr>> for details.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover.active|RW|No|"0","1","default"|Enable/disable handover.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover.algorithm|RW|No|"1","2","default"|Choose algorithm for handover decision (hodec1 or hodec2).</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover1.window.rxlev.averaging|RW|No|<1-10>,"default"|How many RxLev measurements to use for averaging.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover1.window.rxqual.averaging|RW|No|<1-10>,"default"|How many RxQual measurements to use for averaging.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover1.window.rxlev.neighbor.averaging|RW|No|<1-10>,"default"|How many Neighbor RxLev measurements to use for averaging.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover1.power.budget.interval|RW|No|<1-99>,"default"|How often to check for a better cell (SACCH frames).</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover1.power.budget.hysteresis|RW|No|<0-999>,"default"|How many dB stronger must a neighbor be to become a HO candidate.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover1.maximum.distance|RW|No|<0-9999>,"default"|Maximum Timing-Advance value (i.e. MS distance) before triggering HO.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.window.rxlev.averaging|RW|No|<1-10>,"default"|How many RxLev measurements to use for averaging.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.window.rxqual.averaging|RW|No|<1-10>,"default"|How many RxQual measurements to use for averaging.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.window.rxlev.neighbor.averaging|RW|No|<1-10>,"default"|window rxlev neighbor averaging.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.power.budget.interval|RW|No|<1-99>,"default"|How many dB stronger must a neighbor be to become a HO candidate.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.power.budget.hysteresis|RW|No|<0-999>,"default"|How many dB stronger must a neighbor be to become a HO candidate.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.maximum.distance|RW|No|<0-9999>,"default"|Maximum Timing-Advance value (i.e. MS distance) before triggering HO.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.assignment|RW|No|"0","1","default"|Enable or disable in-call channel re-assignment within the same cell.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.tdma-measurement|RW|No|"full","subset","default"|Define measurement set of TDMA frames.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.min.rxlev|RW|No|<-110--50>,"default"|How weak may RxLev of an MS become before triggering HO.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.min.rxqual|RW|No|<0-7>,"default"|How bad may RxQual of an MS become before triggering HO.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.afs-bias.rxlev|RW|No|<0-20>,"default"|RxLev improvement bias for AFS over other codecs.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.afs-bias.rxqual|RW|No|<0-7>,"default"|RxQual improvement bias for AFS over other codecs.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.min-free-slots.tch-f|RW|No|<0-9999>,"default"|Minimum free TCH/F timeslots before cell is considered congested.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.min-free-slots.tch-h|RW|No|<0-9999>,"default"|Minimum free TCH/H timeslots before cell is considered congested.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.max-handovers|RW|No|<1-9999>,"default"|Maximum number of concurrent handovers allowed per cell.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.penalty-time.max-distance|RW|No|<0-99999>,"default"|ime to suspend handover for a subscriber after leaving this cell due to exceeding max distance.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.penalty-time.failed-ho|RW|No|<0-99999>,"default"|Time to suspend handover for a subscriber after a failed handover into this cell.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.penalty-time.failed-assignment|RW|No|<0-99999>,"default"|Time to suspend handover for a subscriber after a failed re-assignment within this cell.</span><br><span style="color: hsl(120, 100%, 40%);">+|[bts.N.]handover2.retries|RW|No|<0-9>,"default"|Number of times to immediately retry a failed handover/assignment, before a penalty time is applied.</span><br><span style="color: hsl(120, 100%, 40%);">+|handover2.congestion-check|RW|No|"disabled",<1-999>,"now"|Congestion check interval in seconds, "now" triggers immediate congestion check.</span><br><span> |===</span><br><span> </span><br><span> [[notif]]</span><br><span>diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am</span><br><span>index 5e866cc..dde08a1 100644</span><br><span>--- a/include/osmocom/bsc/Makefile.am</span><br><span>+++ b/include/osmocom/bsc/Makefile.am</span><br><span>@@ -23,6 +23,7 @@</span><br><span> gsm_data.h \</span><br><span> handover.h \</span><br><span> handover_cfg.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ handover_ctrl.h \</span><br><span> handover_decision.h \</span><br><span> handover_decision_2.h \</span><br><span> handover_fsm.h \</span><br><span>diff --git a/include/osmocom/bsc/handover_ctrl.h b/include/osmocom/bsc/handover_ctrl.h</span><br><span>new file mode 100644</span><br><span>index 0000000..c0bd70c</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/bsc/handover_ctrl.h</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_ho_ctrl_cmds_install(void *ctx);</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index df4e0c3..840e956 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -61,6 +61,7 @@</span><br><span> gsm_04_08_rr.c \</span><br><span> gsm_data.c \</span><br><span> handover_cfg.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ handover_ctrl.c \</span><br><span> handover_decision.c \</span><br><span> handover_decision_2.c \</span><br><span> handover_fsm.c \</span><br><span>diff --git a/src/osmo-bsc/handover_ctrl.c b/src/osmo-bsc/handover_ctrl.c</span><br><span>new file mode 100644</span><br><span>index 0000000..139d038</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo-bsc/handover_ctrl.c</span><br><span>@@ -0,0 +1,216 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* OsmoBSC handover control interface implementation */</span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Philipp Maier <pmaier@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/vty.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/handover_cfg.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/handover_decision_2.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/ctrl/control_cmd.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* In handover_cfg.h the config items are described in VTY syntax. To be able to</span><br><span style="color: hsl(120, 100%, 40%);">+ * use those here in the CTRL interface, we parse the config arguments like the</span><br><span style="color: hsl(120, 100%, 40%);">+ * VTY would. (the value specification may be in the form of "<from-to>" or</span><br><span style="color: hsl(120, 100%, 40%);">+ * "A|B|C|..." */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool verify_vty_cmd_arg(void *ctx, const char *range, const char *value)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ bool success;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *range_tok;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *valid_val;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* "default" value is always a valid value */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(value, "default") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Try to check for a range first since it is the most common case */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (range[0] == '<') {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty_cmd_range_match(range, value))</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Try to tokenize the string to check for distintinct values */</span><br><span style="color: hsl(120, 100%, 40%);">+ success = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ range_tok = talloc_zero_size(ctx, strlen(range) + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(range_tok, range, strlen(range));</span><br><span style="color: hsl(120, 100%, 40%);">+ valid_val = strtok(range_tok, "|");</span><br><span style="color: hsl(120, 100%, 40%);">+ while (valid_val != NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(valid_val, value) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ success = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ valid_val = strtok(NULL, "|");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(range_tok);</span><br><span style="color: hsl(120, 100%, 40%);">+ return success;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* NOTE: The following macro scheme has been designed for using it in the VTY</span><br><span style="color: hsl(120, 100%, 40%);">+ * code. However, for the most part it also works for CTRL interface code as</span><br><span style="color: hsl(120, 100%, 40%);">+ * well. */</span><br><span style="color: hsl(120, 100%, 40%);">+#define HO_CFG_ONE_MEMBER(TYPE, NAME, DEFAULT_VAL, VTY_CMD_PREFIX, VTY_CMD, VTY_CMD_ARG, VTY_ARG_EVAL, VTY_WRITE_FMT, VTY_WRITE_CONV, VTY6) \</span><br><span style="color: hsl(120, 100%, 40%);">+CTRL_CMD_DEFINE(NAME, VTY_CMD_PREFIX VTY_CMD); \</span><br><span style="color: hsl(120, 100%, 40%);">+static int get_##NAME(struct ctrl_cmd *cmd, void *_data) \</span><br><span style="color: hsl(120, 100%, 40%);">+{ \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = cmd->node; \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct handover_cfg *ho = net->ho; \</span><br><span style="color: hsl(120, 100%, 40%);">+ TYPE val; \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ho_isset_##NAME(ho)) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ val = ho_get_##NAME(ho); \</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->reply = talloc_asprintf(cmd, VTY_WRITE_FMT, VTY_WRITE_CONV(val)); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } else \</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->reply = talloc_asprintf(cmd, "%s", #DEFAULT_VAL); \</span><br><span style="color: hsl(120, 100%, 40%);">+ return CTRL_CMD_REPLY; \</span><br><span style="color: hsl(120, 100%, 40%);">+} \</span><br><span style="color: hsl(120, 100%, 40%);">+static int set_##NAME(struct ctrl_cmd *cmd, void *_data) \</span><br><span style="color: hsl(120, 100%, 40%);">+{ \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = cmd->node; \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct handover_cfg *ho = net->ho; \</span><br><span style="color: hsl(120, 100%, 40%);">+ TYPE value; \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(cmd->value, "default") == 0) \</span><br><span style="color: hsl(120, 100%, 40%);">+ value = VTY_ARG_EVAL(#DEFAULT_VAL); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else \</span><br><span style="color: hsl(120, 100%, 40%);">+ value = VTY_ARG_EVAL(cmd->value); \</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_##NAME(ho, value); \</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_##NAME(cmd, _data); \</span><br><span style="color: hsl(120, 100%, 40%);">+} \</span><br><span style="color: hsl(120, 100%, 40%);">+static int verify_##NAME(struct ctrl_cmd *cmd, const char *value, void *_data) \</span><br><span style="color: hsl(120, 100%, 40%);">+{ \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (verify_vty_cmd_arg(cmd, VTY_CMD_ARG, value) != true) \</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1; \</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0; \</span><br><span style="color: hsl(120, 100%, 40%);">+} \</span><br><span style="color: hsl(120, 100%, 40%);">+CTRL_CMD_DEFINE(bts_##NAME, VTY_CMD_PREFIX VTY_CMD); \</span><br><span style="color: hsl(120, 100%, 40%);">+static int get_bts_##NAME(struct ctrl_cmd *cmd, void *_data) \</span><br><span style="color: hsl(120, 100%, 40%);">+{ \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = cmd->node; \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct handover_cfg *ho = bts->ho; \</span><br><span style="color: hsl(120, 100%, 40%);">+ TYPE val; \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ho_isset_##NAME(ho)) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ val = ho_get_##NAME(ho); \</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->reply = talloc_asprintf(cmd, VTY_WRITE_FMT, VTY_WRITE_CONV(val)); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } else { \</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->reply = talloc_asprintf(cmd, "%s", #DEFAULT_VAL); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span style="color: hsl(120, 100%, 40%);">+ return CTRL_CMD_REPLY; \</span><br><span style="color: hsl(120, 100%, 40%);">+} \</span><br><span style="color: hsl(120, 100%, 40%);">+static int set_bts_##NAME(struct ctrl_cmd *cmd, void *_data) \</span><br><span style="color: hsl(120, 100%, 40%);">+{ \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = cmd->node; \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct handover_cfg *ho = bts->ho; \</span><br><span style="color: hsl(120, 100%, 40%);">+ TYPE value; \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(cmd->value, "default") == 0) \</span><br><span style="color: hsl(120, 100%, 40%);">+ value = VTY_ARG_EVAL(#DEFAULT_VAL); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else \</span><br><span style="color: hsl(120, 100%, 40%);">+ value = VTY_ARG_EVAL(cmd->value); \</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_set_##NAME(ho, value); \</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_bts_##NAME(cmd, _data); \</span><br><span style="color: hsl(120, 100%, 40%);">+} \</span><br><span style="color: hsl(120, 100%, 40%);">+static int verify_bts_##NAME(struct ctrl_cmd *cmd, const char *value, void *_data) \</span><br><span style="color: hsl(120, 100%, 40%);">+{ \</span><br><span style="color: hsl(120, 100%, 40%);">+ return verify_##NAME(cmd, value, _data); \</span><br><span style="color: hsl(120, 100%, 40%);">+} \</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Expand the above macro using the definitions from handover_cfg.h */</span><br><span style="color: hsl(120, 100%, 40%);">+HO_CFG_ALL_MEMBERS</span><br><span style="color: hsl(120, 100%, 40%);">+#undef HO_CFG_ONE_MEMBER</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CTRL_CMD_DEFINE(congestion_check_interval, "handover2 congestion-check");</span><br><span style="color: hsl(120, 100%, 40%);">+static int get_congestion_check_interval(struct ctrl_cmd *cmd, void *_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = cmd->node;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (net->hodec2.congestion_check_interval_s > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->reply = talloc_asprintf(cmd, "%u", net->hodec2.congestion_check_interval_s);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->reply = "disabled";</span><br><span style="color: hsl(120, 100%, 40%);">+ return CTRL_CMD_REPLY;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int set_congestion_check_interval(struct ctrl_cmd *cmd, void *_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = cmd->node;</span><br><span style="color: hsl(120, 100%, 40%);">+ int value;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Trigger congestion check and leave without changing anything */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(cmd->value, "now") == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ hodec2_congestion_check(net);</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_congestion_check_interval(cmd, _data);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(cmd->value, "disabled") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ value = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ value = atoi(cmd->value);</span><br><span style="color: hsl(120, 100%, 40%);">+ hodec2_on_change_congestion_check_interval(net, value);</span><br><span style="color: hsl(120, 100%, 40%);">+ return get_congestion_check_interval(cmd, _data);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int verify_congestion_check_interval(struct ctrl_cmd *cmd, const char *value, void *_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(value, "disabled") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(value, "now") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (verify_vty_cmd_arg(cmd, "<1-999>", value))</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Filter name member in cmd for illegal '/' characters */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct ctrl_cmd_element *filter_name(void *ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ctrl_cmd_element *cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *name;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_separated_identifiers_valid(cmd->name, " -"))</span><br><span style="color: hsl(120, 100%, 40%);">+ return cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ name = talloc_strdup(ctx, cmd->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < strlen(name); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (name[i] == '/')</span><br><span style="color: hsl(120, 100%, 40%);">+ name[i] = '-';</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->name = name;</span><br><span style="color: hsl(120, 100%, 40%);">+ return cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_ho_ctrl_cmds_install(void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_congestion_check_interval);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define HO_CFG_ONE_MEMBER(TYPE, NAME, DEFAULT_VAL, VTY0, VTY1, VTY2, VTY_ARG_EVAL, VTY4, VTY5, VTY6) \</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= ctrl_cmd_install(CTRL_NODE_ROOT, filter_name(ctx, &cmd_##NAME)); \</span><br><span style="color: hsl(120, 100%, 40%);">+ rc |= ctrl_cmd_install(CTRL_NODE_BTS, filter_name(ctx, &cmd_bts_##NAME)); \</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+HO_CFG_ALL_MEMBERS</span><br><span style="color: hsl(120, 100%, 40%);">+#undef HO_CFG_ONE_MEMBER</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>index 05bc86c..1eea690 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <osmocom/bsc/signal.h></span><br><span> #include <osmocom/bsc/a_reset.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/handover_ctrl.h></span><br><span> </span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/signal.h></span><br><span>@@ -697,6 +698,9 @@</span><br><span> rc = bsc_base_ctrl_cmds_install();</span><br><span> if (rc)</span><br><span> goto end;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bsc_ho_ctrl_cmds_install(net);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto end;</span><br><span> rc = ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_loc);</span><br><span> if (rc)</span><br><span> goto end;</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index 65eb6a8..c7621d2 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -50,6 +50,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span> $(top_builddir)/src/osmo-bsc/assignment_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/handover_ctrl.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_init.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_rf_ctrl.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_rll.o \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24600">change 24600</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/+/24600"/><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: I12f143906818fd6b16e8783157cbb1eb51e49ffc </div>
<div style="display:none"> Gerrit-Change-Number: 24600 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </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-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>