[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 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

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

[Harald Welte]

Patch Set 4: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I344e4b3a9aad617686a7ddbdeae5780fd8b07e58
Gerrit-PatchSet: 4
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

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

[Vadim Yanitskiy]

Hello Harald Welte, Jenkins Builder,

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

https://gerrit.osmocom.org/7676

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

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

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


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/76/7676/3

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: newpatchset
Gerrit-Change-Id: I344e4b3a9aad617686a7ddbdeae5780fd8b07e58
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder

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

[Harald Welte]

Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I344e4b3a9aad617686a7ddbdeae5780fd8b07e58
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No

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

[Vadim Yanitskiy]

Review at  https://gerrit.osmocom.org/7676

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

Change-Id: I344e4b3a9aad617686a7ddbdeae5780fd8b07e58
---
M src/libmsc/ussd.c
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/76/7676/1

diff --git a/src/libmsc/ussd.c b/src/libmsc/ussd.c
index 7a17786..e7f7e5d 100644
--- a/src/libmsc/ussd.c
+++ b/src/libmsc/ussd.c
@@ -73,7 +73,7 @@
rc = gsm0480_decode_ss_request(gh, msgb_l3len(msg), &req);
if (!rc) {
LOGP(DMM, LOGL_ERROR, "Unhandled SS message\n");
-   rc = gsm0480_send_ussd_reject(conn, &req);
+   gsm0480_send_ussd_reject(conn, &req);
return rc;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I344e4b3a9aad617686a7ddbdeae5780fd8b07e58
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy