<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11991">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE<br><br>The previous implementation of msc_send_ussd_release_complete()<br>was based on libosmogsm's GSM 04.80 API, which doesn't allow to<br>specify GSM 04.08 transaction identifier.<br><br>Ideally, we need to deprecate the old GSM 04.80 API and introduce<br>a proper implementation, but it would require much more efforts.<br>So, let's avoid using the libosmogsm's API for now.<br><br>Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37<br>---<br>M include/osmocom/msc/gsm_04_80.h<br>M src/libmsc/gsm_04_80.c<br>M src/libmsc/msc_vty.c<br>3 files changed, 21 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/91/11991/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h</span><br><span>index c448c91..b68655e 100644</span><br><span>--- a/include/osmocom/msc/gsm_04_80.h</span><br><span>+++ b/include/osmocom/msc/gsm_04_80.h</span><br><span>@@ -10,4 +10,5 @@</span><br><span> </span><br><span> int msc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level,</span><br><span> const char *text);</span><br><span style="color: hsl(0, 100%, 40%);">-int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t transaction_id);</span><br><span>diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c</span><br><span>index 81f2001..602d900 100644</span><br><span>--- a/src/libmsc/gsm_04_80.c</span><br><span>+++ b/src/libmsc/gsm_04_80.c</span><br><span>@@ -4,6 +4,7 @@</span><br><span> /* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org></span><br><span> * (C) 2008, 2009, 2010 by Holger Hans Peter Freyther <zecke@selfish.org></span><br><span> * (C) 2009 by Mike Haben <michael.haben@btinternet.com></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -78,10 +79,21 @@</span><br><span> return msc_tx_dtap(conn, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t transaction_id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = gsm0480_create_ussd_release_complete();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm48_hdr *gh;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = gsm0480_msgb_alloc_name("TS 04.80 SS/USSD REL COMPL");</span><br><span> if (!msg)</span><br><span> return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Push the L3 header */</span><br><span style="color: hsl(120, 100%, 40%);">+ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh));</span><br><span style="color: hsl(120, 100%, 40%);">+ gh->proto_discr = GSM48_PDISC_NC_SS;</span><br><span style="color: hsl(120, 100%, 40%);">+ gh->proto_discr |= transaction_id << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return msc_tx_dtap(conn, msg);</span><br><span> }</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index cdf3184..245a227 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -1029,8 +1029,12 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOTE: we don't allocate transaction here</span><br><span style="color: hsl(120, 100%, 40%);">+ * so we don't know GSM 04.08 transaction ID.</span><br><span style="color: hsl(120, 100%, 40%);">+ * NOTE: buggy libosmogsm's GSM 04.80 API</span><br><span style="color: hsl(120, 100%, 40%);">+ * hard-codes both TID and direction to 0. */</span><br><span> msc_send_ussd_notify(conn, level, text);</span><br><span style="color: hsl(0, 100%, 40%);">- msc_send_ussd_release_complete(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_send_ussd_release_complete(conn, 0);</span><br><span> </span><br><span> vlr_subscr_put(vsub);</span><br><span> talloc_free(text);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11991">change 11991</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/11991"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 </div>
<div style="display:none"> Gerrit-Change-Number: 11991 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>