<p>keith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/19875">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: allow configuring db path from cfg file<br><br>So far, the cmdline argument was the only way to set a database file.<br>Add a similar config to VTY as 'msc' / 'sms-database'. The cmdline arg is stronger<br>than the 'database' cfg item. DB is not reloaded from VTY command.<br><br>Change-Id: I18d954c30fcceb0b36a620b927fd3a93dcc79f49<br>---<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/msc_net_init.c<br>M src/libmsc/msc_vty.c<br>M src/osmo-msc/msc_main.c<br>M tests/test_nodes.vty<br>5 files changed, 22 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/75/19875/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 2122d4b..61fbc26 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -30,6 +30,7 @@</span><br><span> struct vlr_subscr;</span><br><span> struct gsup_client_mux;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define SMS_DEFAULT_DB_FILE_PATH "sms.db"</span><br><span> #define tmsi_from_string(str) strtoul(str, NULL, 10)</span><br><span> </span><br><span> enum {</span><br><span>@@ -259,6 +260,7 @@</span><br><span> </span><br><span> /* Whether to use call waiting on the network */</span><br><span> bool call_waiting;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *sms_db_file_path;</span><br><span> };</span><br><span> </span><br><span> struct osmo_esme;</span><br><span>diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c</span><br><span>index adb9ca7..774c767 100644</span><br><span>--- a/src/libmsc/msc_net_init.c</span><br><span>+++ b/src/libmsc/msc_net_init.c</span><br><span>@@ -61,6 +61,8 @@</span><br><span> if (!net)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ net->sms_db_file_path = talloc_strdup(net, SMS_DEFAULT_DB_FILE_PATH);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> net->plmn = (struct osmo_plmn_id){ .mcc=1, .mnc=1 };</span><br><span> </span><br><span> /* Permit a compile-time default of A5/3 and A5/1 */</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 07a88c2..46d3cf9 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -426,6 +426,15 @@</span><br><span> #define MNCC_GUARD_TIMEOUT_STR "Set global guard timer for mncc interface activity\n"</span><br><span> #define MNCC_GUARD_TIMEOUT_VALUE_STR "guard timer value (sec.)\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_sms_database, cfg_sms_database_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "sms-database PATH",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the path to the MSC-SMS database file\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Relative or absolute file system path to the database file (default is '" SMS_DEFAULT_DB_FILE_PATH "')\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(gsmnet, &gsmnet->sms_db_file_path, argv[0]);</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(cfg_msc_mncc_internal,</span><br><span> cfg_msc_mncc_internal_cmd,</span><br><span> "mncc internal",</span><br><span>@@ -731,6 +740,8 @@</span><br><span> static int config_write_msc(struct vty *vty)</span><br><span> {</span><br><span> vty_out(vty, "msc%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmnet->sms_db_file_path && strcmp(gsmnet->sms_db_file_path, SMS_DEFAULT_DB_FILE_PATH))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " sms-database %s%s", gsmnet->sms_db_file_path, VTY_NEWLINE);</span><br><span> if (gsmnet->mncc_sock_path)</span><br><span> vty_out(vty, " mncc external %s%s", gsmnet->mncc_sock_path, VTY_NEWLINE);</span><br><span> vty_out(vty, " mncc guard-timeout %i%s",</span><br><span>@@ -2059,6 +2070,7 @@</span><br><span> </span><br><span> install_element(CONFIG_NODE, &cfg_msc_cmd);</span><br><span> install_node(&msc_node, config_write_msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_sms_database_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_mncc_internal_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_mncc_external_cmd);</span><br><span>diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c</span><br><span>index 4cda395..4f614db 100644</span><br><span>--- a/src/osmo-msc/msc_main.c</span><br><span>+++ b/src/osmo-msc/msc_main.c</span><br><span>@@ -105,7 +105,7 @@</span><br><span> int daemonize;</span><br><span> const char *mncc_sock_path;</span><br><span> } msc_cmdline_config = {</span><br><span style="color: hsl(0, 100%, 40%);">- .database_name = "sms.db",</span><br><span style="color: hsl(120, 100%, 40%);">+ .database_name = NULL,</span><br><span> .config_file = "osmo-msc.cfg",</span><br><span> };</span><br><span> </span><br><span>@@ -647,9 +647,11 @@</span><br><span> /* TODO: is this used for crypto?? Improve randomness, at least we</span><br><span> * should try to use the nanoseconds part of the current time. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (db_init(msc_cmdline_config.database_name)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc_cmdline_config.database_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(msc_network, &msc_network->sms_db_file_path, msc_cmdline_config.database_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (db_init(msc_network->sms_db_file_path)) {</span><br><span> fprintf(stderr, "DB: Failed to init database: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- msc_cmdline_config.database_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_quote_str((char*)msc_network->sms_db_file_path, -1));</span><br><span> return 4;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index 520f07c..d389675 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -46,6 +46,7 @@</span><br><span> OsmoMSC(config)# msc</span><br><span> OsmoMSC(config-msc)# list</span><br><span> ...</span><br><span style="color: hsl(120, 100%, 40%);">+ sms-database PATH</span><br><span> assign-tmsi</span><br><span> mncc internal</span><br><span> mncc external MNCC_SOCKET_PATH</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/19875">change 19875</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-msc/+/19875"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I18d954c30fcceb0b36a620b927fd3a93dcc79f49 </div>
<div style="display:none"> Gerrit-Change-Number: 19875 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>