arehbein has uploaded this change for review.

View Change

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, 10 insertions(+), 1 deletion(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/31029/1

diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c
index ca246e7..c1e1a3d 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)
 {
@@ -75,7 +76,6 @@
 	}
 
 	rc = vty_read_config_filep(cfile, NULL);
-	LOGP(DCTRL, LOGL_NOTICE, "Applying VTY snippet from %s returned %d\n", cmd->value, rc);
 	if (rc) {
 		cmd->reply = talloc_asprintf(cmd, "ParseError=%d", rc);
 		if (!cmd->reply)
@@ -83,6 +83,15 @@
 		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;
+	}
+	LOGP(DCTRL, LOGL_NOTICE, "Applying VTY snippet from %s returned %d\n", cmd->value, rc);
+
 	cmd->reply = "OK";
 	cmd_ret = CTRL_CMD_REPLY;
 close_ret:

To view, visit change 31029. To unsubscribe, or for help writing mail filters, visit settings.