Osmocom Open Build Service

osmo-hnbgw.spec Changed

osmo-hnbgw_1.3.0.8.e620.202208170002.dsc -> osmo-hnbgw_1.3.0.11.9410.202208180002.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-hnbgw
 Binary: osmo-hnbgw, osmo-hnbgw-dbg, osmo-hnbgw-doc
 Architecture: any all
-Version: 1.3.0.8.e620.202208170002
+Version: 1.3.0.11.9410.202208180002
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-hnbgw
 Standards-Version: 3.9.8
@@ -14,8 +14,8 @@
  osmo-hnbgw-dbg deb debug extra arch=any
  osmo-hnbgw-doc deb doc optional arch=all
 Checksums-Sha1:
- 31bb3aab5b9177450b16157d87a4c935e58891d2 70048 osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz
+ 1ea61355cd062cc63bf09885954159cfc8a13175 70012 osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz
 Checksums-Sha256:
- 6847ad375ff54bd1a320ec76a47d63288e52b9356eff1ea52753ed23095458e7 70048 osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz
+ f2951771a899803342f9ec2361a1e1a5e000f0d5b1b819ba9d44e2c89672c355 70012 osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz
 Files:
- 46e0cbaca5a953a9963d30ecb20c5236 70048 osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz
+ ceecd0084bd9d4608c5fcd2ff68cd117 70012 osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/.tarball-version -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/.tarball-version Changed

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/configure.ac -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/configure.ac Changed

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/contrib/osmo-hnbgw.spec.in -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/contrib/osmo-hnbgw.spec.in Changed

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/debian/changelog -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/debian/changelog Changed

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/debian/control -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/debian/control Changed

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/src/osmo-hnbgw/hnbgw_cn.c -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/src/osmo-hnbgw/hnbgw_cn.c Changed

@@ -373,11 +373,12 @@
 	}
 
 	/* Intercept RAB Assignment Request, to map RTP and GTP between access and core */
-	message = talloc_zero(map, ranap_message);
-	rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg));
-	if (rc == 0) {
-		if (!map->is_ps) {
-			/* Circuit-Switched. Set up mapping of RTP ports via MGW */
+	if (!map->is_ps) {
+		/* Circuit-Switched. Set up mapping of RTP ports via MGW */
+		message = talloc_zero(map, ranap_message);
+		rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg));
+
+		if (rc == 0) {
 			switch (message->procedureCode) {
 			case RANAP_ProcedureCode_id_RAB_Assignment:
 				/* mgw_fsm_alloc_and_handle_rab_ass_req() takes ownership of (ranap) message */
@@ -388,10 +389,18 @@
 				mgw_fsm_release(map);
 				break;
 			}
+			ranap_ran_rx_co_free(message);
+		}
+
+		talloc_free(message);
 #if ENABLE_PFCP
-		} else {
-			struct hnb_gw *hnb_gw = cnlink->gw;
-			/* Packet-Switched. Set up mapping of GTP ports via UPF */
+	} else {
+		struct hnb_gw *hnb_gw = cnlink->gw;
+		/* Packet-Switched. Set up mapping of GTP ports via UPF */
+		message = talloc_zero(map, ranap_message);
+		rc = ranap_ran_rx_co_decode(map, message, msgb_l2(oph->msg), msgb_l2len(oph->msg));
+
+		if (rc == 0) {
 			switch (message->procedureCode) {
 
 			case RANAP_ProcedureCode_id_RAB_Assignment:
@@ -408,16 +417,17 @@
 				break;
 
 			case RANAP_ProcedureCode_id_Iu_Release:
-				/* An IU Release will terminate the PFCP sessions for all RABs (ps_rab FSM instances).
-				 * Terminate all RABs and forward the IU Release directly by rua_tx_dt() below. */
+				/* Any IU Release will terminate the MGW FSM, the message itsself is not passed to the
+				 * FSM code. It is just forwarded normally by the rua_tx_dt() call below. */
 				hnbgw_gtpmap_release(map);
 				break;
 			}
-#endif
+			ranap_ran_rx_co_free(message);
 		}
-		ranap_ran_rx_co_free(message);
+
+		talloc_free(message);
+#endif
 	}
-	talloc_free(message);
 
 	return rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id,
 			 msgb_l2(oph->msg), msgb_l2len(oph->msg));

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/src/osmo-hnbgw/hnbgw_rua.c -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/src/osmo-hnbgw/hnbgw_rua.c Changed

@@ -276,25 +276,37 @@
 	/* If there is data, see if it is a RAB Assignment message where we need to change the user plane information,
 	 * for RTP mapping via MGW (soon also GTP mapping via UPF). */
 	if (data && len && map && !release_context_map) {
-		message = talloc_zero(map, ranap_message);
-		rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg));
+		if (!map->is_ps) {
+			message = talloc_zero(map, ranap_message);
+			rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg));
 
-		if (rc == 0) {
-			switch (message->procedureCode) {
-			case RANAP_ProcedureCode_id_RAB_Assignment:
-				if (!map->is_ps) {
+			if (rc == 0) {
+				switch (message->procedureCode) {
+				case RANAP_ProcedureCode_id_RAB_Assignment:
 					/* mgw_fsm_handle_rab_ass_resp() takes ownership of prim->oph and (ranap) message */
 					return mgw_fsm_handle_rab_ass_resp(map, &prim->oph, message);
 				}
+				ranap_cn_rx_co_free(message);
+			}
+
+			talloc_free(message);
 #if ENABLE_PFCP
-				/* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */
-				return hnbgw_gtpmap_rx_rab_ass_resp(map, &prim->oph, message);
-#endif
+		} else {
+			message = talloc_zero(map, ranap_message);
+			rc = ranap_cn_rx_co_decode(map, message, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg));
+
+			if (rc == 0) {
+				switch (message->procedureCode) {
+				case RANAP_ProcedureCode_id_RAB_Assignment:
+					/* ps_rab_ass_fsm takes ownership of prim->oph and RANAP message */
+					return hnbgw_gtpmap_rx_rab_ass_resp(map, &prim->oph, message);
+				}
+				ranap_cn_rx_co_free(message);
 			}
-			ranap_cn_rx_co_free(message);
-		}
 
-		talloc_free(message);
+			talloc_free(message);
+#endif
+		}
 	}
 
 	rc = osmo_sccp_user_sap_down(cn->sccp_user, &prim->oph);

osmo-hnbgw_1.3.0.8.e620.202208170002.tar.xz/src/osmo-hnbgw/ps_rab_fsm.c -> osmo-hnbgw_1.3.0.11.9410.202208180002.tar.xz/src/osmo-hnbgw/ps_rab_fsm.c Changed

@@ -106,7 +106,7 @@
 	};
 	fi->priv = rab;
 
-	osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, 1);
+	OSMO_ASSERT(osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, 1) == 0);
 
 	llist_add_tail(&rab->entry, &map->ps_rabs);
 	return rab;
@@ -139,7 +139,7 @@
 	m->ctx.session_fi = rab->fi;
 	m->ctx.session_use_count = &rab->use_count;
 	m->ctx.session_use_token = "PFCP_MSG";
-	osmo_use_count_get_put(m->ctx.session_use_count, m->ctx.session_use_token, 1);
+	OSMO_ASSERT(osmo_use_count_get_put(m->ctx.session_use_count, m->ctx.session_use_token, 1) == 0);
 }
 
 static struct osmo_pfcp_msg *ps_rab_new_pfcp_msg_req(struct ps_rab *rab, enum osmo_pfcp_message_type msg_type)
@@ -663,7 +663,7 @@
 static void ps_rab_fsm_wait_use_count_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
 {
 	struct ps_rab *rab = fi->priv;
-	osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, -1);
+	OSMO_ASSERT(osmo_use_count_get_put(&rab->use_count, PS_RAB_USE_ACTIVE, -1) == 0);
 }
 
 static void ps_rab_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)

Changes of Revision 52