commit 70c03f5e440aeac98ac865f43047874a63574b20
author Pau Espin Pedrol <pespin@sysmocom.de> Tue Oct 04 16:49:41 2022 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Wed Oct 05 10:32:42 2022 +0200
tree c1c660557d662601cf4dce0b5bfb212a0ddcda4c
parent e56ec4a146b5df46cac3676d5fa69806daaa5a20

Add Osmux IPv6 support

A new osmux bind-ip-v6 VTY command is added, similar to what's already
available for RTP. This way the user can decide whether to support IPv4,
IPv6 or both types of IP versions.

Both IP sockets are by default disabled, and must be explicitly enabled
by setting the bind-ip in the VTY configuration.

Change-Id: I446cd7da217e9f4a74995d7784ae55dcc60a29b7

src/libosmo-mgcp/mgcp_vty.c

diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c
index 1bf8789..bc2673d 100644
--- a/src/libosmo-mgcp/mgcp_vty.c
+++ b/src/libosmo-mgcp/mgcp_vty.c
@@ -142,8 +142,12 @@
 		break;
 	}
 	if (g_cfg->osmux_use != OSMUX_USAGE_OFF) {
-		vty_out(vty, " osmux bind-ip %s%s",
-			g_cfg->osmux_addr, VTY_NEWLINE);
+		if (g_cfg->osmux_addr_v4)
+			vty_out(vty, " osmux bind-ip %s%s",
+				g_cfg->osmux_addr_v4, VTY_NEWLINE);
+		if (g_cfg->osmux_addr_v6)
+			vty_out(vty, " osmux bind-ip-v6 %s%s",
+				g_cfg->osmux_addr_v6, VTY_NEWLINE);
 		vty_out(vty, " osmux batch-factor %d%s",
 			g_cfg->osmux_batch, VTY_NEWLINE);
 		vty_out(vty, " osmux batch-size %u%s",
@@ -1584,12 +1588,21 @@
 
 DEFUN(cfg_mgcp_osmux_ip,
       cfg_mgcp_osmux_ip_cmd,
-      "osmux bind-ip " VTY_IPV46_CMD,
+      "osmux bind-ip " VTY_IPV4_CMD,
       OSMUX_STR IP_STR
-      "IPv4 Address to bind to\n"
+      "IPv4 Address to bind to\n")
+{
+	osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v4, argv[0]);
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_mgcp_osmux_ip_v6,
+      cfg_mgcp_osmux_ip_v6_cmd,
+      "osmux bind-ip-v6 " VTY_IPV6_CMD,
+      OSMUX_STR IP_STR
       "IPv6 Address to bind to\n")
 {
-	osmo_strlcpy(g_cfg->osmux_addr, argv[0], sizeof(g_cfg->osmux_addr));
+	osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v6, argv[0]);
 	return CMD_SUCCESS;
 }
 
@@ -1718,6 +1731,7 @@
 	install_element(MGCP_NODE, &cfg_mgcp_no_sdp_payload_send_name_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_osmux_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_osmux_ip_cmd);
+	install_element(MGCP_NODE, &cfg_mgcp_osmux_ip_v6_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_factor_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_size_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_osmux_port_cmd);