[Freeswitch-svn] [commit] r4000 - in freeswitch/trunk: conf src src/include src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
Freeswitch SVN
anthm at freeswitch.org
Fri Jan 19 14:11:44 EST 2007
Author: anthm
Date: Fri Jan 19 14:11:44 2007
New Revision: 4000
Modified:
freeswitch/trunk/conf/freeswitch.xml
freeswitch/trunk/src/include/switch_utils.h
freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
freeswitch/trunk/src/switch_utils.c
Log:
auto ip stuff
Modified: freeswitch/trunk/conf/freeswitch.xml
==============================================================================
--- freeswitch/trunk/conf/freeswitch.xml (original)
+++ freeswitch/trunk/conf/freeswitch.xml Fri Jan 19 14:11:44 2007
@@ -155,8 +155,8 @@
<param name="codec-ms" value="20"/>
<param name="use-rtp-timer" value="true"/>
<param name="rtp-timer-name" value="soft"/>
- <param name="rtp-ip" value="192.168.1.20"/>
- <param name="sip-ip" value="mydomain1.com"/>
+ <param name="rtp-ip" value="auto"/>
+ <param name="sip-ip" value="auto"/>
<!--Uncomment to set all inbound calls to no media mode-->
<!--<param name="inbound-no-media" value="true"/>-->
@@ -319,7 +319,7 @@
<param name="password" value="mypass"/>
<param name="dialplan" value="XML"/>
<param name="message" value="Jingle all the way"/>
- <param name="rtp-ip" value="10.0.0.1"/>
+ <param name="rtp-ip" value="auto"/>
<param name="auto-login" value="true"/>
<param name="auto-reply" value="Press *Call* to call FreeSWITCH and be sure to come to ClueCon! http://www.cluecon.com"/>
<!-- SASL "plain" or "md5" -->
@@ -331,7 +331,7 @@
<!-- disable to trade async for more calls -->
<param name="use-rtp-timer" value="true"/>
<!-- or -->
- <!-- <param name="rtp-ip" value="my_lan_ip"/> -->
+ <!-- <param name="rtp-ip" value="auto"/> -->
<!-- <param name="ext-rtp-ip" value="stun:stun.server.com"/> -->
<!-- default extension (if one cannot be determined) -->
<param name="exten" value="888"/>
@@ -347,7 +347,7 @@
<param name="name" value="sub.mydomain.com"/>
<param name="password" value="secret"/>
<param name="dialplan" value="XML"/>
- <param name="rtp-ip" value="208.64.200.42"/>
+ <param name="rtp-ip" value="auto"/>
<param name="server" value="jabber.server.org:5347"/>
<!-- disable to trade async for more calls -->
<param name="use-rtp-timer" value="true"/>
Modified: freeswitch/trunk/src/include/switch_utils.h
==============================================================================
--- freeswitch/trunk/src/include/switch_utils.h (original)
+++ freeswitch/trunk/src/include/switch_utils.h Fri Jan 19 14:11:44 2007
@@ -79,6 +79,9 @@
!strcasecmp(expr, "true") ||\
atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE
+
+SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family);
+
#define SWITCH_STATUS_IS_BREAK(x) (x == SWITCH_STATUS_BREAK || x == 730035 || x == 35)
/*!
Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Jan 19 14:11:44 2007
@@ -97,6 +97,7 @@
switch_hash_t *profile_hash;
int running;
int handles;
+ char guess_ip[80];
} globals;
struct mdl_profile {
@@ -1800,9 +1801,9 @@
} else if (!strcasecmp(var, "message")) {
profile->message = switch_core_strdup(module_pool, val);
} else if (!strcasecmp(var, "rtp-ip")) {
- profile->ip = switch_core_strdup(module_pool, val);
+ profile->ip = switch_core_strdup(module_pool, strcasecmp(val, "auto") ? val : globals.guess_ip);
} else if (!strcasecmp(var, "ext-rtp-ip")) {
- profile->extip = switch_core_strdup(module_pool, val);
+ profile->extip = switch_core_strdup(module_pool, strcasecmp(val, "auto") ? val : globals.guess_ip);
} else if (!strcasecmp(var, "server")) {
profile->server = switch_core_strdup(module_pool, val);
} else if (!strcasecmp(var, "rtp-timer-name")) {
@@ -1933,7 +1934,8 @@
memset(&globals, 0, sizeof(globals));
globals.running = 1;
-
+
+ switch_find_local_ip(globals.guess_ip, sizeof(globals.guess_ip), AF_INET);
switch_core_hash_init(&globals.profile_hash, module_pool);
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 19 14:11:44 2007
@@ -177,6 +177,7 @@
uint32_t callid;
int32_t running;
switch_mutex_t *mutex;
+ char guess_ip[80];
} globals;
typedef enum {
@@ -4891,11 +4892,11 @@
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invald option %s for VAD\n", val);
}
} else if (!strcasecmp(var, "ext-rtp-ip")) {
- profile->extrtpip = switch_core_strdup(profile->pool, val);
+ profile->extrtpip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : globals.guess_ip);
} else if (!strcasecmp(var, "rtp-ip")) {
- profile->rtpip = switch_core_strdup(profile->pool, val);
+ profile->rtpip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : globals.guess_ip);
} else if (!strcasecmp(var, "sip-ip")) {
- profile->sipip = switch_core_strdup(profile->pool, val);
+ profile->sipip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : globals.guess_ip);
} else if (!strcasecmp(var, "sip-domain")) {
profile->sipdomain = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "rtp-timer-name")) {
@@ -4921,7 +4922,7 @@
profile->pflags |= PFLAG_FULL_ID;
}
} else if (!strcasecmp(var, "ext-sip-ip")) {
- profile->extsipip = switch_core_strdup(profile->pool, val);
+ profile->extsipip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : globals.guess_ip);
} else if (!strcasecmp(var, "bitpacking")) {
if (!strcasecmp(val, "aal2")) {
profile->codec_flags = SWITCH_CODEC_FLAG_AAL2;
@@ -5495,7 +5496,8 @@
memset(&globals, 0, sizeof(globals));
switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
-
+
+ switch_find_local_ip(globals.guess_ip, sizeof(globals.guess_ip), AF_INET);
if (switch_event_bind((char *) modname, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
Modified: freeswitch/trunk/src/switch_utils.c
==============================================================================
--- freeswitch/trunk/src/switch_utils.c (original)
+++ freeswitch/trunk/src/switch_utils.c Fri Jan 19 14:11:44 2007
@@ -33,9 +33,164 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#ifndef WIN32
+#include <arpa/inet.h>
+#endif
+static char *get_addr(char *buf, switch_size_t len, struct in_addr *in);
+
+SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family)
+{
+ switch_status_t status = SWITCH_STATUS_FALSE;
+ char *base;
+
+#ifdef WIN32
+ SOCKET tmp_socket;
+ SOCKADDR_STORAGE l_address;
+ int l_address_len;
+ struct addrinfo *address_info;
+#else
+#ifdef __APPLE_CC__
+ int ilen;
+#else
+ unsigned int ilen;
+#endif
+ int tmp_socket = -1, on = 1;
+ char abuf[25] = "";
+#endif
+
+ switch_copy_string(buf, "127.0.0.1", len);
+
+ switch(family) {
+ case AF_INET:
+ base = "82.45.148.209";
+ break;
+ case AF_INET6:
+ base = "52.2d.94.d1";
+ break;
+ }
+
+
+#ifdef WIN32
+ tmp_socket = socket(family, SOCK_DGRAM, 0);
+
+ getaddrinfo(base, NULL, NULL, &address_info);
+
+ if (WSAIoctl(tmp_socket,
+ SIO_ROUTING_INTERFACE_QUERY,
+ address_info->ai_addr,
+ address_info->ai_addrlen,
+ &l_address,
+ sizeof(l_address),
+ &l_address_len,
+ NULL,
+ NULL)) {
+
+ closesocket(tmp_socket);
+ freeaddrinfo(address_info);
+ return status;
+ }
+
+ closesocket(tmp_socket);
+ freeaddrinfo(address_info);
+
+ if(!getnameinfo((const struct sockaddr*)&l_address,
+ l_address_len,
+ buf,
+ len,
+ NULL,
+ 0,
+ NI_NUMERICHOST)) {
+
+ status = SWITCH_STATUS_SUCCESS;
+
+ }
+
+#else
+
+ switch(family) {
+ case AF_INET:
+ {
+ struct sockaddr_in iface_out;
+ struct sockaddr_in remote;
+ memset (&remote, 0, sizeof (struct sockaddr_in));
+
+ remote.sin_family = AF_INET;
+ remote.sin_addr.s_addr = inet_addr (base);
+ remote.sin_port = htons (4242);
+
+ memset (&iface_out, 0, sizeof (iface_out));
+ tmp_socket = socket (AF_INET, SOCK_DGRAM, 0);
+
+ if (setsockopt (tmp_socket, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) == -1) {
+ goto doh;
+ }
+
+ if (connect (tmp_socket, (struct sockaddr *) &remote, sizeof (struct sockaddr_in)) == -1) {
+ goto doh;
+ }
+ ilen = sizeof (iface_out);
+ if (getsockname (tmp_socket, (struct sockaddr *) &iface_out, &ilen) == -1) {
+ goto doh;
+ }
+
+ if (iface_out.sin_addr.s_addr == 0) {
+ goto doh;
+ }
+
+ switch_copy_string(buf, get_addr(abuf, sizeof(abuf), &iface_out.sin_addr), len);
+ status = SWITCH_STATUS_SUCCESS;
+ }
+ break;
+ case AF_INET6:
+ {
+ struct sockaddr_in6 iface_out;
+ struct sockaddr_in6 remote;
+ memset (&remote, 0, sizeof (struct sockaddr_in6));
+
+ remote.sin6_family = AF_INET6;
+ inet_pton (AF_INET6, buf, &remote.sin6_addr);
+ remote.sin6_port = htons (4242);
+
+ memset (&iface_out, 0, sizeof (iface_out));
+ tmp_socket = socket (AF_INET6, SOCK_DGRAM, 0);
+
+ if (setsockopt (tmp_socket, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) == -1) {
+ goto doh;
+ }
+
+ if (connect (tmp_socket, (struct sockaddr *) &remote, sizeof (struct sockaddr_in)) == -1) {
+ goto doh;
+ }
+
+ ilen = sizeof (iface_out);
+ if (getsockname (tmp_socket, (struct sockaddr *) &iface_out, &ilen) == -1) {
+ goto doh;
+ }
+
+ if (iface_out.sin6_addr.s6_addr == 0) {
+ goto doh;
+ }
+
+ inet_ntop (AF_INET6, (const void *) &iface_out.sin6_addr, buf, len - 1);
+ status = SWITCH_STATUS_SUCCESS;
+ }
+ break;
+ }
+ doh:
+ if (tmp_socket > 0) {
+ close (tmp_socket);
+ tmp_socket = -1;
+ }
+
+#endif
+
+ return status;
+
+}
+
SWITCH_DECLARE(int) switch_perform_regex(char *field, char *expression, pcre **new_re, int *ovector, uint32_t olen)
{
const char *error = NULL;
@@ -190,15 +345,13 @@
static char RFC2833_CHARS[] = "0123456789*#ABCDF";
-
-
-SWITCH_DECLARE(char *) switch_get_addr(char *buf, switch_size_t len, switch_sockaddr_t *in)
+static char *get_addr(char *buf, switch_size_t len, struct in_addr *in)
{
uint8_t x, *i;
char *p = buf;
- i = (uint8_t *) &in->sa.sin.sin_addr;
+ i = (uint8_t *) in;
memset(buf, 0, len);
for(x =0; x < 4; x++) {
@@ -208,9 +361,14 @@
return buf;
}
+SWITCH_DECLARE(char *) switch_get_addr(char *buf, switch_size_t len, switch_sockaddr_t *in)
+{
+ return get_addr(buf, len, &in->sa.sin.sin_addr);
+}
+
SWITCH_DECLARE(apr_status_t) switch_socket_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
- apr_int32_t flags, char *buf,
- apr_size_t *len)
+ apr_int32_t flags, char *buf,
+ apr_size_t *len)
{
apr_status_t r;
@@ -355,7 +513,7 @@
}
SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t *poll, switch_socket_t *sock,
- switch_int16_t flags, switch_memory_pool_t *pool)
+ switch_int16_t flags, switch_memory_pool_t *pool)
{
switch_pollset_t *pollset;
More information about the Freeswitch-svn
mailing list