<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10586">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MGCP: add 'X-Osmo-IGN: C' for SCCPlite by default<br><br>Use libosmo-mgcp-client's new X-Osmo-IGN header to indicate that CallIDs are<br>allowed to mismatch.<br><br>Add VTY commands 'msc' / 'mgw x-osmo-ign call-id' and 'no mgw x-osmo-ign' to<br>switch this behavior explicitly.<br><br>For SCCPlite MSCs, unless a specific config was issued, always send<br>'X-Osmo-IGN: C' by default, to ignore CallID mismatches.<br><br>Depends: Id7ae275ffde8ea9389270cfe3db087ee8db00b51 (osmo-mgw)<br>Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>M src/osmo-bsc/osmo_bsc_sigtran.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>4 files changed, 56 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index 7ec3442..6ca0330 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -130,6 +130,9 @@</span><br><span> * BSSMAP RESET procedure */</span><br><span> struct osmo_fsm_inst *reset_fsm;</span><br><span> } a;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t x_osmo_ign;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool x_osmo_ign_configured;</span><br><span> };</span><br><span> </span><br><span> /*</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index 091af5e..93883af 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_msc_data.h></span><br><span> </span><br><span> static struct osmo_fsm lchan_rtp_fsm;</span><br><span> </span><br><span>@@ -154,8 +155,11 @@</span><br><span> </span><br><span> lchan->mgw_endpoint_ci_bts = mgw_endpoint_ci_add(mgwep, "to-BTS");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->conn) {</span><br><span> crcx_info.call_id = lchan->conn->sccp.conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->conn->sccp.msc)</span><br><span style="color: hsl(120, 100%, 40%);">+ crcx_info.x_osmo_ign = lchan->conn->sccp.msc->x_osmo_ign;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> crcx_info.ptime = 20;</span><br><span> mgcp_pick_codec(&crcx_info, lchan, true);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>index 7e5f5f6..96f0687 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <osmocom/bsc/gsm_04_80.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_common.h></span><br><span> </span><br><span> /* A pointer to a list with all involved MSCs</span><br><span> * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */</span><br><span>@@ -496,6 +497,15 @@</span><br><span> if (!msc->a.sccp)</span><br><span> return -EINVAL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* In SCCPlite, the MSC side of the MGW endpoint is configured by the MSC. Since we have</span><br><span style="color: hsl(120, 100%, 40%);">+ * no way to figure out which CallID ('C:') the MSC will issue in its CRCX command, set</span><br><span style="color: hsl(120, 100%, 40%);">+ * an X-Osmo-IGN flag telling osmo-mgw to ignore CallID mismatches for this endpoint.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If an explicit VTY command has already indicated whether or not to send X-Osmo-IGN, do</span><br><span style="color: hsl(120, 100%, 40%);">+ * not overwrite that setting. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc->a.asp_proto == OSMO_SS7_ASP_PROT_IPA</span><br><span style="color: hsl(120, 100%, 40%);">+ && !msc->x_osmo_ign_configured)</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* If unset, use default local SCCP address */</span><br><span> if (!msc->a.bsc_addr.presence)</span><br><span> osmo_sccp_local_addr_by_instance(&msc->a.bsc_addr, msc->a.sccp,</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index efa12e0..f90ad6f 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -191,6 +191,13 @@</span><br><span> </span><br><span> /* write MGW configuration */</span><br><span> mgcp_client_config_write(vty, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc->x_osmo_ign_configured) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc->x_osmo_ign)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " no mgw x-osmo-ign%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " mgw x-osmo-ign call-id%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int config_write_msc(struct vty *vty)</span><br><span>@@ -672,6 +679,35 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_mgw_x_osmo_ign,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_msc_mgw_x_osmo_ign_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "mgw x-osmo-ign call-id",</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CLIENT_MGW_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set a (non-standard) X-Osmo-IGN header in all CRCX messages for RTP streams"</span><br><span style="color: hsl(120, 100%, 40%);">+ " associated with this MSC, useful for A/SCCPlite MSCs, since osmo-bsc cannot know"</span><br><span style="color: hsl(120, 100%, 40%);">+ " the MSC's chosen CallID. This is enabled by default for A/SCCPlite connections,"</span><br><span style="color: hsl(120, 100%, 40%);">+ " disabled by default for all others.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Send 'X-Osmo-IGN: C' to ignore CallID mismatches. See OsmoMGW.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->x_osmo_ign_configured = true;</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(cfg_msc_no_mgw_x_osmo_ign,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_msc_no_mgw_x_osmo_ign_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no mgw x-osmo-ign",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CLIENT_MGW_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Do not send X-Osmo-IGN MGCP header to this MSC\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->x_osmo_ign = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->x_osmo_ign_configured = true;</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(cfg_net_bsc_mid_call_text,</span><br><span> cfg_net_bsc_mid_call_text_cmd,</span><br><span> "mid-call-text .TEXT",</span><br><span>@@ -983,6 +1019,8 @@</span><br><span> install_element(CFG_LOG_NODE, &logging_fltr_imsi_cmd);</span><br><span> </span><br><span> mgcp_client_vty_init(net, MSC_NODE, net->mgw.conf);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_mgw_x_osmo_ign_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_no_mgw_x_osmo_ign_cmd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10586">change 10586</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/10586"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I257ad574d8060fef19afce9798bd8a5a7f8c99fe </div>
<div style="display:none"> Gerrit-Change-Number: 10586 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>