[PATCH] osmo-msc[master]: gsm0480: fix GSM 04.80 libosmocore API / ABI compatibility

[Vadim Yanitskiy]

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/5735

to look at the new patch set (#2).

gsm0480: fix GSM 04.80 libosmocore API / ABI compatibility

Since the I5f8972b86cd4dcb54b643a24b5794a87c8758073, the GSM 04.80
libosmocore API / ABI is changed in order to facilitate external
USSD interface development. The only affected part of OsmoMSC
is 'libmsc/ussd.c' which only handles '*#100#' so far.

Depends-On: I5f8972b86cd4dcb54b643a24b5794a87c8758073
Change-Id: I9b3a4a169d4a473dd0547815d84a28e24997446f
---
M include/osmocom/msc/gsm_04_80.h
M src/libmsc/gsm_04_80.c
M src/libmsc/ussd.c
3 files changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/5735/2

diff --git a/include/osmocom/msc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h
index 7da45a0..e19a634 100644
--- a/include/osmocom/msc/gsm_04_80.h
+++ b/include/osmocom/msc/gsm_04_80.h
@@ -8,10 +8,10 @@
 
 int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn,
 			       const struct msgb *in_msg, const char* response_text,
-			       const struct ss_request *req);
+			       const struct gsm0480_ss_request *req);
 int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn,
 			     const struct msgb *msg,
-			     const struct ss_request *request);
+			     const struct gsm0480_ss_request *request);
 
 int msc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level,
 			 const char *text);
diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c
index 37e058c..9c6febc 100644
--- a/src/libmsc/gsm_04_80.c
+++ b/src/libmsc/gsm_04_80.c
@@ -63,7 +63,7 @@
 /* Send response to a mobile-originated ProcessUnstructuredSS-Request */
 int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn,
 			       const struct msgb *in_msg, const char *response_text,
-			       const struct ss_request *req)
+			       const struct gsm0480_ss_request *req)
 {
 	struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD RSP");
 	struct gsm48_hdr *gh;
@@ -111,7 +111,7 @@
 
 int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn,
 			     const struct msgb *in_msg,
-			     const struct ss_request *req)
+			     const struct gsm0480_ss_request *req)
 {
 	struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 USSD REJ");
 	struct gsm48_hdr *gh;
diff --git a/src/libmsc/ussd.c b/src/libmsc/ussd.c
index eeab52a..456894f 100644
--- a/src/libmsc/ussd.c
+++ b/src/libmsc/ussd.c
@@ -40,7 +40,8 @@
 const char USSD_TEXT_OWN_NUMBER[] = "*#100#";
 
 /* A network-specific handler function */
-static int send_own_number(struct gsm_subscriber_connection *conn, const struct msgb *msg, const struct ss_request *req)
+static int send_own_number(struct gsm_subscriber_connection *conn,
+	const struct msgb *msg, const struct gsm0480_ss_request *req)
 {
 	char *own_number = conn->vsub->msisdn;
 	char response_string[GSM_EXTENSION_LENGTH + 20];
@@ -57,7 +58,7 @@
 int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg)
 {
 	int rc;
-	struct ss_request req;
+	struct gsm0480_ss_request req;
 	struct gsm48_hdr *gh;
 
 	/* TODO: Use subscriber_connection ref-counting if we ever want

-- 
To view, visit https://gerrit.osmocom.org/5735
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I9b3a4a169d4a473dd0547815d84a28e24997446f
Gerrit-PatchSet: 2
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder