<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/24213">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo_ss7: introduce notion of configurable 'quirks'<br><br>A quirk is an implementation work-around in order to establish<br>interoperability with another implementation, either a buggy one or<br>one that follows a different interpretation of a given spec.<br><br>For now, we introduce a first quirk affecting when we (in ASP role)<br>send an ASP-ACTIVE message to the SG.<br><br>Closes: OS#5145<br>Change-Id: Idd947ea39d743eb1bc9342ad9d098036821da45b<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/osmo_ss7_vty.c<br>M src/xua_default_lm_fsm.c<br>3 files changed, 77 insertions(+), 2 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/13/24213/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 a278b59..8370dd9 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -427,9 +427,13 @@</span><br><span> struct osmo_ss7_asp_peer local;</span><br><span> struct osmo_ss7_asp_peer remote;</span><br><span> uint8_t qos_class;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t quirks;</span><br><span> } cfg;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Peer SG doesn't send NTFY(AS-INACTIVE) after ASP-UP procedure */</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_SS7_ASP_QUIRK_NO_NOTIFY 0x00000001</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int osmo_ss7_asp_peer_snprintf(char* buf, size_t buf_len, struct osmo_ss7_asp_peer *peer);</span><br><span> int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,</span><br><span> const char* const* hosts, size_t host_cnt);</span><br><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index 4db3c53..bc84bca 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -1,6 +1,6 @@</span><br><span> /* Core SS7 Instance/Linkset/Link/AS/ASP VTY Interface */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2015-2017 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2015-2021 by Harald Welte <laforge@gnumonks.org></span><br><span> * All Rights Reserved</span><br><span> *</span><br><span> * SPDX-License-Identifier: GPL-2.0+</span><br><span>@@ -55,6 +55,15 @@</span><br><span> "MTP3 User Adaptation\n" \</span><br><span> "IPA Multiplex (SCCP Lite)\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string asp_quirk_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { OSMO_SS7_ASP_QUIRK_NO_NOTIFY, "no_notify" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct value_string asp_quirk_descs[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { OSMO_SS7_ASP_QUIRK_NO_NOTIFY, "Peer SG doesn't send NTFY(AS-INACTIVE) after ASP-UP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> /***********************************************************************</span><br><span> * Core CS7 Configuration</span><br><span>@@ -747,6 +756,44 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(asp_quirk, asp_quirk_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "OVERWRITTEN",</span><br><span style="color: hsl(120, 100%, 40%);">+ "OVERWRITTEN\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</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%);">+#if 0 /* we only have one quirk, so there is no argv[0] yet! */</span><br><span style="color: hsl(120, 100%, 40%);">+ int quirk = get_string_value(asp_quirk_names, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ int quirk = get_string_value(asp_quirk_names, "no_notify");</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (quirk < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.quirks |= quirk;</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 style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(asp_no_quirk, asp_no_quirk_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "OVERWRITTEN",</span><br><span style="color: hsl(120, 100%, 40%);">+ "OVERWRITTEN\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</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%);">+#if 0 /* we only have one quirk, so there is no argv[0] yet! */</span><br><span style="color: hsl(120, 100%, 40%);">+ int quirk = get_string_value(asp_quirk_names, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ int quirk = get_string_value(asp_quirk_names, "no_notify");</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (quirk < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->cfg.quirks &= ~quirk;</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(show_cs7_asp, show_cs7_asp_cmd,</span><br><span> "show cs7 instance <0-15> asp",</span><br><span> SHOW_STR CS7_STR INST_STR INST_STR "Application Server Process (ASP)\n")</span><br><span>@@ -814,6 +861,11 @@</span><br><span> }</span><br><span> if (!asp->cfg.is_server)</span><br><span> vty_out(vty, " sctp-role client%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 32; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(asp->cfg.quirks & (1 << i)))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " quirk %s%s", get_value_string(asp_quirk_names, (1 << i)), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -2029,6 +2081,17 @@</span><br><span> {</span><br><span> g_ctx = ctx;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ asp_quirk_cmd.string = vty_cmd_string_from_valstr(ctx, asp_quirk_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ "quirk (", "|", ")", VTY_DO_LOWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ asp_quirk_cmd.doc = vty_cmd_string_from_valstr(ctx, asp_quirk_descs,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable quirk to work around interop issues\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "\n", "\n", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ asp_no_quirk_cmd.string = vty_cmd_string_from_valstr(ctx, asp_quirk_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no quirk (", "|", ")", VTY_DO_LOWER);</span><br><span style="color: hsl(120, 100%, 40%);">+ asp_no_quirk_cmd.doc = vty_cmd_string_from_valstr(ctx, asp_quirk_descs,</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "Disable quirk to work around interop issues\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "\n", "\n", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_lib_element_ve(&show_cs7_user_cmd);</span><br><span> install_lib_element_ve(&show_cs7_xua_cmd);</span><br><span> install_lib_element_ve(&show_cs7_config_cmd);</span><br><span>@@ -2057,6 +2120,8 @@</span><br><span> install_lib_element(L_CS7_ASP_NODE, &asp_sctp_role_cmd);</span><br><span> install_lib_element(L_CS7_ASP_NODE, &asp_block_cmd);</span><br><span> install_lib_element(L_CS7_ASP_NODE, &asp_shutdown_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(L_CS7_ASP_NODE, &asp_quirk_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(L_CS7_ASP_NODE, &asp_no_quirk_cmd);</span><br><span> </span><br><span> install_node(&as_node, NULL);</span><br><span> install_lib_element_ve(&show_cs7_as_cmd);</span><br><span>diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c</span><br><span>index 338f4ae..1c047be 100644</span><br><span>--- a/src/xua_default_lm_fsm.c</span><br><span>+++ b/src/xua_default_lm_fsm.c</span><br><span>@@ -1,5 +1,5 @@</span><br><span> /* Default XUA Layer Manager */</span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2017 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2017-2021 by Harald Welte <laforge@gnumonks.org></span><br><span> * All Rights Reserved</span><br><span> *</span><br><span> * SPDX-License-Identifier: GPL-2.0+</span><br><span>@@ -170,6 +170,12 @@</span><br><span> restart_asp(fi);</span><br><span> break;</span><br><span> case T_WAIT_NOTIFY:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lmp->asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_NO_NOTIFY) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* some implementations don't send the NOTIFY which they SHOULD</span><br><span style="color: hsl(120, 100%, 40%);">+ * according to RFC4666 (see OS#5145) */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, LM_E_AS_INACTIVE_IND, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* No AS has reported via NOTIFY that is was</span><br><span> * (statically) configured at the SG for this ASP, so</span><br><span> * let's dynamically register */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/24213">change 24213</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/+/24213"/><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: Idd947ea39d743eb1bc9342ad9d098036821da45b </div>
<div style="display:none"> Gerrit-Change-Number: 24213 </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>