June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13720 - freeswitch/trunk/src
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: brian Date: Tue Jun 9 09:40:27 2009 New Revision: 13720 Log: don't let 0.0.0.0 be valid for upnp because some devices that are not internet gateways will return this ie printers Modified: freeswitch/trunk/src/switch_nat.c Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Tue Jun 9 09:40:27 2009 @@ -74,6 +74,7 @@ } if (!dev) { dev = devlist; /* defaulting to first device */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No InternetGatewayDevice, using first entry as default.\n"); } descXML = miniwget(dev->descURL, &descXMLsize); @@ -91,6 +92,12 @@ nat_globals.data.servicetype, nat_globals.pub_addr)) == UPNPCOMMAND_SUCCESS) { + if (!strcmp(nat_globals.pub_addr, "0.0.0.0")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "uPNP Device (url: %s) returned an invalid external address of 0.0.0.0. Disabling uPNP\n", nat_globals.urls.controlURL); + return -2; + } + nat_globals.nat_type = SWITCH_NAT_TYPE_UPNP; return 0; }

1 0

[commit] r13719 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: brian Date: Tue Jun 9 09:13:32 2009 New Revision: 13719 Log: MODENDP-225 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Tue Jun 9 09:13:32 2009 @@ -1351,7 +1351,7 @@ char *call_id = argv[7]; char *expires = argv[10]; char *profile_name = argv[13]; - char *body = argv[14]; + char *body = argv[15]; char *id = NULL; nua_handle_t *nh; int expire_sec = atoi(expires);

1 0

[commit] r13718 - freeswitch/trunk/src/mod/applications/mod_nibblebill
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: mrene Date: Tue Jun 9 08:50:11 2009 New Revision: 13718 Log: mod_nibblebill: move return statement inside odbc ifdef Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c (original) +++ freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c Tue Jun 9 08:50:11 2009 @@ -363,9 +363,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Retrieved current balance for account %s (balance = %f)\n", billaccount, balance); } - -#endif + return balance; +#endif } /* This is where we actually charge the guy

1 0

[commit] r13717 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: andrew Date: Tue Jun 9 00:24:55 2009 New Revision: 13717 Log: Blindly adding winsock support, I'll test it when I get to a windows machine Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Tue Jun 9 00:24:55 2009 @@ -245,7 +245,11 @@ switch_mutex_lock(listen_list.sock_mutex); if (*sock) { shutdown(*sock, SHUT_RDWR); +#ifdef WIN32 + closesocket(*sock); +#else close(*sock); +#endif sock = NULL; } switch_mutex_unlock(listen_list.sock_mutex); @@ -1020,7 +1024,11 @@ int clientfd; if (SWITCH_STATUS_SUCCESS==initialise_ei(&ec)) { +#ifdef WIN32 + WSASetLastError(0); +#else errno = 0; +#endif if ((clientfd=ei_connect(&ec,node)) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error connecting to node %s (erl_errno=%d, errno=%d)!\n",node,erl_errno,errno); return NULL; @@ -1404,6 +1412,23 @@ int on = 1; int clientfd; int epmdfd; +#ifdef WIN32 + /* borrowed from MSDN, stupid winsock */ + WORD wVersionRequested; + WSADATA wsaData; + + wVersionRequested = MAKEWORD(2, 2); + + if (WSAStartup(wVersionRequested, &wsaData) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Winsock initialization failed, oh well\n"); + return SWITCH_STATUS_TERM; + } + + if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Your winsock version doesn't support the 2.2 specification, bailing\n"); + return SWITCH_STATUS_TERM; + } +#endif memset(&listen_list, 0, sizeof(listen_list)); config(); @@ -1488,7 +1513,11 @@ /* zero out errno because ei_accept doesn't differentiate between a * failed authentication or a socket failure, or a client version * mismatch or a godzilla attack */ +#ifdef WIN32 + WSASetLastError(0); +#else errno = 0; +#endif if ((clientfd = ei_accept_tmo(&ec, listen_list.sockfd, &conn, 100)) == ERL_ERROR) { if (prefs.done) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Shutting Down\n"); @@ -1570,6 +1599,10 @@ close_socket(&l->sockfd); } +#ifdef WIN32 + WSACleanup(); +#endif + switch_mutex_unlock(globals.listener_mutex); switch_sleep(1500000); /* sleep for 1.5 seconds */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Tue Jun 9 00:24:55 2009 @@ -143,7 +143,11 @@ typedef struct globals_struct globals_t; struct listen_list_struct { +#ifdef WIN32 + SOCKET sockfd; +#else int sockfd; +#endif switch_mutex_t *sock_mutex; listener_t *listeners; uint8_t ready; @@ -216,6 +220,10 @@ break; \ } +#ifdef WIN32 /* MSDN suggested hack to fake errno for network operations */ +#define errno WSAGetLastError() +#endif + /* mod_erlang_event.c */ session_elem_t* attach_call_to_registered_process(listener_t* listener, char* reg_name, switch_core_session_t *session); session_elem_t* attach_call_to_pid(listener_t* listener, erlang_pid* pid, switch_core_session_t *session);

1 0

[commit] r13716 - freeswitch/trunk/src/mod
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: mikej Date: Mon Jun 8 22:25:48 2009 New Revision: 13716 Log: build: clean/uninstall disabled modules as well (FSBUILD-85) Modified: freeswitch/trunk/src/mod/Makefile.am Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Mon Jun 8 22:25:48 2009 @@ -1,7 +1,7 @@ all: $(OUR_MODULES) -clean: $(OUR_CLEAN_MODULES) +clean: $(OUR_CLEAN_MODULES) $(OUR_DISABLED_CLEAN_MODULES) install: $(OUR_INSTALL_MODULES) -uninstall: $(OUR_UNINSTALL_MODULES) +uninstall: $(OUR_UNINSTALL_MODULES) $(OUR_DISABLED_UNINSTALL_MODULES) $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODULES) $(OUR_DISABLED_MODULES) $(OUR_DISABLED_CLEAN_MODULES) $(OUR_DISABLED_INSTALL_MODULES) $(OUR_DISABLED_UNINSTALL_MODULES): @set fnord $$MAKEFLAGS; amf=$$2; \

1 0

[commit] r13715 - freeswitch/trunk/libs/js/nsprpub
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: mikej Date: Mon Jun 8 21:54:51 2009 New Revision: 13715 Log: libnspr: fix bsd port packaging (FSBUILD-170) Modified: freeswitch/trunk/libs/js/nsprpub/configure.in Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Mon Jun 8 21:54:51 2009 @@ -1130,7 +1130,7 @@ if test "$MOZ_OBJFORMAT" = "elf"; then DLL_SUFFIX=so else - DLL_SUFFIX=so.1.0 + DLL_SUFFIX=so.1 fi MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC

1 0

[commit] r13714 - in freeswitch/trunk/libs: apr apr-util curl iksemel ilbc js js/nsprpub libdingaling libedit libsndfile pcre portaudio sofia-sip speex sqlite srtp voipcodecs
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: mikej Date: Mon Jun 8 21:23:31 2009 New Revision: 13714 Log: svn:ignore Modified: freeswitch/trunk/libs/apr/ (props changed) freeswitch/trunk/libs/apr-util/ (props changed) freeswitch/trunk/libs/curl/ (props changed) freeswitch/trunk/libs/iksemel/ (props changed) freeswitch/trunk/libs/ilbc/ (props changed) freeswitch/trunk/libs/js/ (props changed) freeswitch/trunk/libs/js/nsprpub/ (props changed) freeswitch/trunk/libs/libdingaling/ (props changed) freeswitch/trunk/libs/libedit/ (props changed) freeswitch/trunk/libs/libsndfile/ (props changed) freeswitch/trunk/libs/pcre/ (props changed) freeswitch/trunk/libs/portaudio/ (props changed) freeswitch/trunk/libs/sofia-sip/ (props changed) freeswitch/trunk/libs/speex/ (props changed) freeswitch/trunk/libs/sqlite/ (props changed) freeswitch/trunk/libs/srtp/ (props changed) freeswitch/trunk/libs/voipcodecs/ (props changed)

1 0

[commit] r13713 - freeswitch/trunk/libs/iksemel/doc
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: mikej Date: Mon Jun 8 20:41:05 2009 New Revision: 13713 Log: don't build docs that require new build dep texinfo Modified: freeswitch/trunk/libs/iksemel/doc/Makefile.am Modified: freeswitch/trunk/libs/iksemel/doc/Makefile.am ============================================================================== --- freeswitch/trunk/libs/iksemel/doc/Makefile.am (original) +++ freeswitch/trunk/libs/iksemel/doc/Makefile.am Mon Jun 8 20:41:05 2009 @@ -2,4 +2,4 @@ ## Process this file with automake to produce Makefile.in ## -info_TEXINFOS = iksemel.texi +#info_TEXINFOS = iksemel.texi

1 0

[commit] r13712 - freeswitch/trunk/libs/pcre
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: mikej Date: Mon Jun 8 20:08:51 2009 New Revision: 13712 Log: remove docs without defined docdir to fix build Modified: freeswitch/trunk/libs/pcre/Makefile.am Modified: freeswitch/trunk/libs/pcre/Makefile.am ============================================================================== --- freeswitch/trunk/libs/pcre/Makefile.am (original) +++ freeswitch/trunk/libs/pcre/Makefile.am Mon Jun 8 20:08:51 2009 @@ -1,64 +1,8 @@ ## Process this file with automake to produce Makefile.in. -dist_doc_DATA = \ - doc/pcre.txt \ - doc/pcre-config.txt \ - doc/pcregrep.txt \ - doc/pcretest.txt \ - AUTHORS \ - COPYING \ - ChangeLog \ - LICENCE \ - NEWS \ - README - -dist_html_DATA = \ - doc/html/index.html \ - doc/html/pcre.html \ - doc/html/pcre-config.html \ - doc/html/pcre_compile.html \ - doc/html/pcre_compile2.html \ - doc/html/pcre_config.html \ - doc/html/pcre_copy_named_substring.html \ - doc/html/pcre_copy_substring.html \ - doc/html/pcre_dfa_exec.html \ - doc/html/pcre_exec.html \ - doc/html/pcre_free_substring.html \ - doc/html/pcre_free_substring_list.html \ - doc/html/pcre_fullinfo.html \ - doc/html/pcre_get_named_substring.html \ - doc/html/pcre_get_stringnumber.html \ - doc/html/pcre_get_stringtable_entries.html \ - doc/html/pcre_get_substring.html \ - doc/html/pcre_get_substring_list.html \ - doc/html/pcre_info.html \ - doc/html/pcre_maketables.html \ - doc/html/pcre_refcount.html \ - doc/html/pcre_study.html \ - doc/html/pcre_version.html \ - doc/html/pcreapi.html \ - doc/html/pcrebuild.html \ - doc/html/pcrecallout.html \ - doc/html/pcrecompat.html \ - doc/html/pcregrep.html \ - doc/html/pcrematching.html \ - doc/html/pcrepartial.html \ - doc/html/pcrepattern.html \ - doc/html/pcreperform.html \ - doc/html/pcreposix.html \ - doc/html/pcreprecompile.html \ - doc/html/pcresample.html \ - doc/html/pcrestack.html \ - doc/html/pcresyntax.html \ - doc/html/pcretest.html - pcrecpp_html = doc/html/pcrecpp.html dist_noinst_DATA = $(pcrecpp_html) -if WITH_PCRE_CPP -html_DATA = $(pcrecpp_html) -endif - # The Libtool libraries to install. We'll add to this later. lib_LTLIBRARIES =

1 0

[commit] r13711 - freeswitch/trunk/libs/pcre
by FreeSWITCH SVN 09 Jun '09

09 Jun '09

Author: mikej Date: Mon Jun 8 19:40:32 2009 New Revision: 13711 Log: svn:ignore Modified: freeswitch/trunk/libs/pcre/ (props changed)

1 0