Change in ...osmo-sgsn[master]: gprs_gmm: only update gb/iu cell information when Iu/Gb present

[laforge]

laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15172 )

Change subject: gprs_gmm: only update gb/iu cell information when Iu/Gb present
......................................................................

gprs_gmm: only update gb/iu cell information when Iu/Gb present

This function should not do the transistion of Iu/Gb. Only copy simple data

Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a
---
M src/gprs/gprs_gmm.c
1 file changed, 16 insertions(+), 10 deletions(-)

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



diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index e44b3ec..d232156 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -375,17 +375,23 @@
 /* Store BVCI/NSEI in MM context */
 static void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg)
 {
-	mm->gb.bvci = msgb_bvci(msg);
-	mm->gb.nsei = msgb_nsei(msg);
-	/* In case a Iu connection is reconnected we need to update the ue ctx */
-	mm->iu.ue_ctx = MSG_IU_UE_CTX(msg);
-	if (mm->ran_type == MM_CTX_T_UTRAN_Iu
-	    && mm->iu.ue_ctx) {
-#ifdef BUILD_IU
-		mm->iu.ue_ctx->rab_assign_addr_enc =
-			sgsn->cfg.iu.rab_assign_addr_enc;
-#endif
+	/* check for Iu or Gb */
+	if (!MSG_IU_UE_CTX(msg)) {
+		mm->gb.bvci = msgb_bvci(msg);
+		mm->gb.nsei = msgb_nsei(msg);
 	}
+#ifdef BUILD_IU
+	else {
+		/* In case a Iu connection is reconnected we need to update the ue ctx */
+		/* FIXME: the old ue_ctx have to be freed/disconnected */
+		mm->iu.ue_ctx = MSG_IU_UE_CTX(msg);
+		if (mm->ran_type == MM_CTX_T_UTRAN_Iu
+				&& mm->iu.ue_ctx) {
+			mm->iu.ue_ctx->rab_assign_addr_enc =
+					sgsn->cfg.iu.rab_assign_addr_enc;
+		}
+	}
+#endif
 }
 
 /* Store BVCI/NSEI in MM context */

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

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Id52761f3ea655a2d0cc663a950154c6b7c1b5f7a
Gerrit-Change-Number: 15172
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190902/d913f53e/attachment.htm>