<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20417">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: check for reserved flags in application specific attributes<br><br>We agreed to reserve uppercase flag letters for libraries.<br><br>Change-Id: If0c332f7c86ff26a4060a14b947445d194a6702e<br>Related: SYS#4937<br>---<br>M src/vty/vty.c<br>M tests/vty/vty_test.c<br>M tests/vty/vty_test.err<br>3 files changed, 12 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/20417/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/vty.c b/src/vty/vty.c</span><br><span>index 4d51165..3b723e1 100644</span><br><span>--- a/src/vty/vty.c</span><br><span>+++ b/src/vty/vty.c</span><br><span>@@ -1809,6 +1809,14 @@</span><br><span>      for (i = 0; i < ARRAY_SIZE(app_info->usr_attr_letters); i++) {</span><br><span>                 if (app_info->usr_attr_letters[i] == '\0')</span><br><span>                        continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           /* Upper case flag letters are reserved for libraries */</span><br><span style="color: hsl(120, 100%, 40%);">+              if (app_info->usr_attr_letters[i] >= 'A' &&</span><br><span style="color: hsl(120, 100%, 40%);">+                 app_info->usr_attr_letters[i] <= 'Z') {</span><br><span style="color: hsl(120, 100%, 40%);">+                     fprintf(stderr, "Attribute flag letter '%c' is reserved "</span><br><span style="color: hsl(120, 100%, 40%);">+                           "for libraries! Please fix.\n", app_info->usr_attr_letters[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>          for (j = i + 1; j < ARRAY_SIZE(app_info->usr_attr_letters); j++) {</span><br><span>                     if (app_info->usr_attr_letters[j] != app_info->usr_attr_letters[i])</span><br><span>                            continue;</span><br><span>diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c</span><br><span>index 1608b83..3a69e13 100644</span><br><span>--- a/tests/vty/vty_test.c</span><br><span>+++ b/tests/vty/vty_test.c</span><br><span>@@ -520,6 +520,7 @@</span><br><span>         VTY_TEST_ATTR_ZOO,</span><br><span>   VTY_TEST_ATTR_FOO_DUP,</span><br><span>       VTY_TEST_ATTR_ZOO_DUP,</span><br><span style="color: hsl(120, 100%, 40%);">+        VTY_TEST_ATTR_UPPER,</span><br><span> };</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span>@@ -535,6 +536,8 @@</span><br><span>                      /* Duplicate detection check */</span><br><span>                      [VTY_TEST_ATTR_FOO_DUP] = 'f',</span><br><span>                       [VTY_TEST_ATTR_ZOO_DUP] = 'z',</span><br><span style="color: hsl(120, 100%, 40%);">+                        /* Reserved for libraries */</span><br><span style="color: hsl(120, 100%, 40%);">+                  [VTY_TEST_ATTR_UPPER]   = 'X',</span><br><span>               },</span><br><span>   };</span><br><span> </span><br><span>diff --git a/tests/vty/vty_test.err b/tests/vty/vty_test.err</span><br><span>index 25c94e6..a85b129 100644</span><br><span>--- a/tests/vty/vty_test.err</span><br><span>+++ b/tests/vty/vty_test.err</span><br><span>@@ -1,5 +1,6 @@</span><br><span> Found duplicate flag letter 'f' in application specific attributes (index 0 vs 3)! Please fix.</span><br><span> Found duplicate flag letter 'z' in application specific attributes (index 2 vs 4)! Please fix.</span><br><span style="color: hsl(120, 100%, 40%);">+Attribute flag letter 'X' is reserved for libraries! Please fix.</span><br><span> Got VTY event: 2</span><br><span> Got VTY event: 2</span><br><span> Got VTY event: 2</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20417">change 20417</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/+/20417"/><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: If0c332f7c86ff26a4060a14b947445d194a6702e </div>
<div style="display:none"> Gerrit-Change-Number: 20417 </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>