Vadim Yanitskiy has submitted this change and it was merged. (
https://gerrit.osmocom.org/12840 )
Change subject: libmsc/gsm_04_80.c: use gsm0480_create_release_complete()
......................................................................
libmsc/gsm_04_80.c: use gsm0480_create_release_complete()
The previous implementation of msc_send_ussd_release_complete() was
based on gsm0480_create_ussd_release_complete(), that doesn't
allow to specify GSM 04.07 transaction identifier.
The ability to specify particular transaction identifier
is required for handling multiple SS/USSD transactions.
Change-Id: Id2975c3383f18e83124ba38927c03980d67ddadb
Depends Change-Id: (libosmocore) Ie3ac85fcef90a5e532334ba3482804d5305c88d7
---
M include/osmocom/msc/gsm_04_80.h
M src/libmsc/gsm_04_80.c
M src/libmsc/msc_vty.c
3 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/msc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h
index 29b800b..073794b 100644
--- a/include/osmocom/msc/gsm_04_80.h
+++ b/include/osmocom/msc/gsm_04_80.h
@@ -10,4 +10,5 @@
int msc_send_ussd_notify(struct ran_conn *conn, int level,
const char *text);
-int msc_send_ussd_release_complete(struct ran_conn *conn);
+int msc_send_ussd_release_complete(struct ran_conn *conn,
+ uint8_t transaction_id);
diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c
index 119f0e1..502848f 100644
--- a/src/libmsc/gsm_04_80.c
+++ b/src/libmsc/gsm_04_80.c
@@ -78,9 +78,10 @@
return msc_tx_dtap(conn, msg);
}
-int msc_send_ussd_release_complete(struct ran_conn *conn)
+int msc_send_ussd_release_complete(struct ran_conn *conn,
+ uint8_t transaction_id)
{
- struct msgb *msg = gsm0480_create_ussd_release_complete();
+ struct msgb *msg = gsm0480_create_release_complete(transaction_id);
if (!msg)
return -1;
return msc_tx_dtap(conn, msg);
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index e1019a2..078b83a 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -1149,7 +1149,9 @@
}
msc_send_ussd_notify(conn, level, text);
- msc_send_ussd_release_complete(conn);
+ /* FIXME: since we don't allocate a transaction here,
+ * we use dummy GSM 04.07 transaction ID. */
+ msc_send_ussd_release_complete(conn, 0x00);
vlr_subscr_put(vsub);
talloc_free(text);
--
To view, visit https://gerrit.osmocom.org/12840
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2975c3383f18e83124ba38927c03980d67ddadb
Gerrit-Change-Number: 12840
Gerrit-PatchSet: 4
Gerrit-Owner: Vadim Yanitskiy <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <[email protected]>
Gerrit-Reviewer: Vadim Yanitskiy <[email protected]>
Gerrit-Reviewer: daniel <[email protected]>
