<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/23691">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;">manuals: generate VTY reference for osmo-pcap-{client,server}<br><br>Change-Id: I28353f51de798535a3bb6efdc6c2da443d96ddfb<br>Tweaked-By: Vadim Yanitskiy <vyanitskiy@sysmocom.de><br>---<br>M .gitignore<br>M configure.ac<br>M contrib/jenkins.sh<br>M doc/Makefile.am<br>A doc/manuals/Makefile.am<br>A doc/manuals/vty/Makefile.vty-reference.inc<br>A doc/manuals/vty/osmo-pcap-vty-reference.xml<br>A doc/manuals/vty/vty_additions.xml<br>M src/osmo_client_main.c<br>M src/osmo_server_main.c<br>10 files changed, 214 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index dd48c7d..cd976d9 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -37,3 +37,12 @@</span><br><span> tests/testsuite.log</span><br><span> </span><br><span> contrib/osmo-pcap.spec</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# manuals</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/generated/</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/vty/osmo-pcap-*-vty-reference.pdf</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/vty/osmo-pcap-*-vty-reference.xml</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/vty/osmo-pcap-*-vty-reference.xml.inc.gen</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/vty/osmo-pcap-*-vty-reference.xml.inc.merged</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/common</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/build</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 8ec9c88..f4c004a 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -5,6 +5,46 @@</span><br><span> </span><br><span> AM_INIT_AUTOMAKE([dist-bzip2])</span><br><span> AC_CONFIG_TESTDIR(tests)</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE(manuals,</span><br><span style="color: hsl(120, 100%, 40%);">+ [AS_HELP_STRING(</span><br><span style="color: hsl(120, 100%, 40%);">+ [--enable-manuals],</span><br><span style="color: hsl(120, 100%, 40%);">+ [Generate manual PDFs [default=no]],</span><br><span style="color: hsl(120, 100%, 40%);">+ )],</span><br><span style="color: hsl(120, 100%, 40%);">+ [osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"])</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+ fallback])</span><br><span style="color: hsl(120, 100%, 40%);">+if test x"$osmo_ac_build_manuals" = x"yes"</span><br><span style="color: hsl(120, 100%, 40%);">+then</span><br><span style="color: hsl(120, 100%, 40%);">+ # Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback)</span><br><span style="color: hsl(120, 100%, 40%);">+ if test -n "$OSMO_GSM_MANUALS_DIR"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null)"</span><br><span style="color: hsl(120, 100%, 40%);">+ if test -n "$OSMO_GSM_MANUALS_DIR"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from pkg-conf)"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (fallback)"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if ! test -d "$OSMO_GSM_MANUALS_DIR"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.")</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Find and run check-depends</span><br><span style="color: hsl(120, 100%, 40%);">+ CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh"</span><br><span style="color: hsl(120, 100%, 40%);">+ if ! test -x "$CHECK_DEPENDS"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ CHECK_DEPENDS="osmo-gsm-manuals-check-depends"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if ! $CHECK_DEPENDS; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_ERROR("missing dependencies for --enable-manuals")</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Put in Makefile with absolute path</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")"</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_SUBST([OSMO_GSM_MANUALS_DIR])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> CFLAGS="$CFLAGS -std=gnu11"</span><br><span> </span><br><span>@@ -150,5 +190,6 @@</span><br><span> contrib/osmo-pcap.spec</span><br><span> doc/Makefile</span><br><span> doc/examples/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ doc/manuals/Makefile</span><br><span> tests/Makefile</span><br><span> Makefile)</span><br><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index f1779dc..ae5177f 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -41,6 +41,11 @@</span><br><span> DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \</span><br><span> PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \</span><br><span> $MAKE distcheck || cat-testlogs.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ make -C "$base/doc/manuals" publish</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> $MAKE maintainer-clean</span><br><span> </span><br><span> osmo-clean-workspace.sh</span><br><span>diff --git a/doc/Makefile.am b/doc/Makefile.am</span><br><span>index aee2d7b..f04764f 100644</span><br><span>--- a/doc/Makefile.am</span><br><span>+++ b/doc/Makefile.am</span><br><span>@@ -1 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-SUBDIRS = examples</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ examples \</span><br><span style="color: hsl(120, 100%, 40%);">+ manuals \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span>diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..2e24c6c</span><br><span>--- /dev/null</span><br><span>+++ b/doc/manuals/Makefile.am</span><br><span>@@ -0,0 +1,11 @@</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = vty</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_MANUALS</span><br><span style="color: hsl(120, 100%, 40%);">+ # This is a significantly modified, multi-target adopted copy of</span><br><span style="color: hsl(120, 100%, 40%);">+ # $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+ VARIANTS = client server</span><br><span style="color: hsl(120, 100%, 40%);">+ include $(srcdir)/vty/Makefile.vty-reference.inc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_REPOSITORY = osmo-pcap</span><br><span style="color: hsl(120, 100%, 40%);">+ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>diff --git a/doc/manuals/vty/Makefile.vty-reference.inc b/doc/manuals/vty/Makefile.vty-reference.inc</span><br><span>new file mode 100644</span><br><span>index 0000000..ea8c68e</span><br><span>--- /dev/null</span><br><span>+++ b/doc/manuals/vty/Makefile.vty-reference.inc</span><br><span>@@ -0,0 +1,37 @@</span><br><span style="color: hsl(120, 100%, 40%);">+DOCBOOKS = $(foreach v,$(VARIANTS),vty/osmo-pcap-$(v)-vty-reference.xml)</span><br><span style="color: hsl(120, 100%, 40%);">+DOCBOOKS_DEPS = $(DOCBOOKS) $(addsuffix .inc,$(DOCBOOKS))</span><br><span style="color: hsl(120, 100%, 40%);">+INC_DIR = $(abspath $(builddir)/vty)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CLEAN_FILES += $(DOCBOOKS_DEPS)</span><br><span style="color: hsl(120, 100%, 40%);">+CLEAN_FILES += $(addsuffix .inc.gen,$(DOCBOOKS))</span><br><span style="color: hsl(120, 100%, 40%);">+CLEAN_FILES += $(addsuffix .inc.merged,$(DOCBOOKS))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+$(INC_DIR):</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+vty/osmo-pcap-%-vty-reference.xml: $(top_builddir)/src/osmo-pcap-% $(INC_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+ sed -e "s|@@GENERATED@@|$@.inc|" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "s|@@VARIANT@@|$(notdir $<)|" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "s|@@REV_NUMBER@@|$(VERSION)|" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "s|@@REV_DATE@@|$(shell date +"%dth %B %Y")|" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "s|@@CR_YEAR@@|$(shell date +"%Y")|" \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(srcdir)/vty/osmo-pcap-vty-reference.xml > $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+vty/osmo-pcap-%-vty-reference.xml.inc: $(top_builddir)/src/osmo-pcap-% \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(srcdir)/vty/*.xml $(INC_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+ # a) Invoke osmo-pcap-% to generate the list of commands first</span><br><span style="color: hsl(120, 100%, 40%);">+ $< --vty-ref-mode default --vty-ref-xml > "$@.gen"</span><br><span style="color: hsl(120, 100%, 40%);">+ # ... filter garbage potentially printed by libraries to stdout</span><br><span style="color: hsl(120, 100%, 40%);">+ sed -i '/^<vtydoc/,$$!d' "$@.gen"</span><br><span style="color: hsl(120, 100%, 40%);">+ # b) Merge the result of a) with global and local additions</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl) "$@.gen" \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(srcdir)/vty/vty_additions.xml > "$@.merged"</span><br><span style="color: hsl(120, 100%, 40%);">+ # c) Convert the result of b) into a valid docbook</span><br><span style="color: hsl(120, 100%, 40%);">+ xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl "$@.merged" > $@</span><br><span>diff --git a/doc/manuals/vty/osmo-pcap-vty-reference.xml b/doc/manuals/vty/osmo-pcap-vty-reference.xml</span><br><span>new file mode 100644</span><br><span>index 0000000..f4955dc</span><br><span>--- /dev/null</span><br><span>+++ b/doc/manuals/vty/osmo-pcap-vty-reference.xml</span><br><span>@@ -0,0 +1,35 @@</span><br><span style="color: hsl(120, 100%, 40%);">+<?xml version="1.0" encoding="UTF-8"?></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"</span><br><span style="color: hsl(120, 100%, 40%);">+"http://docbook.org/xml/5.0/dtd/docbook.dtd" [</span><br><span style="color: hsl(120, 100%, 40%);">+<!ENTITY chapter-vty SYSTEM "./common/chapters/vty.xml" ></span><br><span style="color: hsl(120, 100%, 40%);">+<!ENTITY sections-vty SYSTEM "@@GENERATED@@" ></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%);">+<book></span><br><span style="color: hsl(120, 100%, 40%);">+ <info></span><br><span style="color: hsl(120, 100%, 40%);">+ <revhistory></span><br><span style="color: hsl(120, 100%, 40%);">+ <revision></span><br><span style="color: hsl(120, 100%, 40%);">+ <revnumber>v1</revnumber></span><br><span style="color: hsl(120, 100%, 40%);">+ <date>@@REV_DATE@@</date></span><br><span style="color: hsl(120, 100%, 40%);">+ <authorinitials>s.f.m.c.</authorinitials></span><br><span style="color: hsl(120, 100%, 40%);">+ <revremark>Automatic build (@@REV_NUMBER@@)</revremark></span><br><span style="color: hsl(120, 100%, 40%);">+ </revision></span><br><span style="color: hsl(120, 100%, 40%);">+ </revhistory></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ <title>OsmoPCAP VTY Reference</title></span><br><span style="color: hsl(120, 100%, 40%);">+ <subtitle>@@VARIANT@@</subtitle></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ <copyright></span><br><span style="color: hsl(120, 100%, 40%);">+ <year>@@CR_YEAR@@</year></span><br><span style="color: hsl(120, 100%, 40%);">+ </copyright></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ <legalnotice></span><br><span style="color: hsl(120, 100%, 40%);">+ <para>This work is copyright by <orgname>sysmocom - s.f.m.c. GmbH</orgname>. All rights reserved.</span><br><span style="color: hsl(120, 100%, 40%);">+ </para></span><br><span style="color: hsl(120, 100%, 40%);">+ </legalnotice></span><br><span style="color: hsl(120, 100%, 40%);">+ </info></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ <!-- Main chapters--></span><br><span style="color: hsl(120, 100%, 40%);">+ &chapter-vty;</span><br><span style="color: hsl(120, 100%, 40%);">+</book></span><br><span>diff --git a/doc/manuals/vty/vty_additions.xml b/doc/manuals/vty/vty_additions.xml</span><br><span>new file mode 100644</span><br><span>index 0000000..a4c675e</span><br><span>--- /dev/null</span><br><span>+++ b/doc/manuals/vty/vty_additions.xml</span><br><span>@@ -0,0 +1,2 @@</span><br><span style="color: hsl(120, 100%, 40%);">+<vtydoc xmlns='urn:osmocom:xml:libosmocore:vty:doc:1.0'></span><br><span style="color: hsl(120, 100%, 40%);">+</vtydoc></span><br><span>diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c</span><br><span>index c7d68d4..4ef46cc 100644</span><br><span>--- a/src/osmo_client_main.c</span><br><span>+++ b/src/osmo_client_main.c</span><br><span>@@ -98,12 +98,41 @@</span><br><span> printf(" -T --timestamp. Print a timestamp in the debug output.\n");</span><br><span> printf(" -e --log-level number. Set a global loglevel.\n");</span><br><span> printf(" -c --config-file filename The config file to use.\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%);">+ 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 struct option long_options[] = {</span><br><span> {"help", 0, 0, 'h'},</span><br><span> {"daemonize", 0, 0, 'D'},</span><br><span>@@ -112,6 +141,8 @@</span><br><span> {"timestamp", 0, 0, 'T'},</span><br><span> {"log-level", 1, 0, 'e'},</span><br><span> {"config-file", 1, 0, 'c'},</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,6 +156,9 @@</span><br><span> print_usage();</span><br><span> print_help();</span><br><span> exit(0);</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 'D':</span><br><span> daemonize = 1;</span><br><span> break;</span><br><span>@@ -197,6 +231,7 @@</span><br><span> vty_init(&vty_info);</span><br><span> logging_vty_add_cmds();</span><br><span> osmo_stats_vty_add_cmds();</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_client_init(tall_cli_ctx);</span><br><span> </span><br><span> /* parse options */</span><br><span> handle_options(argc, argv);</span><br><span>@@ -226,7 +261,6 @@</span><br><span> LOGP(DCLIENT, LOGL_ERROR, "Failed to allocate osmo_pcap_client.\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- vty_client_init(pcap_client);</span><br><span> </span><br><span> /* initialize the queue */</span><br><span> INIT_LLIST_HEAD(&pcap_client->conns);</span><br><span>diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c</span><br><span>index 51441a7..9fa00e1 100644</span><br><span>--- a/src/osmo_server_main.c</span><br><span>+++ b/src/osmo_server_main.c</span><br><span>@@ -108,12 +108,41 @@</span><br><span> printf(" -T --timestamp. Print a timestamp in the debug output.\n");</span><br><span> printf(" -e --log-level number. Set a global loglevel.\n");</span><br><span> printf(" -c --config-file filename The config file to use.\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%);">+ 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 struct option long_options[] = {</span><br><span> {"help", 0, 0, 'h'},</span><br><span> {"daemonize", 0, 0, 'D'},</span><br><span>@@ -122,6 +151,8 @@</span><br><span> {"timestamp", 0, 0, 'T'},</span><br><span> {"log-level", 1, 0, 'e'},</span><br><span> {"config-file", 1, 0, 'c'},</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>@@ -135,6 +166,9 @@</span><br><span> print_usage();</span><br><span> print_help();</span><br><span> exit(0);</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 'D':</span><br><span> daemonize = 1;</span><br><span> break;</span><br><span>@@ -210,6 +244,7 @@</span><br><span> vty_init(&vty_info);</span><br><span> logging_vty_add_cmds();</span><br><span> osmo_stats_vty_add_cmds();</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_server_init(tall_srv_ctx);</span><br><span> </span><br><span> /* parse options */</span><br><span> handle_options(argc, argv);</span><br><span>@@ -249,7 +284,6 @@</span><br><span> pcap_server->base_path = talloc_strdup(pcap_server, "./");</span><br><span> pcap_server->max_size = 1073741824;</span><br><span> pcap_server->max_snaplen = DEFAULT_SNAPLEN;</span><br><span style="color: hsl(0, 100%, 40%);">- vty_server_init(pcap_server);</span><br><span> </span><br><span> if (vty_read_config_file(config_file, NULL) < 0) {</span><br><span> LOGP(DSERVER, LOGL_ERROR,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/23691">change 23691</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-pcap/+/23691"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I28353f51de798535a3bb6efdc6c2da443d96ddfb </div>
<div style="display:none"> Gerrit-Change-Number: 23691 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: roh <jsteiger@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>