<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/25982">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</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>Indicate presence of GCR using the MNCC_F_GCR flag.<br><br>Change-Id: I259b6d7e4cbe26159b9b496356fc7c1c27d54521<br>Fixes: I705c860e51637b4537cad65a330ecbaaca96dd5b<br>Related: OS#5164, OS#5282<br>---<br>M include/osmocom/msc/mncc.h<br>M src/libmsc/gsm_04_08_cc.c<br>M tests/mncc/mncc_test.ok<br>3 files changed, 34 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h</span><br><span>index 5002227..06a5dcc 100644</span><br><span>--- a/include/osmocom/msc/mncc.h</span><br><span>+++ b/include/osmocom/msc/mncc.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>@@ -125,6 +124,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>@@ -161,7 +161,10 @@</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* A buffer to contain SDP ('\0' terminated) */</span><br><span> char sdp[1024];</span><br><span> };</span><br><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index d6a2864..6562daa 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -320,12 +320,16 @@</span><br><span> trans->paging_request = NULL;</span><br><span> </span><br><span> /* Get the GCR from the MO call leg (if any). */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trans->cc.lcls) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trans->cc.lcls)</span><br><span> trans->cc.lcls = trans_lcls_compose(trans, true);</span><br><span style="color: hsl(0, 100%, 40%);">- if (trans->cc.lcls) {</span><br><span style="color: hsl(0, 100%, 40%);">- trans->cc.lcls->gcr = trans->cc.msg.gcr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trans->cc.lcls && trans->cc.msg.fields & MNCC_F_GCR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = osmo_dec_gcr(&trans->cc.lcls->gcr,</span><br><span style="color: hsl(120, 100%, 40%);">+ &trans->cc.msg.gcr[0],</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(trans->cc.msg.gcr));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS(trans, LOGL_ERROR, "Failed to parse GCR\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span> trans->cc.lcls->gcr_available = true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> osmo_fsm_inst_dispatch(msc_a->c.fi, MSC_A_EV_TRANSACTION_ACCEPTED, trans);</span><br><span>@@ -517,8 +521,18 @@</span><br><span> trans->cc.lcls = trans_lcls_compose(trans, true);</span><br><span> </span><br><span> /* Pass the LCLS GCR on to the MT call leg via MNCC */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trans->cc.lcls)</span><br><span style="color: hsl(0, 100%, 40%);">- setup.gcr = trans->cc.lcls->gcr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trans->cc.lcls) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *gcr_msg = msgb_alloc(sizeof(setup.gcr), "MNCC GCR");</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gcr_parsed *gcr = &trans->cc.lcls->gcr;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gcr_msg != NULL && (rc = osmo_enc_gcr(gcr_msg, gcr)) > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&setup.gcr[0], gcr_msg->data, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ setup.fields |= MNCC_F_GCR;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS(trans, LOGL_ERROR, "Failed to encode GCR\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(gcr_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> tlv_parse(&tp, &gsm48_att_tlvdef, gh->data, payload_len, 0, 0);</span><br><span> /* emergency setup is identified by msg_type */</span><br><span>diff --git a/tests/mncc/mncc_test.ok b/tests/mncc/mncc_test.ok</span><br><span>index 7cb1201..059e808 100644</span><br><span>--- a/tests/mncc/mncc_test.ok</span><br><span>+++ b/tests/mncc/mncc_test.ok</span><br><span>@@ -1,15 +1,15 @@</span><br><span> test_sdp_termination()</span><br><span> </span><br><span> struct gsm_mncc:</span><br><span style="color: hsl(0, 100%, 40%);">-empty SDP: len=1872 sdplen=1024 sdp="\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-empty SDP, shortest possible: len=849 sdplen=1 sdp="\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-empty SDP, zero len: len=848 sdplen=0 sdp=- rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str: len=1872 sdplen=1024 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str, shortest possible: len=888 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str, but len excludes nul: len=887 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-terminated SDP str, but len too short: len=871 sdplen=23 sdp="Privacy is a desirable " rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-len way too short: len=10 sdplen=-838 sdp=- rc=-22</span><br><span style="color: hsl(0, 100%, 40%);">-len zero: len=0 sdplen=-848 sdp=- rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+empty SDP: len=1876 sdplen=1026 sdp="\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+empty SDP, shortest possible: len=851 sdplen=1 sdp="\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+empty SDP, zero len: len=850 sdplen=0 sdp=- rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str: len=1876 sdplen=1026 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str, shortest possible: len=890 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str, but len excludes nul: len=889 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+terminated SDP str, but len too short: len=873 sdplen=23 sdp="Privacy is a desirable " rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+len way too short: len=10 sdplen=-840 sdp=- rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+len zero: len=0 sdplen=-850 sdp=- rc=-22</span><br><span> </span><br><span> struct gsm_mncc_rtp:</span><br><span> empty SDP: len=1168 sdplen=1024 sdp="\0" rc=0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/25982">change 25982</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-msc/+/25982"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I259b6d7e4cbe26159b9b496356fc7c1c27d54521 </div>
<div style="display:none"> Gerrit-Change-Number: 25982 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>