<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/24214">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">m3ua: Add quirk for allowing inbound DAUD from SG in ASP role.<br><br>The M3UA RFC talks about this message being used in ASP->SG direction,<br>not the other way around.<br><br>Closes: OS#5147<br>Change-Id: I36ff172b47142a877b37bbd149073bef35b36a74<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/m3ua.c<br>M src/osmo_ss7_vty.c<br>3 files changed, 13 insertions(+), 9 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/14/24214/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 8370dd9..a799b04 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -433,6 +433,8 @@</span><br><span> </span><br><span> /*! Peer SG doesn't send NTFY(AS-INACTIVE) after ASP-UP procedure */</span><br><span> #define OSMO_SS7_ASP_QUIRK_NO_NOTIFY 0x00000001</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Accept DAUD in ASP role (RFC states only permitted in ASP->SG role) */</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP 0x00000002</span><br><span> </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>diff --git a/src/m3ua.c b/src/m3ua.c</span><br><span>index 77326e0..283b3f8 100644</span><br><span>--- a/src/m3ua.c</span><br><span>+++ b/src/m3ua.c</span><br><span>@@ -901,6 +901,14 @@</span><br><span> xua->hdr.msg_type);</span><br><span> /* silently ignore those to not confuse the sender */</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case M3UA_SNM_DAUD:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RFC states only permitted in ASP->SG direction, not reverse. But some</span><br><span style="color: hsl(120, 100%, 40%);">+ * equipment still sends it to use as ASP ?!? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (asp->cfg.quirks & OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP)</span><br><span style="color: hsl(120, 100%, 40%);">+ xua_snm_rx_daud(asp, xua);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return M3UA_ERR_UNSUPP_MSG_TYPE;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> return M3UA_ERR_UNSUPP_MSG_TYPE;</span><br><span> }</span><br><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index bc84bca..b2e3192 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -56,12 +56,14 @@</span><br><span> "IPA Multiplex (SCCP Lite)\n"</span><br><span> </span><br><span> static const struct value_string asp_quirk_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { OSMO_SS7_ASP_QUIRK_NO_NOTIFY, "no_notify" },</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%);">+ { OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP, "daud_in_asp" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> static const struct value_string asp_quirk_descs[] = {</span><br><span> { 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%);">+ { OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP, "Allow Rx of DAUD in ASP role" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -762,11 +764,7 @@</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct osmo_ss7_asp *asp = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0 /* we only have one quirk, so there is no argv[0] yet! */</span><br><span> int quirk = get_string_value(asp_quirk_names, argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- int quirk = get_string_value(asp_quirk_names, "no_notify");</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> if (quirk < 0)</span><br><span> return CMD_WARNING;</span><br><span>@@ -781,11 +779,7 @@</span><br><span> CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span> struct osmo_ss7_asp *asp = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0 /* we only have one quirk, so there is no argv[0] yet! */</span><br><span> int quirk = get_string_value(asp_quirk_names, argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">- int quirk = get_string_value(asp_quirk_names, "no_notify");</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> if (quirk < 0)</span><br><span> return CMD_WARNING;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/24214">change 24214</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/+/24214"/><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: I36ff172b47142a877b37bbd149073bef35b36a74 </div>
<div style="display:none"> Gerrit-Change-Number: 24214 </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>