<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20471">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty/command: assign flags to CMD_ATTR_{IMMEDIATE,NODE_EXIT}<br><br>Change-Id: I77c1ef7ca4c667c769cc53c7ac65c3be5c7e1c86<br>Related: SYS#4937<br>---<br>M src/vty/command.c<br>M tests/vty/vty_transcript_test.vty<br>2 files changed, 57 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/command.c b/src/vty/command.c</span><br><span>index 60fb620..d64902b 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -631,6 +631,19 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Get a flag character for a global VTY command attribute */</span><br><span style="color: hsl(120, 100%, 40%);">+static char cmd_attr_get_flag(unsigned int attr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (attr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CMD_ATTR_IMMEDIATE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '!';</span><br><span style="color: hsl(120, 100%, 40%);">+ case CMD_ATTR_NODE_EXIT:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '@';</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return '.';</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> /* Description of attributes shared between the lib commands */</span><br><span> static const char * const cmd_lib_attr_desc[32] = {</span><br><span> /* [OSMO_LIBNAME_LIB_ATTR_ATTRNAME] = \</span><br><span>@@ -662,14 +675,20 @@</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(cmd_attr_desc) - 1; i++) {</span><br><span> char *xml_att_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+ char flag;</span><br><span> </span><br><span> if (~cmd->attr & cmd_attr_desc[i].value)</span><br><span> continue;</span><br><span> </span><br><span> xml_att_desc = xml_escape(cmd_attr_desc[i].str);</span><br><span style="color: hsl(0, 100%, 40%);">- print_func(data, " <attribute doc='%s' />%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ print_func(data, " <attribute doc='%s'",</span><br><span> xml_att_desc, newline);</span><br><span> talloc_free(xml_att_desc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ flag = cmd_attr_get_flag(cmd_attr_desc[i].value);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flag != '.')</span><br><span style="color: hsl(120, 100%, 40%);">+ print_func(data, " flag='%c'", flag);</span><br><span style="color: hsl(120, 100%, 40%);">+ print_func(data, " />%s", newline);</span><br><span> }</span><br><span> </span><br><span> print_func(data, " </attributes>%s", newline);</span><br><span>@@ -2965,9 +2984,12 @@</span><br><span> vty_out(vty, " Global attributes:%s", VTY_NEWLINE);</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(cmd_attr_desc) - 1; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ flag = cmd_attr_get_flag(cmd_attr_desc[i].value);</span><br><span> desc = cmd_attr_desc[i].str;</span><br><span style="color: hsl(0, 100%, 40%);">- flag = '.'; /* FIXME: no flags defined */</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %c %s%s", flag, desc, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Skip attributes without flags */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flag != '.')</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %c %s%s", flag, desc, VTY_NEWLINE);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -3072,7 +3094,26 @@</span><br><span> return flag_mask;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Compose flag char-mask for the given command (e.g. ".F.OB..") */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Compose global flag char-mask for the given command (e.g. "!" or "@") */</span><br><span style="color: hsl(120, 100%, 40%);">+static const char *cmd_gflag_mask(const struct cmd_element *cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static char char_mask[8 + 1];</span><br><span style="color: hsl(120, 100%, 40%);">+ char *ptr = &char_mask[0];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Mutually exclusive global attributes */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cmd->attr & CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+ *(ptr++) = cmd_attr_get_flag(CMD_ATTR_IMMEDIATE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (cmd->attr & CMD_ATTR_NODE_EXIT)</span><br><span style="color: hsl(120, 100%, 40%);">+ *(ptr++) = cmd_attr_get_flag(CMD_ATTR_NODE_EXIT);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ *(ptr++) = '.';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *ptr = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return char_mask;</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%);">+/* Compose app / lib flag char-mask for the given command (e.g. ".F.OB..") */</span><br><span> static const char *cmd_flag_mask(const struct cmd_element *cmd,</span><br><span> unsigned int flag_mask)</span><br><span> {</span><br><span>@@ -3121,10 +3162,11 @@</span><br><span> continue;</span><br><span> if (cmd->attr & (CMD_ATTR_DEPRECATED | CMD_ATTR_HIDDEN))</span><br><span> continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!flag_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!argc)</span><br><span> vty_out(vty, " %s%s", cmd->string, VTY_NEWLINE);</span><br><span> else {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %s %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s %s %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd_gflag_mask(cmd),</span><br><span> cmd_flag_mask(cmd, flag_mask),</span><br><span> cmd->string, VTY_NEWLINE);</span><br><span> }</span><br><span>diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty</span><br><span>index 28edf29..b626f3d 100644</span><br><span>--- a/tests/vty/vty_transcript_test.vty</span><br><span>+++ b/tests/vty/vty_transcript_test.vty</span><br><span>@@ -87,10 +87,8 @@</span><br><span> </span><br><span> vty_transcript_test> show vty-attributes</span><br><span> Global attributes:</span><br><span style="color: hsl(0, 100%, 40%);">- . This command is deprecated</span><br><span style="color: hsl(0, 100%, 40%);">- . This command is hidden</span><br><span style="color: hsl(0, 100%, 40%);">- . This command applies immediately</span><br><span style="color: hsl(0, 100%, 40%);">- . This command applies on VTY node exit</span><br><span style="color: hsl(120, 100%, 40%);">+ ! This command applies immediately</span><br><span style="color: hsl(120, 100%, 40%);">+ @ This command applies on VTY node exit</span><br><span> Library specific attributes:</span><br><span> A This command applies on ASP restart</span><br><span> Application specific attributes:</span><br><span>@@ -115,10 +113,10 @@</span><br><span> </span><br><span> vty_transcript_test(config-attr-test)# list with-flags</span><br><span> ...</span><br><span style="color: hsl(0, 100%, 40%);">- ... foo-immediate</span><br><span style="color: hsl(0, 100%, 40%);">- ... foo-node-exit</span><br><span style="color: hsl(0, 100%, 40%);">- u.. app-unbelievable</span><br><span style="color: hsl(0, 100%, 40%);">- .m. app-magnificent</span><br><span style="color: hsl(0, 100%, 40%);">- ..w app-wonderful</span><br><span style="color: hsl(0, 100%, 40%);">- um. app-unbelievable-magnificent</span><br><span style="color: hsl(0, 100%, 40%);">- u.w app-unbelievable-wonderful</span><br><span style="color: hsl(120, 100%, 40%);">+ ! ... foo-immediate</span><br><span style="color: hsl(120, 100%, 40%);">+ @ ... foo-node-exit</span><br><span style="color: hsl(120, 100%, 40%);">+ . u.. app-unbelievable</span><br><span style="color: hsl(120, 100%, 40%);">+ . .m. app-magnificent</span><br><span style="color: hsl(120, 100%, 40%);">+ . ..w app-wonderful</span><br><span style="color: hsl(120, 100%, 40%);">+ . um. app-unbelievable-magnificent</span><br><span style="color: hsl(120, 100%, 40%);">+ . u.w app-unbelievable-wonderful</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20471">change 20471</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/libosmocore/+/20471"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I77c1ef7ca4c667c769cc53c7ac65c3be5c7e1c86 </div>
<div style="display:none"> Gerrit-Change-Number: 20471 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <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-MessageType: merged </div>