Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/7631 )

Change subject: gsm0480: fix: don't overwrite the data of RELEASE_COMPLETE
......................................................................

gsm0480: fix: don't overwrite the data of RELEASE_COMPLETE

According to the 3GPP TS 04.80, table 2.5 'Release complete', a
RELEASE_COMPLETE message may containg optional FACILITY element.

Meanwhile, the 0xff byte is used to indicate that there is no
decoded message (legacy field). Let's avoid overwriting of
a decoded message.

Change-Id: I0c85292222749a48ca0c4b2e93f4fa2d61468c18
---
M src/gsm/gsm0480.c
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c
index 636f267..5c73e5b 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -296,11 +296,15 @@
        case GSM0480_MTYPE_RELEASE_COMPLETE:
                LOGP(0, LOGL_DEBUG, "SS Release Complete\n");

+               /**
+                * Indicates that there is no decoded message.
+                * To be overwriten by the message otherwise.
+                */
+               req->ussd_text[0] = 0xFF;
+
                /* Parse optional Cause and/or Facility data */
                if (len >= 2)
                        rc &= parse_ss_info_elements(&hdr->data[0], len, req);
-
-               req->ussd_text[0] = 0xFF;
                break;
        case GSM0480_MTYPE_REGISTER:
                rc &= parse_ss_info_elements(&hdr->data[0], len, req);

--
To view, visit https://gerrit.osmocom.org/7631
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c85292222749a48ca0c4b2e93f4fa2d61468c18
Gerrit-Change-Number: 7631
Gerrit-PatchSet: 3
Gerrit-Owner: Vadim Yanitskiy <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder

Reply via email to