<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24735">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc_ctrl_commands: add command to write vty config<br><br>we recently added control commands to apply vty config files during<br>runtime using the control interface. However, there is no command that<br>allows us to store the config file modifications.<br><br>Change-Id: If17095bb86f82dd8feb86eb72c4133ea3aa1c3b3<br>Related: SYS#5369<br>---<br>M doc/manuals/chapters/control.adoc<br>M src/osmo-bsc/bsc_ctrl_commands.c<br>2 files changed, 28 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/35/24735/1</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 6b1609a..bd49100 100644</span><br><span>--- a/doc/manuals/chapters/control.adoc</span><br><span>+++ b/doc/manuals/chapters/control.adoc</span><br><span>@@ -27,6 +27,7 @@</span><br><span> |inform-msc-v1|WO|Yes|Arbitrary value| See <<infomsc>> for details.</span><br><span> |rf_locked|RW|No|"0","1"|See <<rfl>> for details.</span><br><span> |number-of-bts|RO|No|"<num>"|Get number of configured BTS.</span><br><span style="color: hsl(120, 100%, 40%);">+|write-config-file|WO|No|"overwrite", "<filename>"|Write running configuration to file.</span><br><span> |bts.N.location-area-code|RW|No|"<lac>"|Set/Get LAC (value between (0, 65535)).</span><br><span> |bts.N.cell-identity|RW|No|"<id>"|Set/Get Cell Identity (value between (0, 65535)).</span><br><span> |bts.N.apply-configuration|WO|No|Ignored|Restart BTS via OML.</span><br><span>diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>index 2d37b5d..6d66ab5 100644</span><br><span>--- a/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>+++ b/src/osmo-bsc/bsc_ctrl_commands.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <osmocom/ctrl/control_cmd.h></span><br><span> </span><br><span> #include <osmocom/vty/command.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/misc.h></span><br><span> </span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> #include <osmocom/bsc/ipaccess.h></span><br><span>@@ -82,6 +83,31 @@</span><br><span> }</span><br><span> CTRL_CMD_DEFINE_WO(net_apply_config_file, "apply-config-file");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int verify_net_write_config_file(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 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+static int set_net_write_config_file(struct ctrl_cmd *cmd, void *_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      const char *cfile_name;</span><br><span style="color: hsl(120, 100%, 40%);">+       unsigned cmd_ret = CTRL_CMD_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  if (strcmp(cmd->value, "default"))</span><br><span style="color: hsl(120, 100%, 40%);">+               host_config_set(cmd->value);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     cfile_name = host_config_file();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    LOGP(DCTRL, LOGL_NOTICE, "Writing VTY config to file %s...\n", cfile_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_vty_write_config_file(cfile_name) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+            goto ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   cmd->reply = "OK";</span><br><span style="color: hsl(120, 100%, 40%);">+       cmd_ret = CTRL_CMD_REPLY;</span><br><span style="color: hsl(120, 100%, 40%);">+ret:</span><br><span style="color: hsl(120, 100%, 40%);">+       return cmd_ret;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+CTRL_CMD_DEFINE_WO(net_write_config_file, "write-config-file");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> CTRL_CMD_DEFINE(net_mcc, "mcc");</span><br><span> static int get_net_mcc(struct ctrl_cmd *cmd, void *_data)</span><br><span> {</span><br><span>@@ -528,6 +554,7 @@</span><br><span> {</span><br><span>   int rc = 0;</span><br><span>  rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_net_apply_config_file);</span><br><span style="color: hsl(120, 100%, 40%);">+       rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_net_write_config_file);</span><br><span>      rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_net_mnc);</span><br><span>    rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_net_mcc);</span><br><span>    rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_net_apply_config);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24735">change 24735</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/+/24735"/><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: If17095bb86f82dd8feb86eb72c4133ea3aa1c3b3 </div>
<div style="display:none"> Gerrit-Change-Number: 24735 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>