<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/23055">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">main: add --vty-ref-mode, use vty_dump_xml_ref_mode()<br><br>Change-Id: Ia5abf7457ee7e97ec3fcd5520e5ef82ef808667a<br>Related: OS#5041<br>Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40<br>---<br>M stp/stp_main.c<br>1 file changed, 40 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/23055/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/stp/stp_main.c b/stp/stp_main.c</span><br><span>index 42f7108..c7a6272 100644</span><br><span>--- a/stp/stp_main.c</span><br><span>+++ b/stp/stp_main.c</span><br><span>@@ -89,17 +89,49 @@</span><br><span> printf(" -D --daemonize Fork the process into a background daemon\n");</span><br><span> printf(" -c --config-file filename The config file to use. Default: ./osmo-stp.cfg\n");</span><br><span> printf(" -V --version Print the version of OsmoSTP\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\nVTY reference generation:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n");</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%);">+static void handle_long_options(const char *prog_name, const int long_option)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (long_option) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty_ref_mode < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "%s: Unknown VTY reference generation "</span><br><span style="color: hsl(120, 100%, 40%);">+ "mode '%s'\n", prog_name, optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(vty_ref_gen_mode_names, vty_ref_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(vty_ref_gen_mode_desc, vty_ref_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "%s: error parsing cmdline options\n", prog_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static void handle_options(int argc, char **argv)</span><br><span> {</span><br><span> while (1) {</span><br><span> int option_index = 0, c;</span><br><span style="color: hsl(120, 100%, 40%);">+ static int long_option = 0;</span><br><span> static const struct option long_options[] = {</span><br><span> { "help", 0, 0, 'h' },</span><br><span> { "daemonize", 0, 0, 'D' },</span><br><span> { "config-file", 1, 0, 'c' },</span><br><span> { "version", 0, 0, 'V' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "vty-ref-mode", 1, &long_option, 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "vty-ref-xml", 0, &long_option, 2 },</span><br><span> { NULL, 0, 0, 0 }</span><br><span> };</span><br><span> </span><br><span>@@ -108,6 +140,9 @@</span><br><span> break;</span><br><span> </span><br><span> switch (c) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_long_options(argv[0], long_option);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'h':</span><br><span> print_help();</span><br><span> exit(0);</span><br><span>@@ -176,11 +211,6 @@</span><br><span> vty_info.tall_ctx = tall_stp_ctx;</span><br><span> vty_init(&vty_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- handle_options(argc, argv);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fputs(stp_copyright, stdout);</span><br><span style="color: hsl(0, 100%, 40%);">- fputs("\n", stdout);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> OSMO_ASSERT(osmo_ss7_init() == 0);</span><br><span> osmo_fsm_log_addr(false);</span><br><span> logging_vty_add_cmds();</span><br><span>@@ -191,6 +221,11 @@</span><br><span> osmo_fsm_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ handle_options(argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fputs(stp_copyright, stdout);</span><br><span style="color: hsl(120, 100%, 40%);">+ fputs("\n", stdout);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = vty_read_config_file(cmdline_config.config_file, NULL);</span><br><span> if (rc < 0) {</span><br><span> fprintf(stderr, "Failed to parse the config file '%s'\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/23055">change 23055</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/+/23055"/><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: Ia5abf7457ee7e97ec3fcd5520e5ef82ef808667a </div>
<div style="display:none"> Gerrit-Change-Number: 23055 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>