Skip to content

Allow system resolver support for server-ip param #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bundasmanu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow system resolver support for server-ip param #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions mod_unimrcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3970,6 +3970,44 @@ static char *ip_addr_get(const char *value, apr_pool_t *pool)
return apr_pstrdup(pool, value);
}

/**
* Get server IP address from value (supports both IP address and DNS name)
* Resolves DNS names to IP addresses using APR
*
* @param value "auto", IP address, or DNS name
* @param pool the memory pool to use
* @return IP address (resolved from DNS if needed)
*/
static char *server_addr_get(const char *value, apr_pool_t *pool)
{
apr_sockaddr_t *sockaddr = NULL;
char *ip_addr = NULL;
apr_status_t status;

if (!value || strcasecmp(value, "auto") == 0) {
ip_addr = DEFAULT_REMOTE_IP_ADDRESS;
apt_ip_get(&ip_addr, pool);
return ip_addr;
}

status = apr_sockaddr_info_get(&sockaddr, value, APR_INET, 0, 0, pool);

if (status != APR_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
"Unable to resolve '%s' (%d), returning as-is\n", value, status);
return apr_pstrdup(pool, value);
}

status = apr_sockaddr_ip_get(&ip_addr, sockaddr);
if (status != APR_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
"apr_sockaddr_ip_get failed for '%s' (%d), using as-is\n", value, status);
return apr_pstrdup(pool, value);
}

return ip_addr;
}

/**
* set mod_unimrcp-specific profile configuration
*
Expand Down Expand Up @@ -4059,7 +4097,7 @@ static int process_mrcpv1_config(rtsp_client_config_t *config, mrcp_sig_settings
{
int mine = 1;
if (strcasecmp(param, "server-ip") == 0) {
sig_settings->server_ip = ip_addr_get(val, pool);
sig_settings->server_ip = server_addr_get(val, pool);
} else if (strcasecmp(param, "server-port") == 0) {
sig_settings->server_port = (apr_port_t) atol(val);
} else if (strcasecmp(param, "resource-location") == 0) {
Expand Down Expand Up @@ -4097,7 +4135,7 @@ static int process_mrcpv2_config(mrcp_sofia_client_config_t *config, mrcp_sig_se
} else if (strcasecmp(param, "client-port") == 0) {
config->local_port = (apr_port_t) atol(val);
} else if (strcasecmp(param, "server-ip") == 0) {
sig_settings->server_ip = ip_addr_get(val, pool);
sig_settings->server_ip = server_addr_get(val, pool);
} else if (strcasecmp(param, "server-port") == 0) {
sig_settings->server_port = (apr_port_t) atol(val);
} else if (strcasecmp(param, "server-username") == 0) {
Expand Down