Change in osmo-bsc[master]: osmo-bsc: Fix 'apply-config-file' CTRL command

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31029 ) Change subject: osmo-bsc: Fix 'apply-config-file' CTRL command ...................................................................... osmo-bsc: Fix 'apply-config-file' CTRL command Make 'apply-config-file' check the neighbor config, just as is done after config parsing on startup Related: OS#5866 Change-Id: I24ae8cd7e5e0d15eab9fd04b1858072bf0bad36a --- M src/osmo-bsc/bsc_ctrl.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index ca246e7..8eb7caf 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -43,6 +43,7 @@ #include <osmocom/bsc/a_reset.h> #include <osmocom/bsc/ctrl.h> #include <osmocom/bsc/handover_ctrl.h> +#include <osmocom/bsc/neighbor_ident.h> static int verify_net_apply_config_file(struct ctrl_cmd *cmd, const char *value, void *_data) { @@ -83,6 +84,14 @@ goto close_ret; } + rc = neighbors_check_cfg(); + if (rc) { + cmd->reply = talloc_asprintf(cmd, "Errors in neighbor configuration"); + if (!cmd->reply) + cmd->reply = "OOM"; + goto close_ret; + } + cmd->reply = "OK"; cmd_ret = CTRL_CMD_REPLY; close_ret: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I24ae8cd7e5e0d15eab9fd04b1858072bf0bad36a Gerrit-Change-Number: 31029 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein &lt;arehbein(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein &lt;arehbein(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: msuraev &lt;msuraev(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged