<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15974">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Allow ASP role to be configured<br><br>So far, we had a static role model:<br>* SCTP servers (listening, such as OsmoSTP) are role SGW<br>* SCTP clients (connecting, such as OsmoMSC) are role ASP<br><br>While this is customary, it is not actually required by the<br>specification. The SGW can establish the SCTP connection to an ASP<br>but still remain "SG" role.<br><br>Let's make things more flexible by having the role configurable.<br><br>Related: OS#2005<br>Change-Id: I2df9cd9747ad5c9a05d567d9a71bab6184c53674<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/osmo_ss7.c<br>M src/osmo_ss7_vty.c<br>M src/sccp_user.c<br>4 files changed, 34 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/74/15974/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>index bbf9f81..3ad9d7b 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -417,6 +417,8 @@</span><br><span> enum osmo_ss7_asp_protocol proto;</span><br><span> enum osmo_ss7_asp_admin_state adm_state;</span><br><span> bool is_server;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool role_set_by_vty;</span><br><span> </span><br><span> struct osmo_ss7_asp_peer local;</span><br><span> struct osmo_ss7_asp_peer remote;</span><br><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index 35df192..8687690 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -1287,7 +1287,6 @@</span><br><span> int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_ss7_asp_role role;</span><br><span> char bufloc[512], bufrem[512];</span><br><span> </span><br><span> OSMO_ASSERT(ss7_initialized);</span><br><span>@@ -1332,8 +1331,6 @@</span><br><span> will continue to retry (due to timeout being explicitly set with</span><br><span> osmo_stream_cli_set_reconnect_timeout() above) to connect so the error is transient */</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: make this configurable and not implicit */</span><br><span style="color: hsl(0, 100%, 40%);">- role = OSMO_SS7_ASP_ROLE_ASP;</span><br><span> } else {</span><br><span> /* We are in server mode now */</span><br><span> if (asp->client) {</span><br><span>@@ -1345,14 +1342,12 @@</span><br><span> /* FIXME: ensure we have a SCTP server */</span><br><span> LOGPASP(asp, DLSS7, LOGL_NOTICE, "ASP Restart for server "</span><br><span> "not implemented yet!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: make this configurable and not implicit */</span><br><span style="color: hsl(0, 100%, 40%);">- role = OSMO_SS7_ASP_ROLE_SG;</span><br><span> }</span><br><span> </span><br><span> /* (re)start the ASP FSM */</span><br><span> if (asp->fi)</span><br><span> osmo_fsm_inst_term(asp->fi, OSMO_FSM_TERM_REQUEST, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- asp->fi = xua_asp_fsm_start(asp, role, LOGL_DEBUG);</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->fi = xua_asp_fsm_start(asp, asp->cfg.role, LOGL_DEBUG);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index 9c22fb1..1b8b043 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -580,6 +580,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> asp->cfg.is_server = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.role = OSMO_SS7_ASP_ROLE_SG;</span><br><span> </span><br><span> vty->node = L_CS7_ASP_NODE;</span><br><span> vty->index = asp;</span><br><span>@@ -637,6 +638,29 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(asp_role, asp_role_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "role (sg|asp|ipsp)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Specify the xUA role for this ASP\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SG (Signaling Gateway)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "ASP (Application Server Process)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IPSP (IP Signalling Point)\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], "sg")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.role = OSMO_SS7_ASP_ROLE_SG;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strcmp(argv[0], "asp")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strcmp(argv[0], "ipsp")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "IPSP role isn't supported yet%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ asp->cfg.role_set_by_vty = true;</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>@@ -707,6 +731,10 @@</span><br><span> }</span><br><span> if (asp->cfg.qos_class)</span><br><span> vty_out(vty, " qos-class %u%s", asp->cfg.qos_class, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (asp->cfg.role_set_by_vty) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " role %s%s", get_value_string(osmo_ss7_asp_role_names, asp->cfg.role),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -1847,6 +1875,7 @@</span><br><span> install_element(L_CS7_ASP_NODE, &asp_remote_ip_cmd);</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 style="color: hsl(120, 100%, 40%);">+ install_element(L_CS7_ASP_NODE, &asp_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/sccp_user.c b/src/sccp_user.c</span><br><span>index 4e4144e..929445f 100644</span><br><span>--- a/src/sccp_user.c</span><br><span>+++ b/src/sccp_user.c</span><br><span>@@ -587,6 +587,7 @@</span><br><span> </span><br><span> /* Ensure that the ASP we use is set to client mode. */</span><br><span> asp->cfg.is_server = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;</span><br><span> </span><br><span> /* Restart ASP */</span><br><span> if (prot != OSMO_SS7_ASP_PROT_IPA)</span><br><span>@@ -734,6 +735,7 @@</span><br><span> if (!asp)</span><br><span> goto out_rt;</span><br><span> asp->cfg.is_server = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.role = OSMO_SS7_ASP_ROLE_SG;</span><br><span> osmo_ss7_as_add_asp(as, asp_name);</span><br><span> talloc_free(asp_name);</span><br><span> talloc_free(as_name);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15974">change 15974</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/+/15974"/><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: I2df9cd9747ad5c9a05d567d9a71bab6184c53674 </div>
<div style="display:none"> Gerrit-Change-Number: 15974 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>