January 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4007 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 20 Jan '07

20 Jan '07

Author: mikej Date: Fri Jan 19 19:22:43 2007 New Revision: 4007 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: "pa_dtmf" -> "pa dtmf" in api help text. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Jan 19 19:22:43 2007 @@ -1623,7 +1623,7 @@ "pa hangup [<call_id>]\n" "pa list\n" "pa switch [<call_id>|none]\n" - "pa_dtmf <digit string>\n" + "pa dtmf <digit string>\n" "--------------------------------------------------------------------------------\n"; if (switch_strlen_zero(cmd)) {

1 0

[commit] r4006 - freeswitch/trunk/src/include
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: mikej Date: Fri Jan 19 17:47:51 2007 New Revision: 4006 Modified: freeswitch/trunk/src/include/switch_utils.h Log: doxygen 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 17:47:51 2007 @@ -79,7 +79,13 @@ !strcasecmp(expr, "true") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE - +/*! + \brief find local ip of the box + \param buf the buffer to write the ip adress found into + \param len the length of the buf + \param family the address family to return (AF_INET or AF_INET6) + \return SWITCH_STATUS_SUCCESSS for success, otherwise failure +*/ 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)

1 0

[commit] r4005 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: mikej Date: Fri Jan 19 17:47:23 2007 New Revision: 4005 Modified: freeswitch/trunk/src/switch.c Log: whoops.. cr/lf -> lf Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Jan 19 17:47:23 2007 @@ -195,10 +195,10 @@ { char pid_path[256] = ""; // full path to the pid file const char *err = NULL; // error value for return from freeswitch initialization -#ifndef WIN32 - int nf = 0; // TRUE if we are running in nofork mode -#endif - int nc = 0; // TRUE if we are running in noconsole mode +#ifndef WIN32 + int nf = 0; // TRUE if we are running in nofork mode +#endif + int nc = 0; // TRUE if we are running in noconsole mode int vg = 0; // TRUE if we are running in vg mode FILE *f; // file handle to the pid file pid_t pid = 0; // @@ -259,9 +259,9 @@ } } #else - - if (argv[x] && !strcmp(argv[x], "-nf")) { - nf++; + + if (argv[x] && !strcmp(argv[x], "-nf")) { + nf++; } #endif if (argv[x] && !strcmp(argv[x], "-hp")) { @@ -273,8 +273,8 @@ } if (argv[x] && !strcmp(argv[x], "-nc")) { - nc++; - } + nc++; + } if (argv[x] && !strcmp(argv[x], "-vg")) { vg++; @@ -293,7 +293,7 @@ #ifdef WIN32 FreeConsole(); #else - if (!nf && (pid = fork())) { + if (!nf && (pid = fork())) { fprintf(stderr, "%d Backgrounding.\n", (int)pid); exit(0); }

1 0

[commit] r4004 - in freeswitch/trunk: libs/iksemel/include libs/iksemel/src libs/iksemel/test scripts/js_modules src/mod/languages/mod_spidermonkey
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: anthm Date: Fri Jan 19 16:56:31 2007 New Revision: 4004 Modified: freeswitch/trunk/libs/iksemel/include/Makefile.in freeswitch/trunk/libs/iksemel/src/Makefile.in freeswitch/trunk/libs/iksemel/test/Makefile.in freeswitch/trunk/scripts/js_modules/SpeechTools.jm freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update Modified: freeswitch/trunk/libs/iksemel/include/Makefile.in ============================================================================== --- freeswitch/trunk/libs/iksemel/include/Makefile.in (original) +++ freeswitch/trunk/libs/iksemel/include/Makefile.in Fri Jan 19 16:56:31 2007 @@ -100,7 +100,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -173,7 +173,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: Modified: freeswitch/trunk/libs/iksemel/src/Makefile.in ============================================================================== --- freeswitch/trunk/libs/iksemel/src/Makefile.in (original) +++ freeswitch/trunk/libs/iksemel/src/Makefile.in Fri Jan 19 16:56:31 2007 @@ -92,9 +92,21 @@ lib_LTLIBRARIES = libiksemel.la -@DO_POSIX_TRUE@posix_c = io-posix.c +@DO_POSIX_TRUE@posix_c = @DO_POSIX_TRUE@io-posix.c -libiksemel_la_SOURCES = ikstack.c utility.c iks.c sax.c dom.c $(posix_c) stream.c sha.c jabber.c filter.c md5.c base64.c +libiksemel_la_SOURCES = \ + ikstack.c \ + utility.c \ + iks.c \ + sax.c \ + dom.c \ + $(posix_c) \ + stream.c \ + sha.c \ + jabber.c \ + filter.c \ + md5.c \ + base64.c libiksemel_la_LDFLAGS = -version-info 3:0:0 -no-undefined @@ -127,7 +139,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(libiksemel_la_SOURCES) OBJECTS = $(libiksemel_la_OBJECTS) @@ -233,7 +245,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: Modified: freeswitch/trunk/libs/iksemel/test/Makefile.in ============================================================================== --- freeswitch/trunk/libs/iksemel/test/Makefile.in (original) +++ freeswitch/trunk/libs/iksemel/test/Makefile.in Fri Jan 19 16:56:31 2007 @@ -164,7 +164,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(tst_ikstack_SOURCES) $(tst_iks_SOURCES) $(tst_sax_SOURCES) $(tst_dom_SOURCES) $(tst_sha_SOURCES) $(tst_md5_SOURCES) $(tst_filter_SOURCES) $(tst_jid_SOURCES) OBJECTS = $(tst_ikstack_OBJECTS) $(tst_iks_OBJECTS) $(tst_sax_OBJECTS) $(tst_dom_OBJECTS) $(tst_sha_OBJECTS) $(tst_md5_OBJECTS) $(tst_filter_OBJECTS) $(tst_jid_OBJECTS) @@ -283,7 +283,7 @@ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm ============================================================================== --- freeswitch/trunk/scripts/js_modules/SpeechTools.jm (original) +++ freeswitch/trunk/scripts/js_modules/SpeechTools.jm Fri Jan 19 16:56:31 2007 @@ -311,7 +311,7 @@ if (!files[x] || files[x] == "noop") { continue; } - rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , "", this.asr.onInput, this.asr); + rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , this.asr.onInput, this.asr); if (rv) { break; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Jan 19 16:56:31 2007 @@ -402,11 +402,36 @@ static void js_error(JSContext *cx, const char *message, JSErrorReport *report) { - if (message) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, report->filename ? (char *)report->filename : "mod_spidermonkey.c", modname, report->lineno, SWITCH_LOG_ERROR, - "%s %s%s\n", message, report->linebuf ? "near " : "", report->linebuf ? report->linebuf : ""); + const char *filename = __FILE__; + int line = __LINE__; + const char *text = ""; + char *ex = ""; + + if (message && report) { + if (report->filename) { + filename = report->filename; + } + line = report->lineno; + if (report->linebuf) { + text = report->linebuf; + ex = "near "; + } } - + + if (!message) { + message = "(N/A)"; + } + + switch_log_printf(SWITCH_CHANNEL_ID_LOG, + filename, + modname, + line, + SWITCH_LOG_ERROR, + "%s %s%s\n", + ex, + message, + text); + }

1 0

[commit] r4003 - in freeswitch/trunk: libs/libdingaling libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: anthm Date: Fri Jan 19 15:35:50 2007 New Revision: 4003 Modified: freeswitch/trunk/libs/libdingaling/.update freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: minor tweak Modified: freeswitch/trunk/libs/libdingaling/.update ============================================================================== --- freeswitch/trunk/libs/libdingaling/.update (original) +++ freeswitch/trunk/libs/libdingaling/.update Fri Jan 19 15:35:50 2007 @@ -1 +1 @@ -Tue Dec 12 11:55:02 EST 2006 +Fri Jan 19 15:23:51 EST 2007 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Fri Jan 19 15:35:50 2007 @@ -349,7 +349,9 @@ session->payloads[session->payload_len].id = atoi(id); if (rate) { session->payloads[session->payload_len].rate = atoi(rate); - } + } else { + session->payloads[session->payload_len].rate = 8000; + } session->payload_len++; if (globals.debug) { 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 15:35:50 2007 @@ -2472,7 +2472,9 @@ if (!strncasecmp(name, "ilbc", 4)) { name = "ilbc"; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "compare %s %d to %s %d\n", payloads[x].name, payloads[x].id, name, tech_pvt->codecs[y]->ianacode); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "compare %s %d/%d to %s %d/%d\n", + payloads[x].name, payloads[x].id, payloads[x].rate, + name, tech_pvt->codecs[y]->ianacode, tech_pvt->codecs[y]->samples_per_second); if (tech_pvt->codecs[y]->ianacode > 95) { match = strcasecmp(name, payloads[x].name) ? 0 : 1; } else {

1 0

[commit] r4002 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: anthm Date: Fri Jan 19 14:52:19 2007 New Revision: 4002 Modified: freeswitch/trunk/src/switch_utils.c Log: auto ip fix for w32 Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Jan 19 14:52:19 2007 @@ -67,6 +67,9 @@ case AF_INET6: base = "52.2d.94.d1"; break; + default: + base = "127.0.0.1"; + break; } @@ -78,10 +81,10 @@ if (WSAIoctl(tmp_socket, SIO_ROUTING_INTERFACE_QUERY, address_info->ai_addr, - address_info->ai_addrlen, + (DWORD)address_info->ai_addrlen, &l_address, sizeof(l_address), - &l_address_len, + (LPDWORD)&l_address_len, NULL, NULL)) {

1 0

[commit] r4001 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: anthm Date: Fri Jan 19 14:20:28 2007 New Revision: 4001 Modified: freeswitch/trunk/src/switch_utils.c Log: update for mac Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Jan 19 14:20:28 2007 @@ -49,7 +49,7 @@ int l_address_len; struct addrinfo *address_info; #else -#ifdef __APPLE_CC__ +#ifdef __Darwin__ int ilen; #else unsigned int ilen;

1 0

[commit] r4000 - in freeswitch/trunk: conf src src/include src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Jan '07

19 Jan '07

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"/>   @@ -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"/>  @@ -331,7 +331,7 @@  <param name="use-rtp-timer" value="true"/>  -  +    <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"/>  <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;

1 0

[commit] r3999 - freeswitch/trunk/src
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: mikej Date: Fri Jan 19 07:59:49 2007 New Revision: 3999 Modified: freeswitch/trunk/src/switch.c Log: added no fork mode to the executable so it can be used w/ sipx watchdog service. This mode is not available on windows as we do not fork on windows regardless. Thanks to Paweł Pierścionek for the contribution. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Jan 19 07:59:49 2007 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> + * Pawel Pierscionek <pawel(a)voiceworks.pl> * * * switch.c -- Main @@ -194,7 +195,10 @@ { char pid_path[256] = ""; // full path to the pid file const char *err = NULL; // error value for return from freeswitch initialization - int bg = 0; // TRUE if we are running in background mode +#ifndef WIN32 + int nf = 0; // TRUE if we are running in nofork mode +#endif + int nc = 0; // TRUE if we are running in noconsole mode int vg = 0; // TRUE if we are running in vg mode FILE *f; // file handle to the pid file pid_t pid = 0; // @@ -254,6 +258,11 @@ exit(0); } } +#else + + if (argv[x] && !strcmp(argv[x], "-nf")) { + nf++; + } #endif if (argv[x] && !strcmp(argv[x], "-hp")) { set_high_priority(); @@ -264,8 +273,8 @@ } if (argv[x] && !strcmp(argv[x], "-nc")) { - bg++; - } + nc++; + } if (argv[x] && !strcmp(argv[x], "-vg")) { vg++; @@ -276,7 +285,7 @@ return freeswitch_kill_background(); } - if (bg) { + if (nc) { signal(SIGHUP, handle_SIGHUP); signal(SIGTERM, handle_SIGHUP); @@ -284,14 +293,14 @@ #ifdef WIN32 FreeConsole(); #else - if ((pid = fork())) { + if (!nf && (pid = fork())) { fprintf(stderr, "%d Backgrounding.\n", (int)pid); exit(0); } #endif } - if (switch_core_init_and_modload(bg ? lfile : NULL, &err) != SWITCH_STATUS_SUCCESS) { + if (switch_core_init_and_modload(nc ? lfile : NULL, &err) != SWITCH_STATUS_SUCCESS) { fprintf(stderr, "Cannot Initilize [%s]\n", err); return 255; } @@ -305,7 +314,7 @@ fprintf(f, "%d", pid = getpid()); fclose(f); - switch_core_runtime_loop(bg); + switch_core_runtime_loop(nc); return switch_core_destroy(vg); }

1 0

[commit] r3998 - in freeswitch/trunk: libs/portaudio/src/common src/mod/endpoints/mod_portaudio
by Freeswitch SVN 19 Jan '07

19 Jan '07

Author: mikej Date: Fri Jan 19 07:49:10 2007 New Revision: 3998 Modified: freeswitch/trunk/libs/portaudio/src/common/pa_ringbuffer.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Log: indications are that we can use mfence, lfence, sfence on x86_64, we will need to test and confirm this, but this should fix the build on 64 bit linux gcc at least. need testers to confirm this. Modified: freeswitch/trunk/libs/portaudio/src/common/pa_ringbuffer.c ============================================================================== --- freeswitch/trunk/libs/portaudio/src/common/pa_ringbuffer.c (original) +++ freeswitch/trunk/libs/portaudio/src/common/pa_ringbuffer.c Fri Jan 19 07:49:10 2007 @@ -85,7 +85,7 @@ # define PaUtil_FullMemoryBarrier() asm volatile("sync":::"memory") # define PaUtil_ReadMemoryBarrier() asm volatile("sync":::"memory") # define PaUtil_WriteMemoryBarrier() asm volatile("sync":::"memory") -# elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) +# elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined(__x86_64__) # define PaUtil_FullMemoryBarrier() asm volatile("mfence":::"memory") # define PaUtil_ReadMemoryBarrier() asm volatile("lfence":::"memory") # define PaUtil_WriteMemoryBarrier() asm volatile("sfence":::"memory") Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Fri Jan 19 07:49:10 2007 @@ -85,7 +85,7 @@ # define PaUtil_FullMemoryBarrier() asm volatile("sync":::"memory") # define PaUtil_ReadMemoryBarrier() asm volatile("sync":::"memory") # define PaUtil_WriteMemoryBarrier() asm volatile("sync":::"memory") -# elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) +# elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined(__x86_64__) # define PaUtil_FullMemoryBarrier() asm volatile("mfence":::"memory") # define PaUtil_ReadMemoryBarrier() asm volatile("lfence":::"memory") # define PaUtil_WriteMemoryBarrier() asm volatile("sfence":::"memory")

1 0