<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/25980">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;">mncc: rework passing GCR over the MNCC interface<br><br>Using *unpacked* 'struct osmo_gcr_parsed' in the MNCC PDUs makes<br>the protocol even more complicated than it currently is, and<br>moreover complicates implementing MNCCv8 in the ttcn3-sip-test.<br><br>Replace 'struct osmo_gcr_parsed' in 'struct gsm_mncc' with a<br>fixed-length buffer, which is supposed to hold the Global Call<br>Reference encoded as per 3GPP TS 29.205.<br><br>Check / indicate presence of GCR using the MNCC_F_GCR flag.<br><br>Change-Id: Iaff46732948f8f5d03e42f17c35cbac8a80af49b<br>Fixes: Id40d7e0fed9356f801b3627c118150055e7232b1<br>Related: OS#5164, OS#5282<br>---<br>M src/mncc.c<br>M src/mncc_protocol.h<br>2 files changed, 31 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mncc.c b/src/mncc.c</span><br><span>index c8bf4bd..f302b3e 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -485,6 +485,7 @@</span><br><span> const struct gsm_mncc_number *called;</span><br><span> struct call *call;</span><br><span> struct mncc_call_leg *leg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gcr_parsed gcr;</span><br><span> </span><br><span> if (rc < sizeof(*data)) {</span><br><span> LOGP(DMNCC, LOGL_ERROR, "gsm_mncc of wrong size %d vs. %zu\n",</span><br><span>@@ -525,6 +526,16 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Decode the Global Call Reference (if present) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (data->fields & MNCC_F_GCR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_dec_gcr(&gcr, data->gcr, sizeof(data->gcr)) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "MNCC leg(%u) failed to parse GCR\n", data->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_send(conn, MNCC_REJ_REQ, data->callref);</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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Create an RTP port and then allocate a call */</span><br><span> call = call_mncc_create();</span><br><span> if (!call) {</span><br><span>@@ -543,12 +554,15 @@</span><br><span> leg->conn = conn;</span><br><span> leg->state = MNCC_CC_INITIAL;</span><br><span> leg->dir = MNCC_DIR_MO;</span><br><span style="color: hsl(0, 100%, 40%);">- leg->base.call->gcr = data->gcr;</span><br><span style="color: hsl(0, 100%, 40%);">- leg->base.call->gcr_present = true;</span><br><span> memcpy(&leg->called, called, sizeof(leg->called));</span><br><span> memcpy(&leg->calling, &data->calling, sizeof(leg->calling));</span><br><span> memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (data->fields & MNCC_F_GCR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->base.call->gcr_present = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->base.call->gcr = gcr;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGP(DMNCC, LOGL_INFO,</span><br><span> "Created call(%u) with MNCC leg(%u) IMSI(%.16s)\n",</span><br><span> call->id, leg->callref, data->imsi);</span><br><span>@@ -873,6 +887,7 @@</span><br><span> {</span><br><span> struct mncc_call_leg *leg;</span><br><span> struct gsm_mncc mncc = { 0, };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span> int rc;</span><br><span> </span><br><span> leg = talloc_zero(call, struct mncc_call_leg);</span><br><span>@@ -900,8 +915,6 @@</span><br><span> </span><br><span> mncc.fields |= MNCC_F_CALLING;</span><br><span> mncc.calling.plan = GSM48_NPI_ISDN_E164;</span><br><span style="color: hsl(0, 100%, 40%);">- if (call->gcr_present)</span><br><span style="color: hsl(0, 100%, 40%);">- mncc.gcr = call->gcr;</span><br><span> </span><br><span> if (call->source && call->source[0] == '+') {</span><br><span> mncc.calling.type = GSM48_TON_INTERNATIONAL;</span><br><span>@@ -920,6 +933,16 @@</span><br><span> OSMO_STRLCPY_ARRAY(mncc.called.number, call->dest);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Encode the Global Call Reference (if present) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (call->gcr_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc(sizeof(mncc.gcr), "MNCC GCR");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_ERROR, "MNCC leg(%u) failed to encode GCR\n", call->id);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&mncc.gcr[0], msg->data, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * TODO/FIXME:</span><br><span> * - Determine/request channel based on offered audio codecs</span><br><span>diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h</span><br><span>index 11969ee..cd592ad 100644</span><br><span>--- a/src/mncc_protocol.h</span><br><span>+++ b/src/mncc_protocol.h</span><br><span>@@ -26,7 +26,6 @@</span><br><span> </span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/gsm/mncc.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/gsm29205.h></span><br><span> </span><br><span> #include <stdint.h></span><br><span> #include <netinet/in.h></span><br><span>@@ -124,6 +123,7 @@</span><br><span> #define MNCC_F_CCCAP 0x0800</span><br><span> #define MNCC_F_KEYPAD 0x1000</span><br><span> #define MNCC_F_SIGNAL 0x2000</span><br><span style="color: hsl(120, 100%, 40%);">+#define MNCC_F_GCR 0x4000</span><br><span> </span><br><span> struct gsm_mncc {</span><br><span> /* context based information */</span><br><span>@@ -160,7 +160,9 @@</span><br><span> </span><br><span> unsigned char lchan_type;</span><br><span> unsigned char lchan_mode;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_gcr_parsed gcr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Global Call Reference (encoded as per 3GPP TS 29.205) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t gcr[16];</span><br><span> </span><br><span> /* A buffer to contain SDP ('\0' terminated) */</span><br><span> char sdp[1024];</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/25980">change 25980</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/osmo-sip-connector/+/25980"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sip-connector </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaff46732948f8f5d03e42f17c35cbac8a80af49b </div>
<div style="display:none"> Gerrit-Change-Number: 25980 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>