Change in libosmocore[master]: gprs_ns2: don't pass the return code of reject_status_msg

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21725 )

Change subject: gprs_ns2: don't pass the return code of reject_status_msg
......................................................................

gprs_ns2: don't pass the return code of reject_status_msg

When reject_stats_msg() fails the code can't do anything about it.
Stick to the original failure code and log it

Change-Id: I105363957e59c41a68835b7a9830c048dba73e93
---
M src/gb/gprs_ns2.c
1 file changed, 5 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve



diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index 49606d8..5603fce 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -832,18 +832,13 @@
 		}
 
 		rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);
-		if (rc < 0) {
+		if (rc < 0)
 			LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
-			return rc;
-		}
 		return GPRS_NS2_CS_REJECTED;
 	default:
 		rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);
-
-		if (rc < 0) {
+		if (rc < 0)
 			LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
-			return rc;
-		}
 		return GPRS_NS2_CS_REJECTED;
 	}
 
@@ -854,10 +849,8 @@
 		LOGP(DLNS, LOGL_ERROR, "Rx NS RESET Error %d during "
 				       "TLV Parse\n", tlv);
 		rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PROTO_ERR_UNSPEC);
-		if (rc < 0) {
+		if (rc < 0)
 			LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
-			return rc;
-		}
 		return GPRS_NS2_CS_REJECTED;
 	}
 
@@ -865,6 +858,8 @@
 	    !TLVP_PRES_LEN(&tp, NS_IE_VCI, 2) || !TLVP_PRES_LEN(&tp, NS_IE_NSEI, 2)) {
 		LOGP(DLNS, LOGL_ERROR, "NS RESET Missing mandatory IE\n");
 		rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_MISSING_ESSENT_IE);
+		if (rc < 0)
+			LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
 		return GPRS_NS2_CS_REJECTED;
 	}
 

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I105363957e59c41a68835b7a9830c048dba73e93
Gerrit-Change-Number: 21725
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201220/ca806445/attachment.htm>