<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11115">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;">sccp_vty: define SCCP_STR once<br><br>Define SCCP_STR in sccp_internal.h, because I know that I want to also use it<br>in osmo_ss7_vty.c.<br><br>Fix "Signaling" to "Signalling" upon copying the old string.<br><br>Change-Id: Ic93e4771147070a9222c73f80b5f7c29ae7eec35<br>---<br>M src/sccp_internal.h<br>M src/sccp_vty.c<br>M tests/vty/ss7_asp_test.vty<br>3 files changed, 6 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sccp_internal.h b/src/sccp_internal.h</span><br><span>index 66d768d..651862f 100644</span><br><span>--- a/src/sccp_internal.h</span><br><span>+++ b/src/sccp_internal.h</span><br><span>@@ -5,6 +5,8 @@</span><br><span> #include <osmocom/sigtran/sccp_sap.h></span><br><span> #include <osmocom/sigtran/osmo_ss7.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define SCCP_STR "Signalling Connection Control Part\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* an instance of the SCCP stack */</span><br><span> struct osmo_sccp_instance {</span><br><span>       /* entry in global list of ss7 instances */</span><br><span>diff --git a/src/sccp_vty.c b/src/sccp_vty.c</span><br><span>index bcedbb6..2727ccc 100644</span><br><span>--- a/src/sccp_vty.c</span><br><span>+++ b/src/sccp_vty.c</span><br><span>@@ -54,8 +54,7 @@</span><br><span> </span><br><span> DEFUN(show_sccp_users, show_sccp_users_cmd,</span><br><span>      "show cs7 instance <0-15> sccp users",</span><br><span style="color: hsl(0, 100%, 40%);">-  SHOW_STR CS7_STR INST_STR INST_STR</span><br><span style="color: hsl(0, 100%, 40%);">-      "Signaling Connection Control Part\n"</span><br><span style="color: hsl(120, 100%, 40%);">+       SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR</span><br><span>  "Show List of SCCP Users registered\n")</span><br><span> {</span><br><span>       int id = atoi(argv[0]);</span><br><span>@@ -83,8 +82,7 @@</span><br><span> </span><br><span> DEFUN(show_sccp_user_ssn, show_sccp_user_ssn_cmd,</span><br><span>         "show cs7 instance <0-15> sccp ssn <0-65535>",</span><br><span style="color: hsl(0, 100%, 40%);">-    SHOW_STR CS7_STR INST_STR INST_STR</span><br><span style="color: hsl(0, 100%, 40%);">-      "Signaling Connection Control Part\n"</span><br><span style="color: hsl(120, 100%, 40%);">+       SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR</span><br><span>  "Show List of SCCP Users registered\n")</span><br><span> {</span><br><span>       int id = atoi(argv[0]);</span><br><span>@@ -118,8 +116,7 @@</span><br><span> </span><br><span> DEFUN(show_sccp_connections, show_sccp_connections_cmd,</span><br><span>         "show cs7 instance <0-15> sccp connections",</span><br><span style="color: hsl(0, 100%, 40%);">-    SHOW_STR CS7_STR INST_STR INST_STR</span><br><span style="color: hsl(0, 100%, 40%);">-      "Signaling Connection Control Part\n"</span><br><span style="color: hsl(120, 100%, 40%);">+       SHOW_STR CS7_STR INST_STR INST_STR SCCP_STR</span><br><span>  "Show List of SCCP Users registered\n")</span><br><span> {</span><br><span>       int id = atoi(argv[0]);</span><br><span>diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty</span><br><span>index fc46cff..9a86b23 100644</span><br><span>--- a/tests/vty/ss7_asp_test.vty</span><br><span>+++ b/tests/vty/ss7_asp_test.vty</span><br><span>@@ -42,7 +42,7 @@</span><br><span>   users  User Table</span><br><span>   asp    Application Server Process (ASP)</span><br><span>   as     Application Server (AS)</span><br><span style="color: hsl(0, 100%, 40%);">-  sccp   Signaling Connection Control Part</span><br><span style="color: hsl(120, 100%, 40%);">+  sccp   Signalling Connection Control Part</span><br><span> </span><br><span> ss7_asp_vty_test# show cs7 instance 0 as ?</span><br><span>   active  Display all active ASs</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11115">change 11115</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/11115"/><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: Ic93e4771147070a9222c73f80b5f7c29ae7eec35 </div>
<div style="display:none"> Gerrit-Change-Number: 11115 </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>