commit 3c22f91bad6b2e861003ce83ad4b514317be1b50
author Alexander Couzens <lynxis@fe80.eu> Thu Dec 10 00:20:18 2020 +0100
committer lynxis lazus <lynxis@fe80.eu> Sun Dec 20 15:34:53 2020 +0000
tree 1e9e1af77726f48cac562daf205b26c4536fe3fe
parent 12e5e6bd78ea8c709a83886bb94567ce889fa001

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

src/gb/gprs_ns2.c

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;
 	}