- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7108 - freeswitch/trunk/libs/js
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: stkn Date: Sun Jan 6 13:03:32 2008 New Revision: 7108 Modified: freeswitch/trunk/libs/js/configure.ac Log: Fix pthread configure check for js cli tool Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Sun Jan 6 13:03:32 2008 @@ -178,11 +178,13 @@ AC_CACHE_CHECK([whether to build with NSPR], [ac_cv_with_nspr], [ac_cv_with_nspr=no]) if test ".$ac_cv_with_nspr" = ".yes"; then sinclude(nsprpub/config/nspr.m4) + + AC_CHECK_LIB(pthread, pthread_create, [CLI_LIBS="$CLI_LIBS -lpthread"]) + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr -Insprpub/pr/include" LDFLAGS="$LDFLAGS -L./nsprpub/dist/lib" LIBS="$LIBS -lnspr4" LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib" - AC_CHECK_LIB(pthread, pthread_create, [CLI_LIBS="$CLI_LIBS -lpthread"]) fi AC_DEFUN([AX_COMPILER_VENDOR],

1 0

[commit] r7107 - freeswitch/trunk/libs/win32/sqlite
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: mikej Date: Sat Jan 5 21:17:20 2008 New Revision: 7107 Modified: freeswitch/trunk/libs/win32/sqlite/sqlite.2008.vcproj Log: no need to build files that are not used. 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 Sat Jan 5 21:17:20 2008 @@ -381,6 +381,38 @@ <File RelativePath="..\..\sqlite\src\os_unix.c" > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\sqlite\src\os_win.c"

1 0

[commit] r7106 - freeswitch/trunk/libs/sqlite
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: anthm Date: Sat Jan 5 20:11:21 2008 New Revision: 7106 Modified: freeswitch/trunk/libs/sqlite/.update Log: update Modified: freeswitch/trunk/libs/sqlite/.update ============================================================================== --- freeswitch/trunk/libs/sqlite/.update (original) +++ freeswitch/trunk/libs/sqlite/.update Sat Jan 5 20:11:21 2008 @@ -1 +1 @@ -Sat Jan 5 15:55:07 EST 2008 +Sat Jan 5 20:11:10 EST 2008

1 0

[commit] r7105 - in freeswitch/trunk: libs/sqlite/src src
by Freeswitch SVN 06 Jan '08

06 Jan '08

Author: anthm Date: Sat Jan 5 20:10:37 2008 New Revision: 7105 Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h freeswitch/trunk/libs/sqlite/src/util.c freeswitch/trunk/libs/sqlite/src/vdbefifo.c freeswitch/trunk/src/switch_core.c Log: BSD fixes, thanks jontow for the use of your box Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h ============================================================================== --- freeswitch/trunk/libs/sqlite/src/sqliteInt.h (original) +++ freeswitch/trunk/libs/sqlite/src/sqliteInt.h Sat Jan 5 20:10:37 2008 @@ -281,20 +281,26 @@ return z; } +static inline char *strndup_lite(const char *s, size_t n) +{ + char *dup = malloc(n+1); + assert(dup); + memcpy(dup, s, n); + *(dup+n) = '\0'; + return dup; +} #define ENTER_MALLOC 0 #define sqliteMalloc(x) zmalloc(x)//sqlite3Malloc(x,1) #define sqliteMallocRaw(x) malloc(x)//sqlite3MallocRaw(x,1) #define sqliteRealloc(x,y) realloc(x, y)//sqlite3Realloc(x,y) #define sqliteStrDup(x) strdup(x)//sqlite3StrDup(x) -#define sqliteStrNDup(x,y) sqlite3StrNDup(x,y) - +#define sqliteStrNDup(x,y) strndup_lite(x,y) //sqlite3StrNDup(x,y) #define sqliteReallocOrFree(x,y) sqlite3ReallocOrFree(x,y) #endif - -#define sqliteFree(x) if (x) { free((void *)x); x = NULL; } //sqlite3FreeX(x) +#define sqliteFree(x) if (x) { free((void *)x); x = NULL;} //sqlite3FreeX(x) #define sqliteAllocSize(x) sqlite3AllocSize(x) Modified: freeswitch/trunk/libs/sqlite/src/util.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/util.c (original) +++ freeswitch/trunk/libs/sqlite/src/util.c Sat Jan 5 20:10:37 2008 @@ -729,7 +729,7 @@ char *sqlite3StrNDup(const char *z, int n){ char *zNew; if( z==0 ) return 0; - zNew = sqliteMallocRaw(n+1); + zNew = sqlite3MallocRaw(n+1, 1); if( zNew ){ memcpy(zNew, z, n); zNew[n] = 0; Modified: freeswitch/trunk/libs/sqlite/src/vdbefifo.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/vdbefifo.c (original) +++ freeswitch/trunk/libs/sqlite/src/vdbefifo.c Sat Jan 5 20:10:37 2008 @@ -89,7 +89,7 @@ pFifo->pFirst = pPage->pNext; sqliteFree(pPage); if( pFifo->nEntry==0 ){ - assert( pFifo->pLast==pPage ); + //assert( pFifo->pLast==pPage ); pFifo->pLast = 0; }else{ assert( pFifo->pFirst!=0 ); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sat Jan 5 20:10:37 2008 @@ -705,10 +705,19 @@ { struct rlimit rlp; + /* + Setting the stack size on FreeBSD results in an instant crash. + + If anyone knows how to fix this, + feel free to submit a patch to http://jira.freeswitch.org + */ + +#ifndef __FreeBSD__ memset(&rlp, 0, sizeof(rlp)); rlp.rlim_cur = SWITCH_THREAD_STACKSIZE; rlp.rlim_max = SWITCH_THREAD_STACKSIZE; setrlimit(RLIMIT_STACK, &rlp); +#endif memset(&rlp, 0, sizeof(rlp)); rlp.rlim_cur = 999999;

1 0

[commit] r7104 - freeswitch/trunk/src
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 17:17:41 2008 New Revision: 7104 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: remove duplicate code Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sat Jan 5 17:17:41 2008 @@ -291,62 +291,6 @@ } - if (ringback_data) { - char *tmp_data = NULL; - - if (!switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(caller_channel, CF_ANSWERED)) { - switch_channel_pre_answer(caller_channel); - } - - switch_buffer_create_dynamic(&ringback.audio_buffer, 512, 1024, 0); - switch_buffer_set_loops(ringback.audio_buffer, -1); - - if (switch_is_file_path(ringback_data)) { - char *ext; - - if (strrchr(ringback_data, '.') || strstr(ringback_data, SWITCH_URL_SEPARATOR)) { - switch_core_session_set_read_codec(session, &write_codec); - } else { - ringback.asis++; - write_frame.codec = read_codec; - ext = read_codec->implementation->iananame; - tmp_data = switch_mprintf("%s.%s", ringback_data, ext); - ringback_data = tmp_data; - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback File [%s]\n", ringback_data); - - ringback.fhb.channels = read_codec->implementation->number_of_channels; - ringback.fhb.samplerate = read_codec->implementation->actual_samples_per_second; - if (switch_core_file_open(&ringback.fhb, - ringback_data, - read_codec->implementation->number_of_channels, - read_codec->implementation->actual_samples_per_second, - SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing File\n"); - switch_safe_free(tmp_data); - goto done; - } - ringback.fh = &ringback.fhb; - - - } else { - teletone_init_session(&ringback.ts, 0, teletone_handler, &ringback); - ringback.ts.rate = read_codec->implementation->actual_samples_per_second; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback Tone [%s]\n", ringback_data); - if (teletone_run(&ringback.ts, ringback_data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing Tone\n"); - teletone_destroy_session(&ringback.ts); - switch_buffer_destroy(&ringback.audio_buffer); - ringback_data = NULL; - } - } - switch_safe_free(tmp_data); - - } - - if ((read_codec = switch_core_session_get_read_codec(session)) && (ringback_data || !switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA))) { if (!(pass = (uint8_t) switch_test_flag(read_codec, SWITCH_CODEC_FLAG_PASSTHROUGH))) { if (switch_core_codec_init(&write_codec,

1 0

[commit] r7103 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 17:17:26 2008 New Revision: 7103 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Sat Jan 5 17:17:26 2008 @@ -75,7 +75,7 @@ SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel); SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state); -SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to); +SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, switch_bool_t pres, uint32_t to); SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, const char *file, const char *func, int line, switch_channel_state_t state); 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 Sat Jan 5 17:17:26 2008 @@ -1273,11 +1273,11 @@ if (l) { if (*l == '+') { l++; - if (l) { - limit = atoi(l); - if (limit < 0) { - limit = 0; - } + } + if (l) { + limit = atoi(l); + if (limit < 0) { + limit = 0; } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Jan 5 17:17:26 2008 @@ -252,11 +252,29 @@ cause = switch_channel_get_cause(channel); if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { + const char *buuid; + switch_core_session_t *bsession; + switch_channel_t *bchannel; + const char *lost_ext; if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); } switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); + + if ((buuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + if ((bsession = switch_core_session_locate(buuid))) { + bchannel = switch_core_session_get_channel(bsession); + if (switch_channel_test_flag(bchannel, CF_BROADCAST)) { + if ((lost_ext = switch_channel_get_variable(bchannel, "left_hanging_extension"))) { + switch_ivr_session_transfer(bsession, lost_ext, NULL, NULL); + } + switch_channel_stop_broadcast(bchannel); + } + switch_core_session_rwunlock(bsession); + } + } + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Jan 5 17:17:26 2008 @@ -1395,24 +1395,35 @@ } if (stream) { - switch_ivr_displace_session(tech_pvt->session, stream, 0, "rl"); + //switch_ivr_displace_session(tech_pvt->session, stream, 0, "rl"); + switch_ivr_broadcast(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), stream, SMF_ECHO_ALEG | SMF_LOOP); } } } else { if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { - const char *stream; + const char *uuid; + switch_core_session_t *b_session; + + //const char *stream; if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); } - if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { - stream = tech_pvt->profile->hold_music; - } + if ((uuid = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (b_session = switch_core_session_locate(uuid))) { + switch_channel_t *b_channel = switch_core_session_get_channel(b_session); + switch_channel_stop_broadcast(b_channel); + switch_channel_wait_for_flag(b_channel, CF_BROADCAST, SWITCH_FALSE, 2000); + switch_core_session_rwunlock(b_session); + } - if (stream) { - switch_ivr_stop_displace_session(tech_pvt->session, stream); - } + //if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { + //stream = tech_pvt->profile->hold_music; + //} + + //if (stream) { + //switch_ivr_stop_displace_session(tech_pvt->session, stream); + //} switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Jan 5 17:17:26 2008 @@ -550,14 +550,24 @@ } } -SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to) +SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, switch_bool_t pres, uint32_t to) { if (to) { to++; } - while(!switch_test_flag(channel, want_flag)) { + for(;;) { + if (pres) { + if (switch_test_flag(channel, want_flag)) { + break; + } + } else { + if (!switch_test_flag(channel, want_flag)) { + break; + } + } + switch_yield(1000); if (to && !--to) { return SWITCH_STATUS_TIMEOUT; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sat Jan 5 17:17:26 2008 @@ -222,7 +222,6 @@ end: switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); - switch_channel_stop_broadcast(chan_b); switch_core_session_reset(session_a); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a));

1 0

[commit] r7102 - freeswitch/trunk/src
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 16:47:24 2008 New Revision: 7102 Modified: freeswitch/trunk/src/switch_utils.c Log: update Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Sat Jan 5 16:47:24 2008 @@ -70,7 +70,7 @@ switch_size_t total = 0; p = buf; - while (total + sizeof(c) < len && (cur = read(fd, &c, sizeof(c))) > 0) { + while (total + 2 < len && (cur = read(fd, &c, 1)) == 1) { total += cur; *p++ = c; if (c == '\r' || c == '\n') { @@ -79,6 +79,7 @@ } *p++ = '\0'; + assert(total < len); return total; }

1 0

[commit] r7101 - in freeswitch/trunk/libs/sqlite: . src
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 15:55:36 2008 New Revision: 7101 Modified: freeswitch/trunk/libs/sqlite/.update freeswitch/trunk/libs/sqlite/src/sqliteInt.h Log: update Modified: freeswitch/trunk/libs/sqlite/.update ============================================================================== --- freeswitch/trunk/libs/sqlite/.update (original) +++ freeswitch/trunk/libs/sqlite/.update Sat Jan 5 15:55:36 2008 @@ -1 +1 @@ -Sat Jan 5 12:23:10 EST 2008 +Sat Jan 5 15:55:07 EST 2008 Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h ============================================================================== --- freeswitch/trunk/libs/sqlite/src/sqliteInt.h (original) +++ freeswitch/trunk/libs/sqlite/src/sqliteInt.h Sat Jan 5 15:55:36 2008 @@ -15,7 +15,7 @@ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ -#define _GNU_SOURCE + /* ** Extra interface definitions for those who need them */ @@ -287,11 +287,8 @@ #define sqliteMallocRaw(x) malloc(x)//sqlite3MallocRaw(x,1) #define sqliteRealloc(x,y) realloc(x, y)//sqlite3Realloc(x,y) #define sqliteStrDup(x) strdup(x)//sqlite3StrDup(x) -#ifdef _MSC_VER #define sqliteStrNDup(x,y) sqlite3StrNDup(x,y) -#else -#define sqliteStrNDup(x,y) strndup(x, y)//sqlite3StrNDup(x,y) -#endif + #define sqliteReallocOrFree(x,y) sqlite3ReallocOrFree(x,y) #endif

1 0

[commit] r7100 - in freeswitch/trunk/src: . include mod/applications/mod_fifo
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 15:44:54 2008 New Revision: 7100 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_bridge.c Log: add funcs Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Sat Jan 5 15:44:54 2008 @@ -75,6 +75,7 @@ SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel); SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state); +SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to); SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, const char *file, const char *func, int line, switch_channel_state_t state); @@ -469,6 +470,8 @@ SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile, const char *prefix); SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *channel); +#define switch_channel_stop_broadcast(_channel) switch_channel_set_flag(_channel, CF_BREAK | CF_STOP_BROADCAST) + /** @} */ SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sat Jan 5 15:44:54 2008 @@ -414,8 +414,7 @@ if (switch_channel_test_flag(other_channel, CF_TAGGED)) { switch_channel_clear_flag(other_channel, CF_CONTROLLED); - switch_channel_set_flag(other_channel, CF_STOP_BROADCAST); - switch_channel_set_flag(other_channel, CF_BREAK); + switch_channel_stop_broadcast(other_channel); switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); while (switch_channel_test_flag(other_channel, CF_TAGGED)) { status = switch_core_session_read_frame(session, &read_frame, -1, 0); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Jan 5 15:44:54 2008 @@ -550,6 +550,23 @@ } } +SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to) +{ + + if (to) { + to++; + } + + while(!switch_test_flag(channel, want_flag)) { + switch_yield(1000); + if (to && !--to) { + return SWITCH_STATUS_TIMEOUT; + } + } + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_DECLARE(void) switch_channel_set_flag(switch_channel_t *channel, switch_channel_flag_t flags) { switch_assert(channel != NULL); @@ -1223,8 +1240,7 @@ switch_mutex_unlock(channel->profile_mutex); } - switch_set_flag(channel, CF_BREAK); - switch_set_flag(channel, CF_STOP_BROADCAST); + switch_channel_stop_broadcast(channel); if (channel->state < CS_HANGUP) { switch_event_t *event; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sat Jan 5 15:44:54 2008 @@ -222,8 +222,7 @@ end: switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); - switch_channel_set_flag(chan_b, CF_STOP_BROADCAST); - switch_channel_set_flag(chan_b, CF_BREAK); + switch_channel_stop_broadcast(chan_b); switch_core_session_reset(session_a); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a));

1 0

[commit] r7099 - in freeswitch/trunk/src: . include mod/applications/mod_fifo
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 12:32:13 2008 New Revision: 7099 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Jan 5 12:32:13 2008 @@ -629,6 +629,7 @@ CF_EVENT_LOCK = (1 << 23) - Don't parse events CF_RESET = (1 << 24) - Tell extension parser to reset CF_ORIGINATING = (1 << 25) - Channel is originating +CF_STOP_BROADCAST = (1 << 26) - Signal to stop broadcast </pre> */ @@ -658,7 +659,8 @@ CF_VIDEO = (1 << 22), CF_EVENT_LOCK = (1 << 23), CF_RESET = (1 << 24), - CF_ORIGINATING = (1 << 25) + CF_ORIGINATING = (1 << 25), + CF_STOP_BROADCAST = (1 << 26), } switch_channel_flag_t; Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sat Jan 5 12:32:13 2008 @@ -414,7 +414,7 @@ if (switch_channel_test_flag(other_channel, CF_TAGGED)) { switch_channel_clear_flag(other_channel, CF_CONTROLLED); - switch_channel_clear_flag(other_channel, CF_BROADCAST); + switch_channel_set_flag(other_channel, CF_STOP_BROADCAST); switch_channel_set_flag(other_channel, CF_BREAK); switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); while (switch_channel_test_flag(other_channel, CF_TAGGED)) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Jan 5 12:32:13 2008 @@ -1224,7 +1224,7 @@ } switch_set_flag(channel, CF_BREAK); - switch_clear_flag(channel, CF_BROADCAST); + switch_set_flag(channel, CF_STOP_BROADCAST); if (channel->state < CS_HANGUP) { switch_event_t *event; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Jan 5 12:32:13 2008 @@ -315,11 +315,13 @@ if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { int x; + switch_channel_clear_flag(channel, CF_STOP_BROADCAST); switch_channel_set_flag(channel, CF_BROADCAST); for (x = 0; x < loops || loops < 0; x++) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Command Execute %s(%s)\n", app_name, app_arg); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Command Execute %s(%s)\n", + switch_channel_get_name(channel), app_name, app_arg); switch_core_session_exec(session, application_interface, app_arg); - if (!switch_channel_ready(channel) || !switch_channel_test_flag(channel, CF_BROADCAST)) { + if (!switch_channel_ready(channel) || switch_channel_test_flag(channel, CF_STOP_BROADCAST)) { break; } } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sat Jan 5 12:32:13 2008 @@ -222,8 +222,8 @@ end: switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); - //switch_channel_clear_flag(chan_b, CF_BROADCAST); - //switch_channel_set_flag(chan_b, CF_BREAK); + switch_channel_set_flag(chan_b, CF_STOP_BROADCAST); + switch_channel_set_flag(chan_b, CF_BREAK); switch_core_session_reset(session_a); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a));

1 0