<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15975">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Permit configuration of ASPs in SCTP client mode<br><br>The M3UA specification states that either of the two roles should<br>be the SCTP client and the other the server. It also states that<br>the default for the SGP is to operate as server. However, it permits<br>other configurations. Let's allow this to be configured by the VTY.<br><br>We need to ensure that while in ASP role, we don't send any NOTIFY<br>messages to the peer SG.<br><br>Change-Id: I7452a862d45da35dcd58654ca17222eb52d26f1f<br>Closes: OS#2005<br>---<br>M src/osmo_ss7_vty.c<br>M src/xua_as_fsm.c<br>M tests/vty/ss7_asp_test.vty<br>3 files changed, 25 insertions(+), 0 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 1b8b043..35640df 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -661,6 +661,24 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(sctp_role, asp_sctp_role_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "sctp-role (client|server)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Specify the SCTP role for this ASP\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Operate as SCTP client; connect to a server\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Operate as SCTP server; wait for client connections\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ss7_asp *asp = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "client"))</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.is_server = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(argv[0], "server"))</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.is_server = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(asp_block, asp_block_cmd,</span><br><span> "block",</span><br><span> "Allows a SCTP Association with ASP, but doesn't let it become active\n")</span><br><span>@@ -1876,6 +1894,7 @@</span><br><span> install_element(L_CS7_ASP_NODE, &asp_local_ip_cmd);</span><br><span> install_element(L_CS7_ASP_NODE, &asp_qos_class_cmd);</span><br><span> install_element(L_CS7_ASP_NODE, &asp_role_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(L_CS7_ASP_NODE, &asp_sctp_role_cmd);</span><br><span> install_element(L_CS7_ASP_NODE, &asp_block_cmd);</span><br><span> install_element(L_CS7_ASP_NODE, &asp_shutdown_cmd);</span><br><span> </span><br><span>diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c</span><br><span>index cf75ef3..97a2107 100644</span><br><span>--- a/src/xua_as_fsm.c</span><br><span>+++ b/src/xua_as_fsm.c</span><br><span>@@ -51,6 +51,10 @@</span><br><span> if (!asp)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOTIFY are only sent by SG or IPSP role */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!asp->fi || asp->fi->state == XUA_ASP_S_DOWN)</span><br><span> continue;</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 bc899eb..eeda4c8 100644</span><br><span>--- a/tests/vty/ss7_asp_test.vty</span><br><span>+++ b/tests/vty/ss7_asp_test.vty</span><br><span>@@ -216,6 +216,7 @@</span><br><span> local-ip A.B.C.D</span><br><span> qos-class <0-255></span><br><span> role (sg|asp|ipsp)</span><br><span style="color: hsl(120, 100%, 40%);">+ sctp-role (client|server)</span><br><span> block</span><br><span> shutdown</span><br><span> </span><br><span>@@ -226,6 +227,7 @@</span><br><span> local-ip Specify Local IP Address from which to contact ASP</span><br><span> qos-class Specify QoS Class of ASP</span><br><span> role Specify the xUA role for this ASP</span><br><span style="color: hsl(120, 100%, 40%);">+ sctp-role Specify the SCTP role for this ASP</span><br><span> block Allows a SCTP Association with ASP, but doesn't let it become active</span><br><span> shutdown Terminates SCTP association; New associations will be rejected</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15975">change 15975</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/libosmo-sccp/+/15975"/><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-Change-Id: I7452a862d45da35dcd58654ca17222eb52d26f1f </div>
<div style="display:none"> Gerrit-Change-Number: 15975 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>