paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation

Browse Source 
Change-Id: Ibbfc1c2485636502dc0f3aef3922432cc7fd6170
This commit is contained in:
Pau Espin Pedrol
2020-08-28 19:28:07 +02:00
parent 2f34b53b5b
commit 729bf3e45a
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
View File

@@ -27,6 +27,7 @@
#include <osmocom/core/fsm.h> #include <osmocom/core/fsm.h>
#include <osmocom/core/byteswap.h> #include <osmocom/core/byteswap.h>
#include <osmocom/core/tdef.h> #include <osmocom/core/tdef.h>
#include <osmocom/core/sockaddr_str.h>
#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> #include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h>
@@ -517,17 +518,33 @@ const struct mgcp_conn_peer *osmo_mgcpc_ep_ci_get_rtp_info(const struct osmo_mgc
bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci *ci, struct sockaddr_storage *dest) bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci *ci, struct sockaddr_storage *dest)
{ {
const struct mgcp_conn_peer *rtp_info; const struct mgcp_conn_peer *rtp_info;
int family;
struct sockaddr_in *sin; struct sockaddr_in *sin;
struct sockaddr_in6 *sin6;
rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(ci); rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(ci);
if (!rtp_info) if (!rtp_info)
return false; return false;
sin = (struct sockaddr_in *)dest; family = osmo_ip_str_type(rtp_info->addr);
switch (family) {
sin->sin_family = AF_INET; case AF_INET:
sin->sin_addr.s_addr = inet_addr(rtp_info->addr); sin = (struct sockaddr_in *)dest;
sin->sin_port = osmo_ntohs(rtp_info->port); sin->sin_family = AF_INET;
sin->sin_port = osmo_ntohs(rtp_info->port);
if (inet_pton(AF_INET, rtp_info->addr, &sin->sin_addr) != 1)
return false;
break;
case AF_INET6:
sin6 = (struct sockaddr_in6 *)dest;
sin6->sin6_family = AF_INET6;
sin6->sin6_port = osmo_ntohs(rtp_info->port);
if (inet_pton(AF_INET6, rtp_info->addr, &sin6->sin6_addr) != 1)
return false;
break;
default:
return false;
}
return true; return true;
} }