<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/25982">View Change</a></p><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>2 files changed, 15 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/25982/1</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..d4d3f96 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>@@ -161,7 +160,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..42f6bf0 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>@@ -517,8 +517,17 @@</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 *_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 (msg == NULL || (rc = osmo_enc_gcr(msg, gcr)) == 0)</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%);">+             else</span><br><span style="color: hsl(120, 100%, 40%);">+                  memcpy(&setup.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> </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></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: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>