<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19916">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_client: Allow setting IPv6 addresses<br><br>Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>M src/libosmo-mgcp-client/mgcp_client_vty.c<br>2 files changed, 13 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/16/19916/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index df84226..72068b4 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -794,7 +794,7 @@</span><br><span> </span><br><span> /* Initalize socket with the currently configured port</span><br><span> * number */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_sock_init2_ofd(&wq->bfd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_init2_ofd(&wq->bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr,</span><br><span> mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port,</span><br><span> OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);</span><br><span> if (rc > 0)</span><br><span>diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c</span><br><span>index d4e78f1..9c60ed9 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client_vty.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client_vty.c</span><br><span>@@ -36,9 +36,10 @@</span><br><span> struct mgcp_client_conf *global_mgcp_client_conf = NULL;</span><br><span> </span><br><span> DEFUN(cfg_mgw_local_ip, cfg_mgw_local_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "mgw local-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ "mgw local-ip " VTY_IPV46_CMD,</span><br><span> MGW_STR "local bind to connect to MGW from\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "local bind IP address\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "local bind IPv4 address\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "local bind IPv6 address\n")</span><br><span> {</span><br><span> if (!global_mgcp_client_conf)</span><br><span> return CMD_ERR_NOTHING_TODO;</span><br><span>@@ -49,9 +50,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> ALIAS_DEPRECATED(cfg_mgw_local_ip, cfg_mgcpgw_local_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "mgcpgw local-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ "mgcpgw local-ip " VTY_IPV46_CMD,</span><br><span> MGW_STR "local bind to connect to MGCP gateway with\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "local bind IP address\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "local bind IPv4 address\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "local bind IPv6 address\n")</span><br><span> </span><br><span> DEFUN(cfg_mgw_local_port, cfg_mgw_local_port_cmd,</span><br><span> "mgw local-port <0-65535>",</span><br><span>@@ -69,9 +71,10 @@</span><br><span> "local bind port\n")</span><br><span> </span><br><span> DEFUN(cfg_mgw_remote_ip, cfg_mgw_remote_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "mgw remote-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ "mgw remote-ip " VTY_IPV46_CMD,</span><br><span> MGW_STR "remote IP address to reach the MGW at\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "remote IP address\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "remote IPv4 address\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "remote IPv6 address\n")</span><br><span> {</span><br><span> if (!global_mgcp_client_conf)</span><br><span> return CMD_ERR_NOTHING_TODO;</span><br><span>@@ -82,9 +85,10 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> ALIAS_DEPRECATED(cfg_mgw_remote_ip, cfg_mgcpgw_remote_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "mgcpgw remote-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ "mgcpgw remote-ip " VTY_IPV46_CMD,</span><br><span> MGW_STR "remote bind to connect to MGCP gateway with\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "remote bind IP address\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "remote bind IPv4 address\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "remote bind IPv6 address\n")</span><br><span> </span><br><span> DEFUN(cfg_mgw_remote_port, cfg_mgw_remote_port_cmd,</span><br><span> "mgw remote-port <0-65535>",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19916">change 19916</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-mgw/+/19916"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I257218b2ad7cbdd0ac4ae7fa75802bed74ce983f </div>
<div style="display:none"> Gerrit-Change-Number: 19916 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>