[MERGED] osmo-msc[master]: libmsc/ussd: don't overwrite rc if decoding failed

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: libmsc/ussd: don't overwrite rc if decoding failed
......................................................................


libmsc/ussd: don't overwrite rc if decoding failed

Change-Id: I344e4b3a9aad617686a7ddbdeae5780fd8b07e58
---
M src/libmsc/ussd.c
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libmsc/ussd.c b/src/libmsc/ussd.c
index ab59571..fe1610f 100644
--- a/src/libmsc/ussd.c
+++ b/src/libmsc/ussd.c
@@ -74,8 +74,9 @@
 	if (!rc) {
 		LOGP(DMM, LOGL_ERROR, "SS/USSD message parsing error, "
 			"rejecting request...\n");
-		rc = gsm0480_send_ussd_reject(conn, &req);
-		return rc;
+		gsm0480_send_ussd_reject(conn, &req);
+		/* The GSM 04.80 API uses inverted codes (0 means error) */
+		return -EPROTO;
 	}
 
 	/* Interrogation or releaseComplete? */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I344e4b3a9aad617686a7ddbdeae5780fd8b07e58
Gerrit-PatchSet: 5
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder