<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/20872">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: Ie54c45fdcc8660f37f8db2367b53404b189b3ffc<br>Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40<br>Related: SYS#4910<br>---<br>M Transceiver52M/osmo-trx.cpp<br>1 file changed, 36 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/72/20872/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp</span><br><span>index ec1d660..ba1c740 100644</span><br><span>--- a/Transceiver52M/osmo-trx.cpp</span><br><span>+++ b/Transceiver52M/osmo-trx.cpp</span><br><span>@@ -242,11 +242,13 @@</span><br><span> </span><br><span> static void print_help()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stdout, "Options:\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -h, --help This text\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -C, --config Filename The config file to use\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -V, --version Print the version of OsmoTRX\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " --vty-ref-xml Generate the VTY reference XML output and exit.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ printf( "Some useful options:\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -h, --help This text\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -C, --config Filename The config file to use\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -V, --version Print the version of OsmoTRX\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "\nVTY reference generation:\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " --vty-ref-xml Generate the VTY reference XML output and exit.\n"</span><br><span> );</span><br><span> }</span><br><span> </span><br><span>@@ -257,6 +259,31 @@</span><br><span> << " All cmd line options are already being overridden by VTY options if set.";</span><br><span> }</span><br><span> </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 style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void handle_options(int argc, char **argv, struct trx_ctx* trx)</span><br><span> {</span><br><span> int option;</span><br><span>@@ -268,7 +295,8 @@</span><br><span> {"help", 0, 0, 'h'},</span><br><span> {"config", 1, 0, 'C'},</span><br><span> {"version", 0, 0, 'V'},</span><br><span style="color: hsl(0, 100%, 40%);">- {"vty-ref-xml", 0, &long_option, 1},</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>@@ -280,14 +308,8 @@</span><br><span> exit(0);</span><br><span> break;</span><br><span> case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- switch (long_option) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_dump_xml_ref(stdout);</span><br><span style="color: hsl(0, 100%, 40%);">- exit(0);</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "error parsing cmdline options\n");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(2);</span><br><span style="color: hsl(0, 100%, 40%);">- }</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 'a':</span><br><span> print_deprecated(option);</span><br><span> osmo_talloc_replace_string(trx, &trx->cfg.dev_args, optarg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/20872">change 20872</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-trx/+/20872"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie54c45fdcc8660f37f8db2367b53404b189b3ffc </div>
<div style="display:none"> Gerrit-Change-Number: 20872 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>