- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11763 - freeswitch/trunk/libs/sofia-sip/tests
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 09:57:41 2009 New Revision: 11763 Log: Mon Dec 15 10:43:17 CST 2008 Pekka Pessi <first.last(a)nokia.com> * test_nua.c: made usage static Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nua.c Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_nua.c Wed Feb 11 09:57:41 2009 @@ -100,7 +100,7 @@ " -k do not exit after first error\n" ; -void usage(int exitcode) +static void usage(int exitcode) { fprintf(stderr, "usage: %s OPTIONS\n where OPTIONS are\n%s", name, options_usage);

1 0

[commit] r11762 - freeswitch/trunk/libs/sofia-sip
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 09:57:13 2009 New Revision: 11762 Log: Mon Dec 15 10:54:36 CST 2008 Pekka Pessi <first.last(a)nokia.com> * RELEASE: mention removed globals Modified: freeswitch/trunk/libs/sofia-sip/RELEASE Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Wed Feb 11 09:57:13 2009 @@ -30,6 +30,16 @@ work against an older library. The ABI has been tested with the nua module unit test (test_nua) built against original 1.12.0 release. +Removed globals which should have been static in first place: + - su_t64_to_time() + - mutex_trylocker() + - su_port_set_system_preferences() + - t_null_next(), t_null_move(), t_null_dup(), t_null_copy(), t_null_find() + - t_skip_next(), t_skip_move(), t_skip_len(), t_skip_dup(), t_skip_filter() + - t_next_next(), t_next_move(), t_next_len(), t_next_dup(), t_next_filter() + - t_filter_with(), t_any_filter() + - sres_record_class() + libsofia-sip-ua-glib: - No ABI/API changes, compatible with 1.12.0. Note, libsofia-sip-ua-glib interface is not considered stable and may change in a future 1.12.x

1 0

[commit] r11761 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv: . sofia-resolv
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 09:56:43 2009 New Revision: 11761 Log: Mon Dec 15 10:50:21 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sofia-resolv/sres_cache.h: added prototype for sres_cache_clean() Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h Wed Feb 11 09:56:43 2009 @@ -90,6 +90,9 @@ /** Free and zero one record. */ SRESPUBFUN void sres_cache_free_one(sres_cache_t *, sres_record_t *answer); +/** Remove old records from cache. */ +SRESPUBFUN void sres_cache_clean(sres_cache_t *cache, time_t now); + /** Allocate a cache record */ SRESPUBFUN sres_record_t *sres_cache_alloc_record(sres_cache_t *cache, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c Wed Feb 11 09:56:43 2009 @@ -437,7 +437,13 @@ return result; } -/** Remove entries from cache. */ +/** Remove old records from cache. + * + * Remove entries older than @a now from the cache. + * + * @param cache pointer to DNS cache object + * @param now remove older than this time + */ void sres_cache_clean(sres_cache_t *cache, time_t now) { size_t i;

1 0

[commit] r11760 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 09:56:04 2009 New Revision: 11760 Log: Mon Dec 15 10:33:40 CST 2008 Pekka Pessi <first.last(a)nokia.com> * sofia-sip/heap.h: added protype for su_smoothsort() Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/heap.h Wed Feb 11 09:56:04 2009 @@ -319,9 +319,6 @@ type *_heap = h; type _swap = _heap[a]; \ set(_heap, a, _heap[b]); set(_heap, b, _swap); \ } \ -void su_smoothsort(void *base, size_t r0, size_t N, \ - int (*less)(void *base, size_t a, size_t b), \ - void (*swap)(void *base, size_t a, size_t b)); \ scope void prefix##sort(heaptype h) \ { \ struct prefix##priv { size_t _size, _used; type _heap[1];}; \ @@ -331,4 +328,14 @@ } \ extern int const prefix##dummy_heap +#include <sofia-sip/su_types.h> + +SOFIA_BEGIN_DECLS + +SOFIAPUBFUN void su_smoothsort(void *base, size_t r0, size_t N, + int (*less)(void *base, size_t a, size_t b), + void (*swap)(void *base, size_t a, size_t b)); + +SOFIA_END_DECLS + #endif /** !defined(SOFIA_SIP_HEAP_H) */

1 0

[commit] r11759 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 09:55:22 2009 New Revision: 11759 Log: Mon Dec 15 10:33:16 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su_tag.h: added prototype for tl_vllen() Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h Wed Feb 11 09:55:22 2009 @@ -148,6 +148,7 @@ /* Low-level taglist manipulation functions */ SOFIAPUBFUN size_t tl_len(tagi_t const lst[]); +SOFIAPUBFUN size_t tl_vllen(tag_type_t tag, tag_value_t value, va_list ap); SOFIAPUBFUN size_t tl_xtra(tagi_t const lst[], size_t offset); SOFIAPUBFUN tagi_t *tl_next(tagi_t const *lst); SOFIAPUBFUN tagi_t *tl_move(tagi_t *dst, tagi_t const src[]);

1 0

[commit] r11758 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Wed Feb 11 09:54:48 2009 New Revision: 11758 Log: Mon Dec 15 10:32:55 CST 2008 Pekka Pessi <first.last(a)nokia.com> * su_tag_class.h: added prototypes for tag functions Protypes for t_filter(), t_null_filter(), t_end_filter(), t_socket_snprintf(), t_socket_ref_set() have been missing. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_class.h Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_class.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_class.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag_class.h Wed Feb 11 09:54:48 2009 @@ -97,6 +97,13 @@ SOFIAPUBVAR tag_class_t ref_tag_class[]; +SOFIAPUBFUN tagi_t *t_filter(tagi_t *, tagi_t const [], + tagi_t const *, void **); +SOFIAPUBFUN tagi_t *t_null_filter(tagi_t *dst, tagi_t const filter[], + tagi_t const *src, void **bb); +SOFIAPUBFUN tagi_t *t_end_filter(tagi_t *, tagi_t const [], + tagi_t const *, void **); + SOFIAPUBFUN int t_ptr_snprintf(tagi_t const *t, char b[], size_t size); SOFIAPUBFUN int t_ptr_ref_set(tag_type_t tt, void *ref, tagi_t const value[]); SOFIAPUBFUN int t_ptr_scan(tag_type_t, su_home_t *, char const *, @@ -117,6 +124,9 @@ SOFIAPUBFUN int t_uint_scan(tag_type_t, su_home_t *, char const *, tag_value_t *return_value); +SOFIAPUBFUN int t_socket_snprintf(tagi_t const *t, char b[], size_t size); +SOFIAPUBFUN int t_socket_ref_set(tag_type_t tt, void *ref, tagi_t const value[]); + SOFIAPUBFUN tagi_t *t_str_dup(tagi_t *dst, tagi_t const *src, void **b); SOFIAPUBFUN size_t t_str_xtra(tagi_t const *t, size_t offset); SOFIAPUBFUN int t_str_snprintf(tagi_t const *t, char b[], size_t size);

1 0

[commit] r11757 - freeswitch/trunk/libs/win32/sqlite
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 09:20:27 2009 New Revision: 11757 Log: FSCORE-292 Modified: freeswitch/trunk/libs/win32/sqlite/sqlite.2008.vcproj freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj Modified: freeswitch/trunk/libs/win32/sqlite/sqlite.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/sqlite/sqlite.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/sqlite/sqlite.2008.vcproj Wed Feb 11 09:20:27 2009 @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG;THREADSAFE=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -106,7 +106,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="0" @@ -169,7 +169,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG;THREADSAFE=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -247,7 +247,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="0" Modified: freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj (original) +++ freeswitch/trunk/libs/win32/sqlite/sqlite.vcproj Wed Feb 11 09:20:27 2009 @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG;THREADSAFE=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -106,7 +106,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="0" @@ -170,7 +170,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG;THREADSAFE=1" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -250,7 +250,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;THREADSAFE=1" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="0"

1 0

[commit] r11756 - freeswitch/trunk/libs/sqlite/src
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: anthm Date: Wed Feb 11 09:15:44 2009 New Revision: 11756 Log: FSCORE-292 Modified: freeswitch/trunk/libs/sqlite/src/os_win.c Modified: freeswitch/trunk/libs/sqlite/src/os_win.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/os_win.c (original) +++ freeswitch/trunk/libs/sqlite/src/os_win.c Wed Feb 11 09:15:44 2009 @@ -25,9 +25,9 @@ /* ** Macros used to determine whether or not to use threads. */ -#if defined(THREADSAFE) && THREADSAFE +//#if defined(THREADSAFE) && THREADSAFE # define SQLITE_W32_THREADS 1 -#endif +//#endif /* ** Include code that is common to all os_*.c files @@ -1616,7 +1616,7 @@ inMutex++; } void sqlite3WinLeaveMutex(){ - assert( inMutex ); + //assert( inMutex ); inMutex--; #ifdef SQLITE_W32_THREADS assert( mutexOwner==GetCurrentThreadId() );

1 0

[commit] r11755 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: mikej Date: Wed Feb 11 09:10:27 2009 New Revision: 11755 Log: move PFLAGS to be array based Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Feb 11 09:10:27 2009 @@ -141,38 +141,40 @@ } MFLAGS; typedef enum { - PFLAG_AUTH_CALLS = (1 << 0), - PFLAG_BLIND_REG = (1 << 1), - PFLAG_AUTH_ALL = (1 << 2), - PFLAG_FULL_ID = (1 << 3), - PFLAG_MULTIREG_CONTACT = (1 << 4), - PFLAG_PASS_RFC2833 = (1 << 5), - PFLAG_DISABLE_TRANSCODING = (1 << 6), - PFLAG_REWRITE_TIMESTAMPS = (1 << 7), - PFLAG_RUNNING = (1 << 8), - PFLAG_RESPAWN = (1 << 9), - PFLAG_GREEDY = (1 << 10), - PFLAG_MULTIREG = (1 << 11), - PFLAG_SUPPRESS_CNG = (1 << 12), - PFLAG_TLS = (1 << 13), - PFLAG_CHECKUSER = (1 << 14), - PFLAG_SECURE = (1 << 15), - PFLAG_BLIND_AUTH = (1 << 16), - PFLAG_WORKER_RUNNING = (1 << 17), - PFLAG_UNREG_OPTIONS_FAIL = (1 << 18), - PFLAG_DISABLE_TIMER = (1 << 19), - PFLAG_DISABLE_100REL = (1 << 20), - PFLAG_AGGRESSIVE_NAT_DETECTION = (1 << 21), - PFLAG_RECIEVED_IN_NAT_REG_CONTACT = (1 << 22), - PFLAG_3PCC = (1 << 23), - PFLAG_DISABLE_RTP_AUTOADJ = (1 << 24), - PFLAG_DISABLE_SRTP_AUTH = (1 << 25), - PFLAG_FUNNY_STUN = (1 << 26), - PFLAG_STUN_ENABLED = (1 << 27), - PFLAG_STUN_AUTO_DISABLE = (1 << 28), - PFLAG_3PCC_PROXY = (1 << 29), - PFLAG_CALLID_AS_UUID = (1 << 30), - PFLAG_UUID_AS_CALLID = (1 << 31) + PFLAG_AUTH_CALLS, + PFLAG_BLIND_REG, + PFLAG_AUTH_ALL, + PFLAG_FULL_ID, + PFLAG_MULTIREG_CONTACT, + PFLAG_PASS_RFC2833, + PFLAG_DISABLE_TRANSCODING, + PFLAG_REWRITE_TIMESTAMPS, + PFLAG_RUNNING, + PFLAG_RESPAWN, + PFLAG_GREEDY, + PFLAG_MULTIREG, + PFLAG_SUPPRESS_CNG, + PFLAG_TLS, + PFLAG_CHECKUSER, + PFLAG_SECURE, + PFLAG_BLIND_AUTH, + PFLAG_WORKER_RUNNING, + PFLAG_UNREG_OPTIONS_FAIL, + PFLAG_DISABLE_TIMER, + PFLAG_DISABLE_100REL, + PFLAG_AGGRESSIVE_NAT_DETECTION, + PFLAG_RECIEVED_IN_NAT_REG_CONTACT, + PFLAG_3PCC, + PFLAG_DISABLE_RTP_AUTOADJ, + PFLAG_DISABLE_SRTP_AUTH, + PFLAG_FUNNY_STUN, + PFLAG_STUN_ENABLED, + PFLAG_STUN_AUTO_DISABLE, + PFLAG_3PCC_PROXY, + PFLAG_CALLID_AS_UUID, + PFLAG_UUID_AS_CALLID, + + PFLAG_MAX } PFLAGS; typedef enum { @@ -398,7 +400,7 @@ int running; int dtmf_duration; unsigned int flags; - unsigned int pflags; + uint8_t pflags[PFLAG_MAX]; unsigned int mflags; unsigned int ndlb; uint32_t max_calls; @@ -585,15 +587,15 @@ AUTH_STALE, } auth_res_t; -#define sofia_test_pflag(obj, flag) ((obj)->pflags & flag) -#define sofia_set_pflag(obj, flag) (obj)->pflags |= (flag) + +#define sofia_test_pflag(obj, flag) ((obj)->pflags[flag] ? 1 : 0) +#define sofia_set_pflag(obj, flag) (obj)->pflags[flag] = 1 #define sofia_set_pflag_locked(obj, flag) assert(obj->flag_mutex != NULL);\ switch_mutex_lock(obj->flag_mutex);\ -(obj)->pflags |= (flag);\ +(obj)->pflags[flag] = 1;\ switch_mutex_unlock(obj->flag_mutex); -#define sofia_clear_pflag_locked(obj, flag) switch_mutex_lock(obj->flag_mutex); (obj)->pflags &= ~(flag); switch_mutex_unlock(obj->flag_mutex); -#define sofia_clear_pflag(obj, flag) (obj)->pflags &= ~(flag) -#define sofia_copy_pflags(dest, src, flags) (dest)->pflags &= ~(flags); (dest)->pflags |= ((src)->pflags & (flags)) +#define sofia_clear_pflag_locked(obj, flag) switch_mutex_lock(obj->flag_mutex); (obj)->pflags[flag] = 0; switch_mutex_unlock(obj->flag_mutex); +#define sofia_clear_pflag(obj, flag) (obj)->pflags[flag] = 0 #define sofia_set_flag_locked(obj, flag) switch_set_flag_locked(obj, flag) #define sofia_set_flag(obj, flag) switch_set_flag(obj, flag)

1 0

[commit] r11754 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: anthm Date: Wed Feb 11 08:56:22 2009 New Revision: 11754 Log: FSCORE-294 Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Feb 11 08:56:22 2009 @@ -102,12 +102,12 @@ uint8_t progress; uint8_t return_ring_ready; uint8_t monitor_early_media_ring; - uint8_t monitor_early_media_ring_total; - uint8_t monitor_early_media_ring_count; uint8_t monitor_early_media_fail; uint8_t gen_ringback; uint8_t ignore_early_media; uint8_t ignore_ring_ready; + int monitor_early_media_ring_count; + int monitor_early_media_ring_total; } originate_global_t; @@ -302,9 +302,11 @@ uint8_t rval = 0; switch_channel_t *caller_channel = NULL; int pindex = -1; + char bug_key[256] = ""; + oglobals->hups = 0; oglobals->idx = IDX_NADA; - char bug_key[256] = ""; + if (oglobals->session) { caller_channel = switch_core_session_get_channel(oglobals->session);

1 0