<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/22773">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">m3ua: re-factor m3ua_rx_xfer(): Externalize AS for ASP lookup<br><br>Let's factor-out the lookup of the AS into the separate function<br>find_as_for_asp(). This enables us to reuse this code in upcoming<br>support for SNM messages.<br><br>Change-Id: If58ea24efe7d54994a7ca2f0a97944bd297a8cc6<br>---<br>M src/m3ua.c<br>1 file changed, 42 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/m3ua.c b/src/m3ua.c</span><br><span>index 08a89b5..542777e 100644</span><br><span>--- a/src/m3ua.c</span><br><span>+++ b/src/m3ua.c</span><br><span>@@ -533,7 +533,7 @@</span><br><span> }</span><br><span> </span><br><span> /* if given ASP only has one AS, return that AS */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_ss7_as *find_single_as_for_asp(struct osmo_ss7_asp *asp)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp)</span><br><span> {</span><br><span> struct osmo_ss7_as *as, *as_found = NULL;</span><br><span> </span><br><span>@@ -549,11 +549,49 @@</span><br><span> return as_found;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct xua_msg_part *rctx_ie)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ *as = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rctx_ie) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t rctx = xua_msg_part_get_u32(rctx_ie);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Use routing context IE to look up the AS for which the</span><br><span style="color: hsl(120, 100%, 40%);">+ * message was received. */</span><br><span style="color: hsl(120, 100%, 40%);">+ *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!*as) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ __func__, rctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return M3UA_ERR_INVAL_ROUT_CTX;</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%);">+ /* Verify that this ASP is part of the AS. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_ss7_as_has_asp(*as, asp)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLM3UA, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(): This Application Server Process is not part of the AS %s "</span><br><span style="color: hsl(120, 100%, 40%);">+ "resolved by routing context %u\n", __func__, (*as)->cfg.name, rctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ return M3UA_ERR_NO_CONFGD_AS_FOR_ASP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* no explicit routing context; this only works if there is only one AS in the ASP */</span><br><span style="color: hsl(120, 100%, 40%);">+ *as = find_single_as_for_asp(asp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!*as) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLM3UA, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely "</span><br><span style="color: hsl(120, 100%, 40%);">+ "identify the AS for this message\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ return M3UA_ERR_INVAL_ROUT_CTX;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua)</span><br><span> {</span><br><span> struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX);</span><br><span> struct m3ua_data_hdr *dh;</span><br><span> struct osmo_ss7_as *as;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> LOGPASP(asp, DLM3UA, LOGL_DEBUG, "m3ua_rx_xfer\n");</span><br><span> </span><br><span>@@ -565,34 +603,9 @@</span><br><span> return M3UA_ERR_UNSUPP_MSG_TYPE;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (rctx_ie) {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t rctx = xua_msg_part_get_u32(rctx_ie);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Use routing context IE to look up the AS for which the</span><br><span style="color: hsl(0, 100%, 40%);">- * message was received. */</span><br><span style="color: hsl(0, 100%, 40%);">- as = osmo_ss7_as_find_by_rctx(asp->inst, rctx);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!as) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing context: %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, rctx);</span><br><span style="color: hsl(0, 100%, 40%);">- return M3UA_ERR_INVAL_ROUT_CTX;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Verify that this ASP is part of the AS. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_ss7_as_has_asp(as, asp)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPASP(asp, DLM3UA, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s(): This Application Server Process is not part of the AS %s "</span><br><span style="color: hsl(0, 100%, 40%);">- "resolved by routing context %u\n", __func__, (as)->cfg.name, rctx);</span><br><span style="color: hsl(0, 100%, 40%);">- return M3UA_ERR_NO_CONFGD_AS_FOR_ASP;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* no explicit routing context; this only works if there is only one AS in the ASP */</span><br><span style="color: hsl(0, 100%, 40%);">- as = find_single_as_for_asp(asp);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!as) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPASP(asp, DLM3UA, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely "</span><br><span style="color: hsl(0, 100%, 40%);">- "identify the AS for this message\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- return M3UA_ERR_INVAL_ROUT_CTX;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = find_as_for_asp(&as, asp, rctx_ie);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> </span><br><span> /* FIXME: check for AS state == ACTIVE */</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/22773">change 22773</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/+/22773"/><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: If58ea24efe7d54994a7ca2f0a97944bd297a8cc6 </div>
<div style="display:none"> Gerrit-Change-Number: 22773 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>