- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6653 - freeswitch/branches/jfenton
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 12:36:24 2007 New Revision: 6653 Added: freeswitch/branches/jfenton/ Log: Created folder remotely

1 0

[commit] r6652 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 12:18:46 2007 New Revision: 6652 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: test new macro Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Dec 11 12:18:46 2007 @@ -422,7 +422,7 @@ { conference_member_t *member = NULL; - assert(conference != NULL); + switch_assert(conference != NULL); assert(id != 0); switch_mutex_lock(conference->member_mutex);

1 0

[commit] r6651 - freeswitch/trunk/src/include
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 12:18:22 2007 New Revision: 6651 Modified: freeswitch/trunk/src/include/switch_platform.h Log: add macro for assert to satisfy the code analysis tools. Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Tue Dec 11 12:18:22 2007 @@ -69,6 +69,10 @@ #pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) #pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) +#if (_MSC_VER >= 1500) // VC8+ +#define switch_assert(expr) assert(expr);__analysis_assume( expr ) +#endif + #if (_MSC_VER >= 1400) // VC8+ #ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE @@ -285,6 +289,9 @@ #ifndef TRUE #define TRUE (!FALSE) #endif +#ifndef switch_assert +#define switch_assert(expr) assert(expr) +#endif /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r6650 - freeswitch/trunk/scripts
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 12:10:47 2007 New Revision: 6650 Modified: freeswitch/trunk/scripts/sipsetup Log: woops must config for type pstn too Modified: freeswitch/trunk/scripts/sipsetup ============================================================================== --- freeswitch/trunk/scripts/sipsetup (original) +++ freeswitch/trunk/scripts/sipsetup Tue Dec 11 12:10:47 2007 @@ -115,7 +115,7 @@ $check = &are_you_sure; }; - if ($template->{type} eq "network") { + if ($template->{type} eq "network" || $template->{type} eq "pstn") { do_config($provider, $config); } if ($template->{dialprefix}) {

1 0

[commit] r6649 - in freeswitch/branches/stkn/sofia-exp/trunk: conf/directory/default docs/phrase libs/sofia-sip/libsofia-sip-ua/sresolv libs/sofia-sip/libsofia-sip-ua/su/sofia-sip libs/sofia-sip/libsofia-sip-ua/tport libs/sofia-sip/win32 libs/sofia-sip/win32/sofia-sip libs/udns scripts src/mod/applications/mod_dptools src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 12:10:43 2007 New Revision: 6649 Added: freeswitch/branches/stkn/sofia-exp/trunk/scripts/sipsetup - copied unchanged from r6648, /freeswitch/trunk/scripts/sipsetup Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/sipphone.com.noload freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/config.h.in freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h freeswitch/branches/stkn/sofia-exp/trunk/libs/udns/udns_resolver.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: Merge changes from trunk Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml Tue Dec 11 12:10:43 2007 @@ -8,7 +8,7 @@ <param name="dial-string" value="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1001.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1002.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1003.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1004.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1005.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1006.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1007.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1008.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1009.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1010.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1011.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1012.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1013.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1014.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1015.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1016.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1017.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1018.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1019.xml Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/brian.xml Tue Dec 11 12:10:43 2007 @@ -49,7 +49,7 @@ </params> <variables>  - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/>   Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/sipphone.com.noload ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/sipphone.com.noload (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/sipphone.com.noload Tue Dec 11 12:10:43 2007 @@ -4,7 +4,7 @@ <user id="%SPUSERNAME%"> <gateways> <gateway name="proxy01.sipphone.com"> - <param name="username" value="%SPUERNAME%"/> + <param name="username" value="%SPUSERNAME%"/> <param name="password" value="%SPPASSWORD%"/> <param name="from-domain" value="proxy01.sipphone.com"/> <param name="caller-id-in-from" value="true"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml Tue Dec 11 12:10:43 2007 @@ -212,5 +212,21 @@ <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> <prompt phrase="to return the call now" filename="vm-return_call.wav"/> </voicemail> + <conference> + <prompt phrase="'TONE'" filename="ack.wav" type="tone"/> + <prompt phrase="'TONE'" filename="nack.wav" type="tone"/> + <prompt phrase="The conference is muted." filename="mute.wav"/> + <prompt phrase="The conference is unmuted." filename="unmuted.wav"/> + <prompt phrase="You are currently the only person in this conference." filename="alone.wav"/> + <prompt phrase="'NONE'" filename="perpetual.wav" type="music"/> + <prompt phrase="'NONE'" filename="enter.wav" type="tone"/> + <prompt phrase="'NONE'" filename="exit.wav" type="tone"/> + <prompt phrase="You have been kicked from this conference." filename="kicked.wav"/> + <prompt phrase="This conference is locked." filename="locked.wav"/> + <prompt phrase="The conference is now locked." filename="is-locked.wav"/> + <prompt phrase="The conference is now unlocked." filename="is-unlocked.wav"/> + <prompt phrase="Please enter the conference pin number." filename="pin.wav"/> + <prompt phrase="Invalid pin number, try again." filename="bad-pin.wav"/> + </conference> </en> </language> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Tue Dec 11 12:10:43 2007 @@ -141,7 +141,7 @@ return closesocket(s); } -#if !defined(IPPROTO_IPV6) +#if !defined(IPPROTO_IPV6) && (_WIN32_WINNT < 0x0600) #if HAVE_SIN6 #include <tpipv6.h> #else Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h Tue Dec 11 12:10:43 2007 @@ -67,7 +67,7 @@ # include <winsock2.h> # include <ws2tcpip.h> # if SU_HAVE_IN6 -# if defined(IPPROTO_IPV6) +# if defined(IPPROTO_IPV6) || (_WIN32_WINNT >= 0x0600) /* case 1: IPv6 defined in winsock2.h/ws2tcpip.h */ # else /* case 2: try to use "IPv6 Tech Preview" */ Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h Tue Dec 11 12:10:43 2007 @@ -67,6 +67,12 @@ #define MSG_NOSIGNAL (0) #endif +#if (_WIN32_WINNT >= 0x0600) +#ifndef HAVE_MSG_TRUNC +#define HAVE_MSG_TRUNC 1 +#endif +#endif + #if !HAVE_MSG_TRUNC #define MSG_TRUNC (0) #endif Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Tue Dec 11 12:10:43 2007 @@ -196,7 +196,7 @@ n = su_sendto(tp->tp_socket, "TEST", 4, 0, - (void *)ai->ai_addr, ai->ai_addrlen); + (void *)ai->ai_addr, (socklen_t)ai->ai_addrlen); if (n != 4) return; Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/config.h.in ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/config.h.in (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/config.h.in Tue Dec 11 12:10:43 2007 @@ -457,7 +457,13 @@ #define strncasecmp _strnicmp #define snprintf _snprintf + +#ifndef _MSC_VER +#define vsnprintf _vsnprintf +#endif +#if _MSC_VER < 1500 #define vsnprintf _vsnprintf +#endif #define srandom(x) srand((x)) #define random() rand() Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h Tue Dec 11 12:10:43 2007 @@ -104,7 +104,12 @@ #define snprintf _snprintf #endif #ifndef vsnprintf -#define vsnprintf _vsnprintf +#ifndef _MSC_VER +#define vsnprintf _vsnprintf +#endif +#if _MSC_VER < 1500 +#define vsnprintf _vsnprintf +#endif #endif #define srandom(x) srand((x)) Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/udns/udns_resolver.c Tue Dec 11 12:10:43 2007 @@ -44,6 +44,7 @@ # include <iphlpapi.h> /* for dns server addresses etc */ # undef HAVE_POLL #else +#define udns_inet_pton inet_pton # include <sys/types.h> # include <sys/socket.h> # include <netinet/in.h> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Dec 11 12:10:43 2007 @@ -1441,11 +1441,12 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool) { - switch_xml_t x_domain, xml = NULL, x_user, x_param, x_params; + switch_xml_t x_domain = NULL, xml = NULL, x_user = NULL, x_param, x_params; char *user = NULL, *domain = NULL; const char *dest = NULL; static switch_call_cause_t cause; unsigned int timelimit = 60; + switch_channel_t *new_channel = NULL; user = switch_core_session_strdup(session, outbound_profile->destination_number); @@ -1460,6 +1461,19 @@ goto done; } + if ((x_params = switch_xml_child(x_domain, "params"))) { + for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (!strcasecmp(var, "dial-string")) { + dest = val; + break; + } + + } + } + if ((x_params = switch_xml_child(x_user, "params"))) { for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr(x_param, "name"); @@ -1486,13 +1500,14 @@ } d_dest = switch_channel_expand_variables(channel, dest); - + if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, NULL, NULL, NULL) == SWITCH_STATUS_SUCCESS) { const char *context; switch_caller_profile_t *cp; - switch_channel_t *new_channel = switch_core_session_get_channel(*new_session); + + new_channel = switch_core_session_get_channel(*new_session); - if ((context = switch_channel_get_variable(new_channel, "inbound_context"))) { + if ((context = switch_channel_get_variable(new_channel, "user_context"))) { if ((cp = switch_channel_get_caller_profile(new_channel))) { cp->context = switch_core_strdup(cp->pool, context); } @@ -1506,6 +1521,25 @@ } } + if (new_channel && xml) { + if ((x_params = switch_xml_child(x_domain, "variables"))) { + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + switch_channel_set_variable(new_channel, var, val); + } + } + + if ((x_params = switch_xml_child(x_user, "variables"))) { + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + switch_channel_set_variable(new_channel, var, val); + } + } + + } + if (xml) { switch_xml_free(xml); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Dec 11 12:10:43 2007 @@ -2094,7 +2094,7 @@ } if (!context) { - context = switch_channel_get_variable(channel, "inbound_context"); + context = switch_channel_get_variable(channel, "user_context"); } if (!context) {

1 0

[commit] r6648 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 12:02:02 2007 New Revision: 6648 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: silence logically protected warning. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Dec 11 12:02:02 2007 @@ -1441,7 +1441,7 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool) { - switch_xml_t x_domain, xml = NULL, x_user, x_param, x_params; + switch_xml_t x_domain = NULL, xml = NULL, x_user = NULL, x_param, x_params; char *user = NULL, *domain = NULL; const char *dest = NULL; static switch_call_cause_t cause;

1 0

[commit] r6647 - freeswitch/trunk/scripts
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 12:01:51 2007 New Revision: 6647 Added: freeswitch/trunk/scripts/sipsetup (contents, props changed) Log: sipsetup script to automatically configure the included providers.. please contribute your changes or rewrites Added: freeswitch/trunk/scripts/sipsetup ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/sipsetup Tue Dec 11 12:01:51 2007 @@ -0,0 +1,170 @@ +#!/usr/bin/perl +# +# FreeSWITCH SIP Setup Assistant v1.0 +# Brian K. West <brian.west(a)mac.com> +# +# + +use Data::Dumper; +use File::Copy; + + +my $PREFIX = "/usr/local/freeswitch"; + +my $providers = { + "1" => "FWD", + "2" => "SP", + "3" => "IS", + "4" => "AL", + "5" => "SB" + }; + + +my $FWD = { + "type" => "network", + "register" => "true", + "fields" => [number, password, extension], + "domain" => "pulver.com", + "dialprefix" => "1-393" + }; + +my $SP = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "sipphone.com", + "dialprefix" => "1-747, 1-222" + }; + +my $IS = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "ideasip.com", + "dialprefix" => "1-101" + }; + +my $AL = { + "type" => "pstn", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "asterlink.com", + }; + +my $SB = { + "type" => "peer", + "domain" => "sipbroker.com", + "dialprefix" => "*XXX" + }; + +my $TEMPLATES = { + "FWD" => $FWD, + "SP" => $SP, + "IS" => $IS, + "AL" => $AL, + "SB" => $SB + }; + +print "\n" x 60; +&welcome; + +sub welcome { + print <<WELCOME + + Welcome to the FreeSWITCH setup assistant. + + 1. Configure Free World Dialup + 2. Configure SIPPhone.com + 3. Configure ideaSIP.com + 4. Configure Asterlink.com + 5. Configure SIPBroker.com + + X. Exit + +WELCOME + ; + print "Which provider do you wish to setup? "; + my $i = <STDIN>; + chomp($i); + if ($i =~ m/X|x/) { + print "Thanks you!\n"; exit; + } elsif ($i > 5) { + print "Invalid Choice\n"; &welcome; + } else { + if (exists($providers->{$i})) { + configure_sip_provider($providers->{$i}); + } + }; + &welcome; +} + +sub configure_sip_provider($) { + my $provider = shift; + my $template = $TEMPLATES->{$provider}; + my $config; + my $check = 1; + foreach $field (@{$template->{fields}}) { + print "\nPlease your $template->{domain} $field: "; + $tmp = "$provider" . uc($field); + $i = <STDIN>; + chomp($i); + $config->{$tmp} = $i; + } + + while($check) { + $check = &are_you_sure; + }; + + if ($template->{type} eq "network") { + do_config($provider, $config); + } + if ($template->{dialprefix}) { + enable_extension($provider, $config); + } + print "\n\n\nConfiguration Complete!!!\n\n\n\n\n"; + sleep(2); + &welcome; +} + +sub enable_extension($$) { + my $provider = shift; + my $config = shift; + + my $todo = $TEMPLATES->{$provider}; + + copy("$PREFIX/conf/dialplan/extensions/$todo->{domain}.noload", "$PREFIX/conf/dialplan/extensions/$todo->{domain}.xml"); + print "\nExtension prefix $todo->{dialprefix} enabled for dialing $todo->{domain}...\n"; +} + +sub do_config($$) { + my $provider = shift; + my $config = shift; + my $todo = $TEMPLATES->{$provider}; + + open(TEMPLATE, "<$PREFIX/conf/directory/default/$todo->{domain}.noload"); + @lines = <TEMPLATE>; + close(TEMPLATE); + open(CONFIG, ">$PREFIX/conf/directory/default/$todo->{domain}.xml"); + foreach $line (@lines) { + foreach $key (sort keys %{$config}) { + $line =~ s/%$key%/$config->{$key}/g; + } + print CONFIG $line; + } + close(CONFIG); + print "Config Created...\n"; +} + +sub are_you_sure { + my $sure = 1; + while($sure) { + print "Are you sure? (yes/no)"; + $i = <STDIN>; + chomp($i); + if($i =~ m/No|no|NO|n/) { + &welcome; + } elsif ($i =~ m/Yes|yes|YES|y/) { + return 0; + } + } +}

1 0

[commit] r6646 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 11:58:42 2007 New Revision: 6646 Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload Log: woops Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/sipphone.com.noload (original) +++ freeswitch/trunk/conf/directory/default/sipphone.com.noload Tue Dec 11 11:58:42 2007 @@ -4,7 +4,7 @@ <user id="%SPUSERNAME%"> <gateways> <gateway name="proxy01.sipphone.com"> - <param name="username" value="%SPUERNAME%"/> + <param name="username" value="%SPUSERNAME%"/> <param name="password" value="%SPPASSWORD%"/> <param name="from-domain" value="proxy01.sipphone.com"/> <param name="caller-id-in-from" value="true"/>

1 0

[commit] r6645 - freeswitch/trunk/libs/udns
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 11:00:43 2007 New Revision: 6645 Modified: freeswitch/trunk/libs/udns/udns_resolver.c Log: fix non-windows build broken by msvc 9 fix. Modified: freeswitch/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/trunk/libs/udns/udns_resolver.c Tue Dec 11 11:00:43 2007 @@ -44,6 +44,7 @@ # include <iphlpapi.h> /* for dns server addresses etc */ # undef HAVE_POLL #else +#define udns_inet_pton inet_pton # include <sys/types.h> # include <sys/socket.h> # include <netinet/in.h>

1 0

[commit] r6644 - in freeswitch/trunk/libs/sofia-sip: libsofia-sip-ua/sresolv libsofia-sip-ua/su/sofia-sip libsofia-sip-ua/tport win32 win32/sofia-sip
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 10:58:20 2007 New Revision: 6644 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c freeswitch/trunk/libs/sofia-sip/win32/config.h.in freeswitch/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h Log: fix for msvc 9 build. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Tue Dec 11 10:58:20 2007 @@ -141,7 +141,7 @@ return closesocket(s); } -#if !defined(IPPROTO_IPV6) +#if !defined(IPPROTO_IPV6) && (_WIN32_WINNT < 0x0600) #if HAVE_SIN6 #include <tpipv6.h> #else Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h Tue Dec 11 10:58:20 2007 @@ -67,7 +67,7 @@ # include <winsock2.h> # include <ws2tcpip.h> # if SU_HAVE_IN6 -# if defined(IPPROTO_IPV6) +# if defined(IPPROTO_IPV6) || (_WIN32_WINNT >= 0x0600) /* case 1: IPv6 defined in winsock2.h/ws2tcpip.h */ # else /* case 2: try to use "IPv6 Tech Preview" */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h Tue Dec 11 10:58:20 2007 @@ -67,6 +67,12 @@ #define MSG_NOSIGNAL (0) #endif +#if (_WIN32_WINNT >= 0x0600) +#ifndef HAVE_MSG_TRUNC +#define HAVE_MSG_TRUNC 1 +#endif +#endif + #if !HAVE_MSG_TRUNC #define MSG_TRUNC (0) #endif Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Tue Dec 11 10:58:20 2007 @@ -196,7 +196,7 @@ n = su_sendto(tp->tp_socket, "TEST", 4, 0, - (void *)ai->ai_addr, ai->ai_addrlen); + (void *)ai->ai_addr, (socklen_t)ai->ai_addrlen); if (n != 4) return; Modified: freeswitch/trunk/libs/sofia-sip/win32/config.h.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/config.h.in (original) +++ freeswitch/trunk/libs/sofia-sip/win32/config.h.in Tue Dec 11 10:58:20 2007 @@ -457,7 +457,13 @@ #define strncasecmp _strnicmp #define snprintf _snprintf + +#ifndef _MSC_VER +#define vsnprintf _vsnprintf +#endif +#if _MSC_VER < 1500 #define vsnprintf _vsnprintf +#endif #define srandom(x) srand((x)) #define random() rand() Modified: freeswitch/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h (original) +++ freeswitch/trunk/libs/sofia-sip/win32/sofia-sip/su_configure.h Tue Dec 11 10:58:20 2007 @@ -104,7 +104,12 @@ #define snprintf _snprintf #endif #ifndef vsnprintf -#define vsnprintf _vsnprintf +#ifndef _MSC_VER +#define vsnprintf _vsnprintf +#endif +#if _MSC_VER < 1500 +#define vsnprintf _vsnprintf +#endif #endif #define srandom(x) srand((x))

1 0