- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8685 - freeswitch/trunk
by Freeswitch SVN 27 May '08

27 May '08

Author: anthm Date: Mon May 26 23:06:59 2008 New Revision: 8685 Modified: freeswitch/trunk/configure.in Log: bump to new sound files version Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon May 26 23:06:59 2008 @@ -8,7 +8,7 @@ AC_SUBST(SWITCH_VERSION_MINOR, [0]) AC_SUBST(SWITCH_VERSION_MICRO, [pre4]) #AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here]) -AC_SUBST(SOUNDS_VERSION, [1.0.1]) +AC_SUBST(SOUNDS_VERSION, [1.0.2]) AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])

1 0

[commit] r8684 - in freeswitch/trunk/src/mod/applications: mod_commands mod_dptools
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Mon May 26 22:42:30 2008 New Revision: 8684 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: remove old names of stuff. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon May 26 22:42:30 2008 @@ -2296,14 +2296,12 @@ SWITCH_ADD_API(commands_api_interface, "originate", "Originate a Call", originate_function, ORIGINATE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "tone_detect", "Start Tone Detection on a channel", tone_detect_session_function, TONE_DETECT_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "killchan", "Kill Channel (depricated)", kill_function, KILL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_kill", "Kill Channel", kill_function, KILL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_park", "Park Channel", park_function, PARK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "reloadacl", "Reload ACL", reload_acl_function, "[reloadxml]"); SWITCH_ADD_API(commands_api_interface, "reloadxml", "Reload XML", reload_function, ""); SWITCH_ADD_API(commands_api_interface, "unload", "Unload Module", unload_function, LOAD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "load", "Load Module", load_function, LOAD_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "transfer", "Transfer (depricated)", transfer_function, TRANSFER_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_transfer", "Transfer a session", transfer_function, TRANSFER_SYNTAX); SWITCH_ADD_API(commands_api_interface, "pause", "Pause", pause_function, PAUSE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX); @@ -2317,16 +2315,11 @@ SWITCH_ADD_API(commands_api_interface, "uuid_dump", "uuid_dump", uuid_dump_function, DUMP_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_getvar", "global_getvar", global_getvar_function, GLOBAL_GETVAR_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace (depricated)", session_displace_function, DISPLACE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); - SWITCH_ADD_API(commands_api_interface, "session_record", "session record (depricated)", session_record_function, SESS_REC_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_record", "session record", session_record_function, SESS_REC_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast (depricated)", uuid_broadcast_function, BROADCAST_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "hold", "hold (depricated)", uuid_hold_function, HOLD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_hold", "hold", uuid_hold_function, HOLD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_display", "change display", uuid_display_function, DISPLAY_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "media", "media (depricated)", uuid_media_function, MEDIA_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX); SWITCH_ADD_API(commands_api_interface, "fsctl", "control messages", ctl_function, CTL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "help", "Show help for all the api commands", help_function, ""); 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 Mon May 26 22:42:30 2008 @@ -2119,7 +2119,6 @@ SWITCH_ADD_APP(app_interface, "send_display", "Send session a new display", "Send session a new display.", display_function, "<text>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "respond", "Send session respond", "Send a respond message to a session.", respond_function, "<respond_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "deflect", "Send call deflect", "Send a call deflect.", deflect_function, "<deflect_data>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "reject", "Send session reject (depricated)", "Send a respond message to a session.", respond_function, "<respond_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "queue_dtmf", "Queue dtmf to be sent", "Queue dtmf to be sent from a session", queue_dtmf_function, "<dtmf_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "send_dtmf", "Send dtmf to be sent", "Send dtmf to be sent from a session", send_dtmf_function, "<dtmf_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_hangup", SCHED_HANGUP_DESCR, SCHED_HANGUP_DESCR, sched_hangup_function, "[+]<time> [<cause>]", SAF_SUPPORT_NOMEDIA);

1 0

[commit] r8683 - in freeswitch/trunk: docs src/include
by Freeswitch SVN 27 May '08

27 May '08

Author: anthm Date: Mon May 26 22:30:37 2008 New Revision: 8683 Modified: freeswitch/trunk/docs/Doxygen.conf freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_core_event_hook.h freeswitch/trunk/src/include/switch_cpp.h Log: dox Modified: freeswitch/trunk/docs/Doxygen.conf ============================================================================== --- freeswitch/trunk/docs/Doxygen.conf (original) +++ freeswitch/trunk/docs/Doxygen.conf Mon May 26 22:30:37 2008 @@ -3,8 +3,8 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = FreeSwitch -PROJECT_NUMBER = +PROJECT_NAME = FreeSWITCH +PROJECT_NUMBER = 1.0.0 OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -30,7 +30,7 @@ SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO +DETAILS_AT_TOP = YES INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon May 26 22:30:37 2008 @@ -395,59 +395,70 @@ */ SWITCH_DECLARE(unsigned int) switch_core_session_running(_In_ switch_core_session_t *session); +SWITCH_DECLARE(void *) switch_core_perform_permanent_alloc(_In_ switch_size_t memory, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); + /*! \brief Allocate memory from the main pool with no intention of returning it - \param memory the number of bytes to allocate + \param _memory the number of bytes to allocate \return a void pointer to the allocated memory \note this memory never goes out of scope until the core is destroyed */ -SWITCH_DECLARE(void *) switch_core_perform_permanent_alloc(_In_ switch_size_t memory, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); -#define switch_core_permanent_alloc(m) switch_core_perform_permanent_alloc(m, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_core_permanent_alloc(_memory) switch_core_perform_permanent_alloc(_memory, __FILE__, __SWITCH_FUNC__, __LINE__) + + +SWITCH_DECLARE(void *) switch_core_perform_alloc(_In_ switch_memory_pool_t *pool, _In_ switch_size_t memory, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); /*! \brief Allocate memory directly from a memory pool - \param pool the memory pool to allocate from - \param memory the number of bytes to allocate + \param _pool the memory pool to allocate from + \param _mem the number of bytes to allocate \return a void pointer to the allocated memory */ -SWITCH_DECLARE(void *) switch_core_perform_alloc(_In_ switch_memory_pool_t *pool, _In_ switch_size_t memory, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); -#define switch_core_alloc(p, m) switch_core_perform_alloc(p, m, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_core_alloc(_pool, _mem) switch_core_perform_alloc(_pool, _mem, __FILE__, __SWITCH_FUNC__, __LINE__) + +_Ret_ SWITCH_DECLARE(void *) switch_core_perform_session_alloc(_In_ switch_core_session_t *session, _In_ switch_size_t memory, const char *file, const char *func, int line); + /*! \brief Allocate memory from a session's pool - \param session the session to request memory from - \param memory the amount of memory to allocate + \param _session the session to request memory from + \param _memory the amount of memory to allocate \return a void pointer to the newly allocated memory \note the memory will be in scope as long as the session exists */ -_Ret_ SWITCH_DECLARE(void *) switch_core_perform_session_alloc(_In_ switch_core_session_t *session, _In_ switch_size_t memory, const char *file, const char *func, int line); -#define switch_core_session_alloc(s, m) switch_core_perform_session_alloc(s, m, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_core_session_alloc(_session, _memory) switch_core_perform_session_alloc(_session, _memory, __FILE__, __SWITCH_FUNC__, __LINE__) + +SWITCH_DECLARE(char *) switch_core_perform_permanent_strdup(_In_z_ const char *todup, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); + /*! \brief Copy a string using permanent memory allocation - \param todup the string to duplicate + \param _todup the string to duplicate \return a pointer to the newly duplicated string */ -SWITCH_DECLARE(char *) switch_core_perform_permanent_strdup(_In_z_ const char *todup, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); -#define switch_core_permanent_strdup(t) switch_core_perform_permanent_strdup(t, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_core_permanent_strdup(_todup) switch_core_perform_permanent_strdup(_todup, __FILE__, __SWITCH_FUNC__, __LINE__) + + +SWITCH_DECLARE(char *) switch_core_perform_session_strdup(_In_ switch_core_session_t *session, _In_z_ const char *todup, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); /*! \brief Copy a string using memory allocation from a session's pool - \param session a session to use for allocation - \param todup the string to duplicate + \param _session a session to use for allocation + \param _todup the string to duplicate \return a pointer to the newly duplicated string */ -SWITCH_DECLARE(char *) switch_core_perform_session_strdup(_In_ switch_core_session_t *session, _In_z_ const char *todup, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); -#define switch_core_session_strdup(s, t) switch_core_perform_session_strdup(s, t, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_core_session_strdup(_session, _todup) switch_core_perform_session_strdup(_session, _todup, __FILE__, __SWITCH_FUNC__, __LINE__) + + +SWITCH_DECLARE(char *) switch_core_perform_strdup(_In_ switch_memory_pool_t *pool, _In_z_ const char *todup, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); /*! \brief Copy a string using memory allocation from a given pool - \param pool the pool to use for allocation - \param todup the string to duplicate + \param _pool the pool to use for allocation + \param _todup the string to duplicate \return a pointer to the newly duplicated string */ -SWITCH_DECLARE(char *) switch_core_perform_strdup(_In_ switch_memory_pool_t *pool, _In_z_ const char *todup, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); -#define switch_core_strdup(p, t) switch_core_perform_strdup(p, t, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_core_strdup(_pool, _todup) switch_core_perform_strdup(_pool, _todup, __FILE__, __SWITCH_FUNC__, __LINE__) /*! \brief printf-style style printing routine. The data is output to a string allocated from the session @@ -1198,17 +1209,7 @@ ///\defgroup Media File Functions ///\ingroup core1 ///\{ -/*! - \brief Open a media file using file format modules - \param fh a file handle to use - \param file_path the path to the file - \param channels the number of channels - \param rate the sample rate - \param flags read/write flags - \param pool the pool to use (NULL for new pool) - \return SWITCH_STATUS_SUCCESS if the file is opened - \note the loadable module used is chosen based on the file extension -*/ + SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, const char *func, int line, _In_ switch_file_handle_t *fh, _In_z_ const char *file_path, @@ -1216,6 +1217,18 @@ _In_ uint32_t rate, _In_ unsigned int flags, _In_opt_ switch_memory_pool_t *pool); + +/*! + \brief Open a media file using file format modules + \param _fh a file handle to use + \param _file_path the path to the file + \param _channels the number of channels + \param _rate the sample rate + \param _flags read/write flags + \param _pool the pool to use (NULL for new pool) + \return SWITCH_STATUS_SUCCESS if the file is opened + \note the loadable module used is chosen based on the file extension +*/ #define switch_core_file_open(_fh, _file_path, _channels, _rate, _flags, _pool) \ switch_core_perform_file_open(__FILE__, __SWITCH_FUNC__, __LINE__, _fh, _file_path, _channels, _rate, _flags, _pool) Modified: freeswitch/trunk/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_event_hook.h (original) +++ freeswitch/trunk/src/include/switch_core_event_hook.h Mon May 26 22:30:37 2008 @@ -238,7 +238,7 @@ NEW_HOOK_DECL_REM_P(send_dtmf); NEW_HOOK_DECL_REM_P(recv_dtmf); NEW_HOOK_DECL_REM_P(resurrect_session); -///\} + SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon May 26 22:30:37 2008 @@ -217,7 +217,7 @@ * \param a_leg_session - the session where the call is originating from * and also the session in which _this_ session was * created - * \param dest - a string representing destination, eg, sofia/mydomain.com/foo@bar.com + * \param dest - a string representing destination, eg, sofia/mydomain.com/foo\@bar.com * \param timeout - time to wait for call to be answered * \return an int status code indicating success or failure *

1 0

[commit] r8682 - freeswitch/trunk/libs/voipcodecs/src
by Freeswitch SVN 27 May '08

27 May '08

Author: anthm Date: Mon May 26 22:28:17 2008 New Revision: 8682 Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c Log: oops Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c Mon May 26 22:28:17 2008 @@ -43,10 +43,10 @@ #if defined(HAVE_MATH_H) #include <math.h> #endif -#if (_MSC_VER = 1400) /* fix for broken header files with msvc 2005*/ -#if !defined (_M_IA64) && !defined (_M_AMD64) -#undef logf -#define logf(x) ((float)log((double)(x))) +#if (_MSC_VER == 1400) /* fix for broken header files with msvc 2005*/ +#if !defined (_M_IA64) && !defined (_M_AMD64) +#undef logf +#define logf(x) ((float)log((double)(x))) #endif // !defined (_M_IA64) && !defined (_M_AMD64) #endif

1 0

[commit] r8681 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_rsa
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Mon May 26 21:52:09 2008 New Revision: 8681 Removed: freeswitch/trunk/src/mod/languages/mod_spidermonkey_rsa/ Log: this is not ready, and unlikely to get updated, removed at request of author

1 0

[commit] r8680 - freeswitch/trunk/libs/voipcodecs/src
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Mon May 26 21:42:45 2008 New Revision: 8680 Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c Log: fix for broken msvc 2005 math.h Modified: freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c (original) +++ freeswitch/trunk/libs/voipcodecs/src/lpc10_decode.c Mon May 26 21:42:45 2008 @@ -43,6 +43,13 @@ #if defined(HAVE_MATH_H) #include <math.h> #endif +#if (_MSC_VER = 1400) /* fix for broken header files with msvc 2005*/ +#if !defined (_M_IA64) && !defined (_M_AMD64) +#undef logf +#define logf(x) ((float)log((double)(x))) +#endif // !defined (_M_IA64) && !defined (_M_AMD64) +#endif + #include <memory.h> #include "voipcodecs/telephony.h"

1 0

[commit] r8679 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Mon May 26 21:36:56 2008 New Revision: 8679 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: sync to sofia darcs trunk Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Mon May 26 21:36:56 2008 @@ -970,7 +970,7 @@ return 0; } -#define safe_free(it) if (it) { free(it); it = NULL; } + /** Internal deinitialization */ static void _su_home_deinit(su_home_t *home) @@ -1006,17 +1006,16 @@ } else if (su_is_preloaded(b, b->sub_nodes[i].sua_data)) continue; - safefree(b->sub_nodes[i].sua_data); } } if (b->sub_preload && !b->sub_preauto) - safe_free(b->sub_preload); + free(b->sub_preload); if (b->sub_stats) - safe_free(b->sub_stats); + free(b->sub_stats); if (!b->sub_auto) - safe_free(b); + free(b); home->suh_blocks = NULL;

1 0

[commit] r8678 - freeswitch/trunk/src/mod/say/mod_say_de
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Mon May 26 20:36:09 2008 New Revision: 8678 Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c Log: Corrected cardinal and ordinal number reading in German (MODAPP-97) Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.c Mon May 26 20:36:09 2008 @@ -39,6 +39,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Michael B. Murdock <mike(a)mmurdock.org> + * Daniel Swarbrick <daniel.swarbrick(a)gmail.com> * * mod_say_de.c -- Say for German * @@ -101,11 +102,21 @@ if (b) { if (b > 1) { - say_file("digits/%d0.wav", b); + say_file("digits/%d.wav", c); + say_file("currency/and.wav"); + if (method == SSM_COUNTED) { + say_file("digits/h-%d0.wav", b); + } else { + say_file("digits/%d0.wav", b); + } } else { - say_file("digits/%d%d.wav", b, c); - c = 0; + if (method == SSM_COUNTED) { + say_file("digits/h-%d%d.wav", b, c); + } else { + say_file("digits/%d%d.wav", b, c); + } } + c = 0; } if (c) { @@ -395,14 +406,13 @@ } say_num(hour, SSM_PRONOUNCED); + say_file("time/oclock.wav"); if (tm.tm_min > 9) { say_num(tm.tm_min, SSM_PRONOUNCED); } else if (tm.tm_min) { say_file("time/oh.wav"); say_num(tm.tm_min, SSM_PRONOUNCED); - } else { - say_file("time/oclock.wav"); } say_file("time/%s.wav", pm ? "p-m" : "a-m");

1 0

[commit] r8677 - freeswitch/trunk/libs/sofia-sip/tests
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Mon May 26 20:18:50 2008 New Revision: 8677 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_call_hold.c Log: Mon May 26 19:33:00 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_call_hold.c: fixed timing problem in test 7.6.1 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_call_hold.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_call_hold.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_call_hold.c Mon May 26 20:18:50 2008 @@ -608,7 +608,15 @@ TEST(e->data->e_status, 100); TEST_1(sip = sip_object(e->data->e_msg)); TEST_1(sip->sip_retry_after); + +#if 1 + if (e->next) { + free_events_in_list(ctx, b->events); + free_events_in_list(ctx, a->events); + goto passed; /* XXX - once in a while B *does* retry */ + } TEST_1(!e->next); +#endif free_events_in_list(ctx, b->events); TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_i_ack); @@ -664,6 +672,8 @@ TEST_1(!e->next); free_events_in_list(ctx, b->events); + passed: + if (print_headings) printf("TEST NUA-7.6.3: PASSED\n");

1 0

[commit] r8676 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nth
by Freeswitch SVN 27 May '08

27 May '08

Author: mikej Date: Mon May 26 20:18:31 2008 New Revision: 8676 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c Log: Mon May 26 14:57:28 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nth: gracefully downgrade to tcp only if no tls certificates are available Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon May 26 20:18:31 2008 @@ -1 +1 @@ -Mon May 26 20:18:02 EDT 2008 +Mon May 26 20:18:27 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_client.c Mon May 26 20:18:31 2008 @@ -440,6 +440,8 @@ "tcp", "tls", NULL }; +static char const *const he_no_tls_tports[] = { "tcp", NULL }; + static tp_stack_class_t http_client_class[1] = { { sizeof(http_client_class), he_recv_message, @@ -456,7 +458,11 @@ if (!he->he_tports) return -1; - return tport_tbind(he->he_tports, he_name, he_tports, + if (tport_tbind(he->he_tports, he_name, he_tports, + TPTAG_SERVER(0), TAG_NEXT(tags)) >= 0) + return 0; + + return tport_tbind(he->he_tports, he_name, he_no_tls_tports, TPTAG_SERVER(0), TAG_NEXT(tags)); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/nth_server.c Mon May 26 20:18:31 2008 @@ -688,6 +688,8 @@ "tcp", "tls", NULL }; +static char const * const http_no_tls_tports[] = { "tcp", NULL }; + static tp_stack_class_t nth_server_class[1] = {{ sizeof(nth_server_class), @@ -738,6 +740,8 @@ srv->srv_max_bodylen = 1 << 30; /* 1 GB */ if (tport_tbind(srv->srv_tports, tpn, http_tports, + TAG_END()) >= 0 || + tport_tbind(srv->srv_tports, tpn, http_no_tls_tports, TAG_END()) >= 0) { srv->srv_root = root; srv->srv_mclass = mclass ? mclass : http_default_mclass();

1 0