<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20954">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: register VTY commands before handle_options()<br><br>Otherwise only those commands that are registered by libosmocore<br>appear in the generated XML VTY reference - change the order.<br><br>Instead of a pointer to 'struct gsm_bts', pass the application's<br>talloc context, as it's only used for dynamic command allocation.<br><br>Change-Id: Ic356a950da85de02c82e9882a5fbadaaa6929680<br>Related: SYS#4937, OS#3036<br>---<br>M include/osmo-bts/vty.h<br>M src/common/main.c<br>M src/common/vty.c<br>3 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h</span><br><span>index b6e3f0d..c9840d1 100644</span><br><span>--- a/include/osmo-bts/vty.h</span><br><span>+++ b/include/osmo-bts/vty.h</span><br><span>@@ -22,7 +22,7 @@</span><br><span> int bts_vty_go_parent(struct vty *vty);</span><br><span> int bts_vty_is_config_node(struct vty *vty, int node);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int bts_vty_init(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_vty_init(void *ctx);</span><br><span> </span><br><span> struct gsm_network *gsmnet_from_vty(struct vty *v);</span><br><span> </span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 279e823..463b7a8 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -277,6 +277,9 @@</span><br><span> osmo_cpu_sched_vty_init(tall_bts_ctx);</span><br><span> rate_ctr_init(tall_bts_ctx);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bts_vty_init(tall_bts_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_vty_init();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> handle_options(argc, argv);</span><br><span> </span><br><span> bts = gsm_bts_alloc(tall_bts_ctx, 0);</span><br><span>@@ -285,9 +288,6 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_vty_init();</span><br><span style="color: hsl(0, 100%, 40%);">- bts_vty_init(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* enable realtime priority for us */</span><br><span> if (rt_prio != -1) {</span><br><span> struct sched_param param;</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index d20b143..957678a 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -1815,33 +1815,33 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int bts_vty_init(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_vty_init(void *ctx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names,</span><br><span> "gsmtap-sapi (",</span><br><span> "|",")", VTY_DO_LOWER);</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names,</span><br><span> "Enable sending of UL/DL messages over GSMTAP\n",</span><br><span> "\n", "", 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names,</span><br><span> "no gsmtap-sapi (",</span><br><span> "|",")", VTY_DO_LOWER);</span><br><span style="color: hsl(0, 100%, 40%);">- cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, gsmtap_sapi_names,</span><br><span> NO_STR "Disable sending of UL/DL messages over GSMTAP\n",</span><br><span> "\n", "", 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, l1sap_common_sapi_names,</span><br><span> "logging filter l1-sapi (",</span><br><span> "|", ")", VTY_DO_LOWER);</span><br><span style="color: hsl(0, 100%, 40%);">- logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, l1sap_common_sapi_names,</span><br><span> LOGGING_STR FILTER_STR "L1 SAPI\n",</span><br><span> "\n", "", 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- no_logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ no_logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(ctx, l1sap_common_sapi_names,</span><br><span> "no logging filter l1-sapi (",</span><br><span> "|", ")", VTY_DO_LOWER);</span><br><span style="color: hsl(0, 100%, 40%);">- no_logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(bts, l1sap_common_sapi_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ no_logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx, l1sap_common_sapi_names,</span><br><span> NO_STR LOGGING_STR FILTER_STR "L1 SAPI\n",</span><br><span> "\n", "", 0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20954">change 20954</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/+/20954"/><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: Ic356a950da85de02c82e9882a5fbadaaa6929680 </div>
<div style="display:none"> Gerrit-Change-Number: 20954 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: fixeria <vyanitskiy@sysmocom.de> </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>