<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15978">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">xua: Allow traffic mode set by peer if not set by VTY<br><br>Change-Id: I8ca17439b4dd023625f8f22689c0432341986099<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/xua_asp_fsm.c<br>M src/xua_rkm.c<br>3 files changed, 53 insertions(+), 7 deletions(-)<br><br></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 1b5fc31..4f20d81 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -314,7 +314,10 @@</span><br><span> enum osmo_ss7_asp_protocol proto;</span><br><span> struct osmo_ss7_routing_key routing_key;</span><br><span> enum osmo_ss7_as_traffic_mode mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* traffic mode was configured by VTY / config file */</span><br><span> bool mode_set_by_vty;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* traffic mode was configured by RKM (routing key management) or ASPAC */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool mode_set_by_peer;</span><br><span> uint32_t recovery_timeout_msec;</span><br><span> uint8_t qos_class;</span><br><span> struct {</span><br><span>diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c</span><br><span>index a6ee2ec..5814532 100644</span><br><span>--- a/src/xua_asp_fsm.c</span><br><span>+++ b/src/xua_asp_fsm.c</span><br><span>@@ -415,10 +415,11 @@</span><br><span> {</span><br><span> struct xua_asp_fsm_priv *xafp = fi->priv;</span><br><span> struct osmo_ss7_asp *asp = xafp->asp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ss7_as *as;</span><br><span> struct xua_msg *xua_in;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t traf_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t traf_mode = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_as_traffic_mode tmode;</span><br><span> struct xua_msg_part *part;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t rctx;</span><br><span> int i;</span><br><span> </span><br><span> check_stop_t_ack(fi, event);</span><br><span>@@ -459,16 +460,40 @@</span><br><span> peer_send_error(fi, M3UA_ERR_UNSUPP_TRAF_MOD_TYP);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ tmode = osmo_ss7_tmode_from_xua(traf_mode);</span><br><span> }</span><br><span> if ((part = xua_msg_find_tag(xua_in, M3UA_IEI_ROUTE_CTX))) {</span><br><span> for (i = 0; i < part->len / sizeof(uint32_t); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- rctx = osmo_load32be(&part->dat[i * sizeof(uint32_t)]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_ss7_as_find_by_rctx(asp->inst, rctx)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t rctx = osmo_load32be(&part->dat[i * sizeof(uint32_t)]);</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> peer_send_error(fi, M3UA_ERR_INVAL_ROUT_CTX);</span><br><span> return;</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (traf_mode) { /* if the peer has specified a traffic mode at all */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(as, &asp->inst->as_list, list) {</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%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!as->cfg.mode_set_by_peer && !as->cfg.mode_set_by_vty) {</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode = tmode;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPAS(as, DLSS7, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ASPAC: Traffic mode set dynamically by peer to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_as_traffic_mode_name(as->cfg.mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (as->cfg.mode != tmode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*FIXME: ^ properly check if tmode is</span><br><span style="color: hsl(120, 100%, 40%);">+ compatible with already set</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ peer_send_error(fi, M3UA_ERR_UNSUPP_TRAF_MOD_TYP);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode_set_by_peer = true;</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> /* send ACK */</span><br><span> peer_send(fi, XUA_ASP_E_ASPTM_ASPAC_ACK, xua_in);</span><br><span> /* transition state and inform layer manager */</span><br><span>diff --git a/src/xua_rkm.c b/src/xua_rkm.c</span><br><span>index b3c785f..a61ac31 100644</span><br><span>--- a/src/xua_rkm.c</span><br><span>+++ b/src/xua_rkm.c</span><br><span>@@ -152,6 +152,7 @@</span><br><span> unsigned int max_nas_idx, unsigned int *nas_idx)</span><br><span> {</span><br><span> uint32_t rk_id, rctx, _tmode, dpc;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_as_traffic_mode tmode;</span><br><span> struct osmo_ss7_as *as;</span><br><span> struct osmo_ss7_route *rt;</span><br><span> char namebuf[32];</span><br><span>@@ -217,8 +218,23 @@</span><br><span> msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_INVAL_RKEY, 0);</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!as->cfg.mode_set_by_vty && _tmode)</span><br><span style="color: hsl(0, 100%, 40%);">- as->cfg.mode = osmo_ss7_tmode_from_xua(_tmode);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (_tmode) { /* if the peer has specified a traffic mode at all */</span><br><span style="color: hsl(120, 100%, 40%);">+ tmode = osmo_ss7_tmode_from_xua(_tmode);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!as->cfg.mode_set_by_peer && !as->cfg.mode_set_by_vty) {</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode = tmode;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPAS(as, DLSS7, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "RKM: Traffic mode set dynamically by peer to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_as_traffic_mode_name(as->cfg.mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (as->cfg.mode != tmode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*FIXME: ^ properly check if tmode is</span><br><span style="color: hsl(120, 100%, 40%);">+ compatible with already set as->cfg.mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLSS7, LOGL_NOTICE, "RKM: Non-matching Traffic Mode %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_as_traffic_mode_name(tmode));</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_append_reg_res(resp, rk_id, M3UA_RKM_REG_ERR_UNSUPP_TRAF_MODE, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode_set_by_peer = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (asp->inst->cfg.permit_dyn_rkm_alloc) {</span><br><span> /* Create an AS for this routing key */</span><br><span> snprintf(namebuf, sizeof(namebuf), "as-rkm-%u", rctx);</span><br><span>@@ -231,8 +247,10 @@</span><br><span> </span><br><span> as->cfg.description = talloc_strdup(as, "Auto-generated by RKM");</span><br><span> as->rkm_dyn_allocated = true;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!as->cfg.mode_set_by_vty && _tmode)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!as->cfg.mode_set_by_vty && _tmode) {</span><br><span> as->cfg.mode = osmo_ss7_tmode_from_xua(_tmode);</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode_set_by_peer = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* fill routing key */</span><br><span> as->cfg.routing_key.pc = dpc;</span><br><span> as->cfg.routing_key.context = rctx;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15978">change 15978</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/+/15978"/><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: I8ca17439b4dd023625f8f22689c0432341986099 </div>
<div style="display:none"> Gerrit-Change-Number: 15978 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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>