<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11116">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: tweak two printed strings<br><br>Fix typo "to long".<br><br>Say 'cs7 instance' instead of 'ss7 instance': we are interacting with a user on<br>the telnet VTY, and that user is configuring a 'cs7 instance'. Especially a<br>lowercase 'ss7' is potentially confusing ("is there an 'ss7' node?").<br><br>Changes show in ss7_asp_test.vty.<br><br>Change-Id: Iebb976531576268d58338895a4baadbca6137b80<br>---<br>M src/osmo_ss7_vty.c<br>M tests/vty/ss7_asp_test.vty<br>2 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index 295fc20..1e2f437 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -1289,7 +1289,7 @@</span><br><span>       const char *name = argv[0];</span><br><span> </span><br><span>      if (strlen(name) >= sizeof(entry->name)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                vty_out(vty, "Error: SCCP address name to long: '%s'%s",</span><br><span style="color: hsl(120, 100%, 40%);">+            vty_out(vty, "Error: SCCP address name too long: '%s'%s",</span><br><span>                  name, VTY_NEWLINE);</span><br><span>          return CMD_ERR_INCOMPLETE;</span><br><span>   }</span><br><span>@@ -1299,7 +1299,7 @@</span><br><span>    entry = addr_entry_by_name_global(name);</span><br><span>     if (entry != NULL) {</span><br><span>                 vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">-                    "Error: SCCP address name already used in ss7 instance %u: '%s'%s",</span><br><span style="color: hsl(120, 100%, 40%);">+                 "Error: SCCP address name already used in cs7 instance %u: '%s'%s",</span><br><span>                        entry->inst->cfg.id, entry->name, VTY_NEWLINE);</span><br><span>             return CMD_ERR_INCOMPLETE;</span><br><span>   }</span><br><span>diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty</span><br><span>index 9a86b23..f96e0c0 100644</span><br><span>--- a/tests/vty/ss7_asp_test.vty</span><br><span>+++ b/tests/vty/ss7_asp_test.vty</span><br><span>@@ -180,13 +180,13 @@</span><br><span> ss7_asp_vty_test(config-cs7-sccpaddr)# exit</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7)# sccp-address foobarfoobarfoobarfoobarfoobarfoobar</span><br><span style="color: hsl(0, 100%, 40%);">-Error: SCCP address name to long: 'foobarfoobarfoobarfoobarfoobarfoobar'</span><br><span style="color: hsl(120, 100%, 40%);">+Error: SCCP address name too long: 'foobarfoobarfoobarfoobarfoobarfoobar'</span><br><span> % Command incomplete.</span><br><span> </span><br><span> ss7_asp_vty_test(config-cs7)# exit</span><br><span> ss7_asp_vty_test(config)# cs7 instance 1</span><br><span> ss7_asp_vty_test(config-cs7)# sccp-address foo</span><br><span style="color: hsl(0, 100%, 40%);">-Error: SCCP address name already used in ss7 instance 0: 'foo'</span><br><span style="color: hsl(120, 100%, 40%);">+Error: SCCP address name already used in cs7 instance 0: 'foo'</span><br><span> % Command incomplete.</span><br><span> ss7_asp_vty_test(config-cs7)# sccp-address bar</span><br><span> ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11116">change 11116</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/11116"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iebb976531576268d58338895a4baadbca6137b80 </div>
<div style="display:none"> Gerrit-Change-Number: 11116 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>