<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15804">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ss7: Only override traffic mode from recv REG REQ if not set by VTY<br><br>RFC 4666 (SS7/MTP3/M3UA) states in isection 4.3.4.3 ASP Active Procedures:<br>"""<br>If the traffic handling mode of the Application Server is not already known via<br>configuration data, then the traffic handling mode indicated in the<br>first ASP Active message causing the transition of the Application<br>Server state to AS-ACTIVE MAY be used to set the mode.<br>"""<br><br>In section 3.6.1 Registration Request (REG REQ), no related information<br>is provided on how to handle it, but still makes sense to apply same<br>behavior as in 4.3.4.3.<br><br>Related: OS#4220<br>Change-Id: Iaebe3a93ad8d2d84ae01e41b02674f8ece9dfc95<br>---<br>M TODO-RELEASE<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/osmo_ss7.c<br>M src/osmo_ss7_vty.c<br>M src/xua_rkm.c<br>5 files changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 224f6bc..37a636e 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -9,3 +9,4 @@</span><br><span> #library what description / commit summary line</span><br><span> libosmo-sigtran osmo_ss7_asp_peer ABI breakage (host is now an array of strings)</span><br><span> libosmo-sigtran osmo_ss7_as ABI breakage (added field last_asp_idx_sent)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo-sigtran osmo_ss7_as ABI breakage (added field mode_set_by_vty)</span><br><span>diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>index 4f3d6f5..1b5fc31 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,6 +314,7 @@</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%);">+ bool mode_set_by_vty;</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/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index 6c6e412..efbceb8 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -2049,12 +2049,13 @@</span><br><span> {</span><br><span> switch (in) {</span><br><span> case M3UA_TMOD_OVERRIDE:</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span> return OSMO_SS7_AS_TMOD_OVERRIDE;</span><br><span> case M3UA_TMOD_LOADSHARE:</span><br><span> return OSMO_SS7_AS_TMOD_LOADSHARE;</span><br><span> case M3UA_TMOD_BCAST:</span><br><span> return OSMO_SS7_AS_TMOD_BCAST;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(false);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index b068fec..9c22fb1 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -811,6 +811,7 @@</span><br><span> struct osmo_ss7_as *as = vty->index;</span><br><span> </span><br><span> as->cfg.mode = get_string_value(osmo_ss7_as_traffic_mode_vals, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode_set_by_vty = true;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -994,7 +995,7 @@</span><br><span> continue;</span><br><span> vty_out(vty, " asp %s%s", asp->cfg.name, VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (as->cfg.mode != OSMO_SS7_AS_TMOD_OVERRIDE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (as->cfg.mode_set_by_vty)</span><br><span> vty_out(vty, " traffic-mode %s%s",</span><br><span> osmo_ss7_as_traffic_mode_name(as->cfg.mode), VTY_NEWLINE);</span><br><span> if (as->cfg.recovery_timeout_msec != 2000) {</span><br><span>diff --git a/src/xua_rkm.c b/src/xua_rkm.c</span><br><span>index 2d8a25e..b3c785f 100644</span><br><span>--- a/src/xua_rkm.c</span><br><span>+++ b/src/xua_rkm.c</span><br><span>@@ -152,7 +152,6 @@</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(0, 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>@@ -171,8 +170,6 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tmode = osmo_ss7_tmode_from_xua(_tmode);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* destination point code (mandatory) */</span><br><span> dpc = xua_msg_get_u32(inner, M3UA_IEI_DEST_PC);</span><br><span> </span><br><span>@@ -220,6 +217,8 @@</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(120, 100%, 40%);">+ if (!as->cfg.mode_set_by_vty && _tmode)</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode = osmo_ss7_tmode_from_xua(_tmode);</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>@@ -232,7 +231,8 @@</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%);">- as->cfg.mode = tmode;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!as->cfg.mode_set_by_vty && _tmode)</span><br><span style="color: hsl(120, 100%, 40%);">+ as->cfg.mode = osmo_ss7_tmode_from_xua(_tmode);</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/+/15804">change 15804</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/+/15804"/><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: Iaebe3a93ad8d2d84ae01e41b02674f8ece9dfc95 </div>
<div style="display:none"> Gerrit-Change-Number: 15804 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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-MessageType: merged </div>