<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20863">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: 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;">main: add --vty-ref-mode, use vty_dump_xml_ref_mode()<br><br>Change-Id: I744520199ef448ff095d0fe703d79ac08f08f7fe<br>Depends: Ie2022a7f9e167e5ceacf15350c037dd43768ff40<br>Related: SYS#4910<br>---<br>M src/common/main.c<br>1 file changed, 32 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index b1b1766..279e823 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -76,11 +76,38 @@</span><br><span> " -V --version Print version information and exit\n"</span><br><span> " -e --log-level Set a global log-level\n"</span><br><span> " -i --gsmtap-ip The destination IP used for GSMTAP.\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%);">+ "\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> bts_model_print_help();</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> /* FIXME: finally get some option parsing code into libosmocore */</span><br><span> static void handle_options(int argc, char **argv)</span><br><span> {</span><br><span>@@ -110,7 +137,8 @@</span><br><span> { "gsmtap-ip", 1, 0, 'i' },</span><br><span> { "trx-num", 1, 0, 't' },</span><br><span> { "realtime", 1, 0, 'r' },</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> { 0, 0, 0, 0 }</span><br><span> };</span><br><span> </span><br><span>@@ -125,14 +153,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 's':</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20863">change 20863</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-bts/+/20863"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I744520199ef448ff095d0fe703d79ac08f08f7fe </div>
<div style="display:none"> Gerrit-Change-Number: 20863 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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>