<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16956">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">examples/sccp_demo_user: Support reading log/vty config from file<br><br>Passing a config file is still optional, and both client and server work<br>out of the box with providing any. It's still goot allowing to pass a<br>config file to be able to configure easily stuff like logging, VTY ip<br>address binding, etc.<br><br>Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e<br>---<br>M examples/sccp_demo_user.c<br>1 file changed, 27 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c</span><br><span>index e3f5ee0..88aead3 100644</span><br><span>--- a/examples/sccp_demo_user.c</span><br><span>+++ b/examples/sccp_demo_user.c</span><br><span>@@ -13,6 +13,8 @@</span><br><span> #include <osmocom/core/fsm.h></span><br><span> #include <osmocom/vty/vty.h></span><br><span> #include <osmocom/vty/telnet_interface.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/misc.h></span><br><span> </span><br><span> #include <osmocom/sigtran/osmo_ss7.h></span><br><span> #include <osmocom/sigtran/sccp_sap.h></span><br><span>@@ -22,6 +24,8 @@</span><br><span> </span><br><span> #include "internal.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const char *config_file;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_sccp_instance *g_sccp;</span><br><span> </span><br><span> static struct osmo_sccp_instance *sua_server_helper(int local_port, const char *local_address, int local_pc,</span><br><span>@@ -71,11 +75,10 @@</span><br><span> .num_cat = ARRAY_SIZE(log_info_cat),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void init_logging(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static void init_logging(void *tall_ctx)</span><br><span> {</span><br><span> const int log_cats[] = { DLSS7, DLSUA, DLM3UA, DLSCCP, DLINP };</span><br><span> unsigned int i;</span><br><span style="color: hsl(0, 100%, 40%);">- void *tall_ctx = talloc_named_const(NULL, 1, "example");</span><br><span> msgb_talloc_ctx_init(tall_ctx, 0);</span><br><span> osmo_init_logging2(tall_ctx, &log_info);</span><br><span> log_set_print_category(osmo_stderr_target, true);</span><br><span>@@ -177,7 +180,7 @@</span><br><span> int remote_pc = DEFAULT_PC_CLIENT;</span><br><span> bool lflag = false, rflag = false, Lflag = false, Rflag = false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while ((ch = getopt(argc, argv, "cl:r:L:R:")) != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while ((ch = getopt(argc, argv, "cl:r:L:R:C:")) != -1) {</span><br><span> switch (ch) {</span><br><span> case 'c':</span><br><span> client = true;</span><br><span>@@ -222,6 +225,9 @@</span><br><span> remote_pc = atoi(optarg);</span><br><span> Rflag = true;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'C':</span><br><span style="color: hsl(120, 100%, 40%);">+ config_file = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> usage();</span><br><span> }</span><br><span>@@ -237,14 +243,30 @@</span><br><span> signal(SIGUSR1, &signal_handler);</span><br><span> signal(SIGUSR2, &signal_handler);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- init_logging();</span><br><span style="color: hsl(120, 100%, 40%);">+ void *tall_ctx = talloc_named_const(NULL, 1, "sccp_demo_user");</span><br><span style="color: hsl(120, 100%, 40%);">+ init_logging(tall_ctx);</span><br><span> OSMO_ASSERT(osmo_ss7_init() == 0);</span><br><span> osmo_fsm_log_addr(false);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_info.tall_ctx = tall_ctx;</span><br><span> vty_init(&vty_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_vty_add_cmds();</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_vty_add_cmds();</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_vty_add_cmds();</span><br><span> osmo_ss7_vty_init_asp(NULL);</span><br><span> osmo_sccp_vty_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = telnet_init_dynif(NULL, NULL, local_address, 2324+client);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Read the config if requested with -C */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (config_file) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = vty_read_config_file(config_file, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_FATAL, "Failed to parse the config file: '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ config_file);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(NULL, NULL, config_file ? vty_get_bind_addr() : local_address,</span><br><span style="color: hsl(120, 100%, 40%);">+ 2324+client);</span><br><span> if (rc < 0) {</span><br><span> perror("Error binding VTY port");</span><br><span> exit(1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16956">change 16956</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/libosmo-sccp/+/16956"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie75d004a0e9f24309060f241f22209df1bbe358e </div>
<div style="display:none"> Gerrit-Change-Number: 16956 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>