Osmocom Open Build Service

osmo-hnbgw.spec Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.dsc -> osmo-hnbgw_1.3.0.48.0e03.202210210002.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.45.b9be.202210200002
+Version: 1.3.0.48.0e03.202210210002
 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:
- 559c87ce5a312a50c9337e97a2b4b35ddd550540 72104 osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz
+ 9b03d7e0697ed3b473452a1c4621eed0de930b35 72828 osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz
 Checksums-Sha256:
- 59742e5fed28bd1223e983701471793b36b8dd49ca8b9c9833ace83f7555f118 72104 osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz
+ f3af91da8b050983395a8a44671c506183c5ebab2c7588ebe6c7602d4cdd495d 72828 osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz
 Files:
- e26e696bf0c6402266b8bf2f9f8b5b11 72104 osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz
+ 21aa4a4cac22c033aaaa7f0a84170846 72828 osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/.tarball-version -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/.tarball-version Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/contrib/osmo-hnbgw.spec.in -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/contrib/osmo-hnbgw.spec.in Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/debian/changelog -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/debian/changelog Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/debian/control -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/debian/control Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/doc/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/doc/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/doc/manuals/chapters/running.adoc -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/doc/manuals/chapters/running.adoc Changed

@@ -136,11 +136,28 @@
 
 ----
 hnbgw
- mgcp
-  mgw remote-ip 127.0.0.1
-  mgw remote-port 2427
-  mgw reset-endpoint rtpbridge/*
+ mgw 0
+  remote-ip 127.0.0.1
+  remote-port 2427
+  reset-endpoint rtpbridge/* <1>
 ----
+<1> The 'reset-endpoint' setting instructs the OsmoMGW to send a wildcarded
+DLCX to the media gateway. This helps to clear lingering calls from the
+media gateway when the OsmoHNBGW is restarted.
+
+OsmoHNBGW is also able to handle a pool of media gateways for load
+distribution. See also <<mgw_pooling>>.
+
+NOTE
+====
+Previous versions of OsmoHNBGW didn't have the 'mgw' VTY node and
+hence didn't support the MGW pooling feature. Therefore, historically the MGW
+related commands where placed under the `mgcp` VTY node. The MGW related commands
+under the `mgcp` VTY are still parsed and used but its use is deprecated and
+hence discouraged in favour of the new `mgw` node. Writing the config to a file
+from within OsmoHNBGW will automatically convert the config to use the new `mgw`
+node.
+====
 
 ==== Configure co-located User Plane Function

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/doc/manuals/osmohnbgw-usermanual.adoc -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/doc/manuals/osmohnbgw-usermanual.adoc Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/include/osmocom/hnbgw/hnbgw.h -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/include/osmocom/hnbgw/hnbgw.h Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/include/osmocom/hnbgw/vty.h -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/include/osmocom/hnbgw/vty.h Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/src/osmo-hnbgw/Makefile.am -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/src/osmo-hnbgw/Makefile.am Changed

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/src/osmo-hnbgw/hnbgw.c -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/src/osmo-hnbgw/hnbgw.c Changed

@@ -104,6 +104,7 @@
 
 	context_map_init(gw);
 
+	gw->mgw_pool = mgcp_client_pool_alloc(gw);
 	gw->config.mgcp_client = talloc_zero(tall_hnb_ctx, struct mgcp_client_conf);
 	mgcp_client_conf_init(gw->config.mgcp_client);
 
@@ -673,6 +674,41 @@
 	return 1;
 }
 
+static int hnbgw_mgw_setup(void)
+{
+	struct mgcp_client *mgcp_client_single;
+	unsigned int pool_members_initalized;
+
+	/* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in
+	 * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and
+	 * (re)connect them manually from the VTY. */
+	pool_members_initalized = mgcp_client_pool_connect(g_hnb_gw->mgw_pool);
+	if (pool_members_initalized) {
+		LOGP(DMGW, LOGL_NOTICE,
+		     "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'mgcp').\n",
+		     pool_members_initalized);
+		return 0;
+	}
+
+	/* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool
+	 * member if there is no MGW pool configured. */
+	LOGP(DMGW, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'mgcp'\n");
+	mgcp_client_single = mgcp_client_init(tall_hnb_ctx, g_hnb_gw->config.mgcp_client);
+	if (!mgcp_client_single) {
+		LOGP(DMGW, LOGL_ERROR, "MGW (single) client initalization failed\n");
+		return -EINVAL;
+	}
+	if (mgcp_client_connect(mgcp_client_single)) {
+		LOGP(DMGW, LOGL_ERROR, "MGW (single) connect failed at (%s:%u)\n",
+		     g_hnb_gw->config.mgcp_client->remote_addr,
+		     g_hnb_gw->config.mgcp_client->remote_port);
+		return -EINVAL;
+	}
+	mgcp_client_pool_register_single(g_hnb_gw->mgw_pool, mgcp_client_single);
+
+	return 0;
+}
+
 int main(int argc, char **argv)
 {
 	struct osmo_stream_srv_link *srv;
@@ -784,17 +820,8 @@
 	g_hnb_gw->iuh = srv;
 
 	/* Initialize and connect MGCP client. */
-	g_hnb_gw->mgcp_client = mgcp_client_init(tall_hnb_ctx, g_hnb_gw->config.mgcp_client);
-	if (!g_hnb_gw->mgcp_client) {
-		LOGP(DMGW, LOGL_ERROR, "MGW client initalization failed\n");
+	if (hnbgw_mgw_setup() != 0)
 		return -EINVAL;
-	}
-	if (mgcp_client_connect(g_hnb_gw->mgcp_client)) {
-		LOGP(DMGW, LOGL_ERROR, "MGW connect failed at (%s:%u)\n",
-		     g_hnb_gw->config.mgcp_client->remote_addr,
-		     g_hnb_gw->config.mgcp_client->remote_port);
-		return -EINVAL;
-	}
 
 #if ENABLE_PFCP
 	/* If UPF is configured, set up PFCP socket and send Association Setup Request to UPF */

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/src/osmo-hnbgw/hnbgw_vty.c -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/src/osmo-hnbgw/hnbgw_vty.c Changed

@@ -464,14 +464,6 @@
 	return CMD_SUCCESS;
 }
 
-static int config_write_hnbgw_mgcp(struct vty *vty)
-{
-	vty_out(vty, " mgcp%s", VTY_NEWLINE);
-	mgcp_client_config_write(vty, "  ");
-
-	return CMD_SUCCESS;
-}
-
 #if ENABLE_PFCP
 static int config_write_hnbgw_pfcp(struct vty *vty)
 {
@@ -521,7 +513,11 @@
 	install_element_ve(&show_talloc_cmd);
 
 	install_element(HNBGW_NODE, &cfg_hnbgw_mgcp_cmd);
-	install_node(&mgcp_node, config_write_hnbgw_mgcp);
+	/* Deprecated: Old MGCP config without pooling support in MSC node: */
+	install_node(&mgcp_node, NULL);
+	mgcp_client_vty_init(tall_hnb_ctx, MGCP_NODE, g_hnb_gw->config.mgcp_client);
+
+	mgcp_client_pool_vty_init(HNBGW_NODE, MGW_NODE, " ", g_hnb_gw->mgw_pool);
 
 #if ENABLE_PFCP
 	install_node(&pfcp_node, config_write_hnbgw_pfcp);
@@ -531,6 +527,5 @@
 	install_element(PFCP_NODE, &cfg_pfcp_remote_addr_cmd);
 #endif
 
-	mgcp_client_vty_init(tall_hnb_ctx, MGCP_NODE, g_hnb_gw->config.mgcp_client);
 	osmo_tdef_vty_groups_init(HNBGW_NODE, hnbgw_tdef_group);
 }

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/src/osmo-hnbgw/mgw_fsm.c -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/src/osmo-hnbgw/mgw_fsm.c Changed

@@ -141,6 +141,7 @@
 	RANAP_RAB_AssignmentRequestIEs_t *ies;
 	const char *epname;
 	struct mgcp_conn_peer mgw_info;
+	struct mgcp_client *mgcp_client;
 	int rc;
 
 	LOGPFSML(fi, LOGL_DEBUG, "RAB-AssignmentRequest received, creating HNB side call-leg on MGW...\n");
@@ -172,9 +173,16 @@
 	mgw_info.codecs0 = CODEC_IUFP;
 	mgw_info.codecs_len = 1;
 
-	epname = mgcp_client_rtpbridge_wildcard(map->hnb_ctx->gw->mgcp_client);
+	mgcp_client = mgcp_client_pool_get(map->hnb_ctx->gw->mgw_pool);
+	if (!mgcp_client) {
+		LOGPFSML(fi, LOGL_ERROR,
+			 "cannot ensure MGW endpoint -- no MGW configured, check configuration!\n");
+		osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0);
+		return;
+	}
+	epname = mgcp_client_rtpbridge_wildcard(mgcp_client);
 	mgw_fsm_priv->mgcpc_ep =
-	    osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname);
+	    osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, mgcp_client, mgw_fsm_T_defs, fi->id, "%s", epname);
 	mgw_fsm_priv->mgcpc_ep_ci_hnb = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB");
 
 	osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK,
@@ -488,9 +496,13 @@
 static void mgw_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)
 {
 	struct mgw_fsm_priv *mgw_fsm_priv = fi->priv;
+	struct mgcp_client *mgcp_client;
 
 	switch (event) {
 	case MGW_EV_MGCP_TERM:
+		/* Put MGCP client back into MGW pool */
+		mgcp_client = osmo_mgcpc_ep_client(mgw_fsm_priv->mgcpc_ep);
+		mgcp_client_pool_put(mgcp_client);
 		mgw_fsm_priv->mgcpc_ep = NULL;
 		LOGPFSML(fi, LOGL_ERROR, "Media gateway failed\n");
 		osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0);
@@ -547,6 +559,10 @@
 	struct hnbgw_context_map *map = mgw_fsm_priv->map;
 
 	if (mgw_fsm_priv->mgcpc_ep) {
+		/* Put MGCP client back into MGW pool */
+		struct mgcp_client *mgcp_client = osmo_mgcpc_ep_client(mgw_fsm_priv->mgcpc_ep);
+		mgcp_client_pool_put(mgcp_client);
+
 		osmo_mgcpc_ep_clear(mgw_fsm_priv->mgcpc_ep);
 		mgw_fsm_priv->mgcpc_ep = NULL;
 	}

osmo-hnbgw_1.3.0.45.b9be.202210200002.tar.xz/tests/ranap_rab_ass/Makefile.am -> osmo-hnbgw_1.3.0.48.0e03.202210210002.tar.xz/tests/ranap_rab_ass/Makefile.am Changed

Changes of Revision 117