<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13586">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-hlr: allow configuring db path from cfg file<br><br>So far, the cmdline argument was the only way to set a database config file.<br>Add a similar config to VTY as 'hlr' / 'database'. The cmdline arg is stronger<br>than the 'database' cfg item. DB is not reloaded from VTY command.<br><br>Change-Id: I87b8673324e1e6225afb758fb4963ff3279ea3d8<br>---<br>M src/hlr.c<br>M src/hlr.h<br>M src/hlr_vty.c<br>3 files changed, 23 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/86/13586/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index ce8c388..836d57b 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -621,7 +621,7 @@</span><br><span> bool db_upgrade;</span><br><span> } cmdline_opts = {</span><br><span> .config_file = "osmo-hlr.cfg",</span><br><span style="color: hsl(0, 100%, 40%);">- .db_file = "hlr.db",</span><br><span style="color: hsl(120, 100%, 40%);">+ .db_file = NULL,</span><br><span> .daemonize = false,</span><br><span> .db_upgrade = false,</span><br><span> };</span><br><span>@@ -736,6 +736,7 @@</span><br><span> INIT_LLIST_HEAD(&g_hlr->iuse_list);</span><br><span> INIT_LLIST_HEAD(&g_hlr->ss_sessions);</span><br><span> INIT_LLIST_HEAD(&g_hlr->ussd_routes);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_hlr, &g_hlr->db_file_path, HLR_DEFAULT_DB_FILE_PATH);</span><br><span> </span><br><span> /* Init default (call independent) SS session guard timeout value */</span><br><span> g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT;</span><br><span>@@ -774,9 +775,12 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_hlr->dbc = db_open(hlr_ctx, cmdline_opts.db_file, true, cmdline_opts.db_upgrade);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cmdline_opts.db_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_hlr, &g_hlr->db_file_path, cmdline_opts.db_file);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->dbc = db_open(hlr_ctx, g_hlr->db_file_path, true, cmdline_opts.db_upgrade);</span><br><span> if (!g_hlr->dbc) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_FATAL, "Error opening database\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_FATAL, "Error opening database %s\n", osmo_quote_str(g_hlr->db_file_path, -1));</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/hlr.h b/src/hlr.h</span><br><span>index 00fa43c..e2e96a4 100644</span><br><span>--- a/src/hlr.h</span><br><span>+++ b/src/hlr.h</span><br><span>@@ -25,6 +25,8 @@</span><br><span> #include <stdbool.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HLR_DEFAULT_DB_FILE_PATH "hlr.db"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct hlr_euse;</span><br><span> </span><br><span> struct hlr {</span><br><span>@@ -32,6 +34,7 @@</span><br><span> struct osmo_gsup_server *gs;</span><br><span> </span><br><span> /* DB context */</span><br><span style="color: hsl(120, 100%, 40%);">+ char *db_file_path;</span><br><span> struct db_context *dbc;</span><br><span> </span><br><span> /* Control Interface */</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index d0a623a..e4cc4be 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -74,6 +74,8 @@</span><br><span> vty_out(vty, "hlr%s", VTY_NEWLINE);</span><br><span> if (g_hlr->store_imei)</span><br><span> vty_out(vty, " store-imei%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->db_file_path && strcmp(g_hlr->db_file_path, HLR_DEFAULT_DB_FILE_PATH))</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " database %s%s", g_hlr->db_file_path, VTY_NEWLINE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -224,6 +226,15 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_database, cfg_database_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "database PATH",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the path to the HLR database file\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Relative or absolute file system path to the database file (default is '" HLR_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(g_hlr, &g_hlr->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> struct cmd_node euse_node = {</span><br><span> EUSE_NODE,</span><br><span> "%s(config-hlr-euse)# ",</span><br><span>@@ -380,6 +391,8 @@</span><br><span> </span><br><span> install_element(GSUP_NODE, &cfg_hlr_gsup_bind_ip_cmd);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(HLR_NODE, &cfg_database_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_element(HLR_NODE, &cfg_euse_cmd);</span><br><span> install_element(HLR_NODE, &cfg_no_euse_cmd);</span><br><span> install_node(&euse_node, config_write_euse);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13586">change 13586</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/13586"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I87b8673324e1e6225afb758fb4963ff3279ea3d8 </div>
<div style="display:none"> Gerrit-Change-Number: 13586 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>