<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19883">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation<br><br>Change-Id: Ibbfc1c2485636502dc0f3aef3922432cc7fd6170<br>---<br>M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c<br>1 file changed, 22 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c</span><br><span>index ef4da17..c68d8b3 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <osmocom/core/fsm.h></span><br><span> #include <osmocom/core/byteswap.h></span><br><span> #include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span> </span><br><span> #include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h></span><br><span> </span><br><span>@@ -517,17 +518,33 @@</span><br><span> bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci *ci, struct sockaddr_storage *dest)</span><br><span> {</span><br><span> const struct mgcp_conn_peer *rtp_info;</span><br><span style="color: hsl(120, 100%, 40%);">+ int family;</span><br><span> struct sockaddr_in *sin;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_in6 *sin6;</span><br><span> </span><br><span> rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(ci);</span><br><span> if (!rtp_info)</span><br><span> return false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sin = (struct sockaddr_in *)dest;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- sin->sin_family = AF_INET;</span><br><span style="color: hsl(0, 100%, 40%);">- sin->sin_addr.s_addr = inet_addr(rtp_info->addr);</span><br><span style="color: hsl(0, 100%, 40%);">- sin->sin_port = osmo_ntohs(rtp_info->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ family = osmo_ip_str_type(rtp_info->addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ sin = (struct sockaddr_in *)dest;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin->sin_family = AF_INET;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin->sin_port = osmo_ntohs(rtp_info->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inet_pton(AF_INET, rtp_info->addr, &sin->sin_addr) != 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ sin6 = (struct sockaddr_in6 *)dest;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin6->sin6_family = AF_INET6;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin6->sin6_port = osmo_ntohs(rtp_info->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inet_pton(AF_INET6, rtp_info->addr, &sin6->sin6_addr) != 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19883">change 19883</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/+/19883"/><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: Ibbfc1c2485636502dc0f3aef3922432cc7fd6170 </div>
<div style="display:none"> Gerrit-Change-Number: 19883 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>