<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9552">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use proper naming for GSM TS 09.11 implementation<br><br>During a long time, we had both file and symbol names, actually<br>related to Supplementary Services, with the 'ussd' abbreviation.<br>This is not absolutely wrong, but isn't correct at the same time.<br><br>USSD is a kind of Supplementary Services, this is only a part<br>of them. There are also 'structured' Supplementary Services,<br>which can be call related or call independent.<br><br>The "Signalling interworking for supplementary services" is<br>defined by GSM TS 09.11, and this is exactly what MSC should<br>implement. Let's use the specification number for naming, as<br>we do e.g. in the GSM 04.11 (SMS) implementation.<br><br>Change-Id: Ic1eaceddb58132318e4e941be542da34b8ebefe1<br>---<br>M include/osmocom/msc/Makefile.am<br>A include/osmocom/msc/gsm_09_11.h<br>D include/osmocom/msc/ussd.h<br>M src/libmsc/Makefile.am<br>M src/libmsc/gsm_04_08.c<br>R src/libmsc/gsm_09_11.c<br>6 files changed, 16 insertions(+), 15 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/52/9552/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am</span><br><span>index f0e24c4..5be51ea 100644</span><br><span>--- a/include/osmocom/msc/Makefile.am</span><br><span>+++ b/include/osmocom/msc/Makefile.am</span><br><span>@@ -9,6 +9,7 @@</span><br><span> gsm_04_11.h \</span><br><span> gsm_04_14.h \</span><br><span> gsm_04_80.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_09_11.h \</span><br><span> gsm_data.h \</span><br><span> gsm_data_shared.h \</span><br><span> gsm_subscriber.h \</span><br><span>@@ -30,7 +31,6 @@</span><br><span> smpp.h \</span><br><span> sms_queue.h \</span><br><span> transaction.h \</span><br><span style="color: hsl(0, 100%, 40%);">- ussd.h \</span><br><span> vlr.h \</span><br><span> vty.h \</span><br><span> $(NULL)</span><br><span>diff --git a/include/osmocom/msc/gsm_09_11.h b/include/osmocom/msc/gsm_09_11.h</span><br><span>new file mode 100644</span><br><span>index 0000000..4e7a5b6</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/msc/gsm_09_11.h</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm0911_rcv_nc_ss(struct gsm_subscriber_connection *conn, struct msgb *msg);</span><br><span>diff --git a/include/osmocom/msc/ussd.h b/include/osmocom/msc/ussd.h</span><br><span>deleted file mode 100644</span><br><span>index bc4227b..0000000</span><br><span>--- a/include/osmocom/msc/ussd.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg);</span><br><span>diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am</span><br><span>index 3173da5..ad8deec 100644</span><br><span>--- a/src/libmsc/Makefile.am</span><br><span>+++ b/src/libmsc/Makefile.am</span><br><span>@@ -35,6 +35,7 @@</span><br><span> gsm_04_11.c \</span><br><span> gsm_04_14.c \</span><br><span> gsm_04_80.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_09_11.c \</span><br><span> gsm_subscriber.c \</span><br><span> mncc.c \</span><br><span> mncc_builtin.c \</span><br><span>@@ -44,7 +45,6 @@</span><br><span> rrlp.c \</span><br><span> silent_call.c \</span><br><span> sms_queue.c \</span><br><span style="color: hsl(0, 100%, 40%);">- ussd.c \</span><br><span> transaction.c \</span><br><span> osmo_msc.c \</span><br><span> ctrl_commands.c \</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 5c45316..beec6fa 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -42,9 +42,9 @@</span><br><span> #include <osmocom/msc/gsm_04_08.h></span><br><span> #include <osmocom/msc/gsm_04_80.h></span><br><span> #include <osmocom/msc/gsm_04_14.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/gsm_09_11.h></span><br><span> #include <osmocom/msc/signal.h></span><br><span> #include <osmocom/msc/transaction.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/msc/ussd.h></span><br><span> #include <osmocom/msc/silent_call.h></span><br><span> #include <osmocom/msc/osmo_msc.h></span><br><span> #include <osmocom/msc/mncc_int.h></span><br><span>@@ -3524,7 +3524,7 @@</span><br><span> rc = -ENOTSUP;</span><br><span> break;</span><br><span> case GSM48_PDISC_NC_SS:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = handle_rcv_ussd(conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm0911_rcv_nc_ss(conn, msg);</span><br><span> break;</span><br><span> case GSM48_PDISC_TEST:</span><br><span> rc = gsm0414_rcv_test(conn, msg);</span><br><span>diff --git a/src/libmsc/ussd.c b/src/libmsc/gsm_09_11.c</span><br><span>similarity index 93%</span><br><span>rename from src/libmsc/ussd.c</span><br><span>rename to src/libmsc/gsm_09_11.c</span><br><span>index a27d47b..8f7e54f 100644</span><br><span>--- a/src/libmsc/ussd.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -1,5 +1,3 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* Network-specific handling of mobile-originated USSDs. */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org></span><br><span> * (C) 2008, 2009 by Holger Hans Peter Freyther <zecke@selfish.org></span><br><span> * (C) 2009 by Mike Haben <michael.haben@btinternet.com></span><br><span>@@ -21,8 +19,11 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* This module defines the network-specific handling of mobile-originated</span><br><span style="color: hsl(0, 100%, 40%);">- USSD messages. */</span><br><span style="color: hsl(120, 100%, 40%);">+/**</span><br><span style="color: hsl(120, 100%, 40%);">+ * MSC-specific handling of call independent Supplementary</span><br><span style="color: hsl(120, 100%, 40%);">+ * Services messages (NC_SS) according to GSM TS 09.11</span><br><span style="color: hsl(120, 100%, 40%);">+ * "Signalling interworking for supplementary services".</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> </span><br><span> #include <stdio.h></span><br><span> #include <stdlib.h></span><br><span>@@ -58,8 +59,8 @@</span><br><span> return gsm0480_send_ussd_response(conn, response_string, req);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Entrypoint - handler function common to all mobile-originated USSDs */</span><br><span style="color: hsl(0, 100%, 40%);">-int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+/* Entry point for call independent MO SS messages */</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm0911_rcv_nc_ss(struct gsm_subscriber_connection *conn, struct msgb *msg)</span><br><span> {</span><br><span> struct gsm48_hdr *gh = msgb_l3(msg);</span><br><span> struct gsm_trans *trans;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9552">change 9552</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/9552"/><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: Ic1eaceddb58132318e4e941be542da34b8ebefe1 </div>
<div style="display:none"> Gerrit-Change-Number: 9552 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>