Change in libosmocore[master]: ns2: refactor handle_nsip_read/handle_nsfrgre_read

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/20269 )


Change subject: ns2: refactor handle_nsip_read/handle_nsfrgre_read
......................................................................

ns2: refactor handle_nsip_read/handle_nsfrgre_read

Change-Id: Ieb273371877dbc7e5b321c3b377e7142e43668d9
---
M src/gb/gprs_ns2_frgre.c
M src/gb/gprs_ns2_udp.c
2 files changed, 6 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/20269/1

diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c
index 0903e46..e2e0b29 100644
--- a/src/gb/gprs_ns2_frgre.c
+++ b/src/gb/gprs_ns2_frgre.c
@@ -446,12 +446,11 @@
 		rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);
 		switch (rc) {
 		case GPRS_NS2_CS_FOUND:
-			rc = ns2_recv_vc(nsvc, msg);
 			break;
 		case GPRS_NS2_CS_ERROR:
 		case GPRS_NS2_CS_SKIPPED:
 			rc = 0;
-			break;
+			goto out;
 		case GPRS_NS2_CS_REJECTED:
 			/* nsip_sendmsg will free reject */
 			frgre_sendmsg(bind, reject, &saddr);
@@ -459,13 +458,11 @@
 		case GPRS_NS2_CS_CREATED:
 			frgre_alloc_vc(bind, nsvc, &saddr, dlci);
 			gprs_ns2_vc_fsm_start(nsvc);
-			rc = ns2_recv_vc(nsvc, msg);
 			break;
 		}
-	} else {
-		/* VC found */
-		rc = ns2_recv_vc(nsvc, msg);
 	}
+
+	rc = ns2_recv_vc(nsvc, msg);
 out:
 	msgb_free(msg);
 
diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c
index db83413..a029cac 100644
--- a/src/gb/gprs_ns2_udp.c
+++ b/src/gb/gprs_ns2_udp.c
@@ -195,12 +195,11 @@
 		rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);
 		switch (rc) {
 		case GPRS_NS2_CS_FOUND:
-			rc = ns2_recv_vc(nsvc, msg);
 			break;
 		case GPRS_NS2_CS_ERROR:
 		case GPRS_NS2_CS_SKIPPED:
 			rc = 0;
-			break;
+			goto out;
 		case GPRS_NS2_CS_REJECTED:
 			/* nsip_sendmsg will free reject */
 			nsip_sendmsg(bind, reject, &saddr);
@@ -208,14 +207,12 @@
 		case GPRS_NS2_CS_CREATED:
 			ns2_driver_alloc_vc(bind, nsvc, &saddr);
 			gprs_ns2_vc_fsm_start(nsvc);
-			rc = ns2_recv_vc(nsvc, msg);
 			break;
 		}
-	} else {
-		/* VC found */
-		rc = ns2_recv_vc(nsvc, msg);
 	}
 
+	rc = ns2_recv_vc(nsvc, msg);
+out:
 	msgb_free(msg);
 
 	return rc;

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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ieb273371877dbc7e5b321c3b377e7142e43668d9
Gerrit-Change-Number: 20269
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200923/bffb2b57/attachment.htm>