- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

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

05 Jan '08

Author: anthm Date: Sat Jan 5 12:23:15 2008 New Revision: 7098 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 12:23:15 2008 @@ -1 +1 @@ -Sat Jan 5 09:09:25 CST 2008 +Sat Jan 5 12:23:10 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 12:23:15 2008 @@ -297,7 +297,7 @@ #endif -#define sqliteFree(x) do { free((void *)x); x = NULL; } while(x) //sqlite3FreeX(x) +#define sqliteFree(x) if (x) { free((void *)x); x = NULL; } //sqlite3FreeX(x) #define sqliteAllocSize(x) sqlite3AllocSize(x)

1 0

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

05 Jan '08

Author: anthm Date: Sat Jan 5 11:20:39 2008 New Revision: 7097 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Log: update 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 11:20:39 2008 @@ -971,8 +971,11 @@ } break; case SWITCH_MESSAGE_INDICATE_RINGING: - nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); - switch_channel_mark_ring_ready(channel); + if (!switch_channel_test_flag(channel, CF_RING_READY) && + !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { + nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); + switch_channel_mark_ring_ready(channel); + } break; case SWITCH_MESSAGE_INDICATE_ANSWER: sofia_answer_channel(session); 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 11:20:39 2008 @@ -648,6 +648,9 @@ switch_core_session_rwunlock(peer_session); goto done; } + if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_ANSWERED)) { + switch_channel_answer(caller_channel); + } } 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 11:20:39 2008 @@ -157,7 +157,7 @@ static uint8_t check_channel_status(switch_channel_t **peer_channels, switch_core_session_t **peer_sessions, - uint32_t len, int32_t *idx, uint32_t * hups, char *file, char *key, uint8_t early_ok, uint8_t *ring_ready) + uint32_t len, int32_t *idx, uint32_t * hups, char *file, char *key, uint8_t early_ok, uint8_t *ring_ready, uint8_t return_ring_ready) { uint32_t i; @@ -180,8 +180,11 @@ ) { (*hups)++; } else if ((switch_channel_test_flag(peer_channels[i], CF_ANSWERED) || - (early_ok && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) && - !switch_channel_test_flag(peer_channels[i], CF_TAGGED)) { + (early_ok && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA)) || + (*ring_ready && return_ring_ready && len == 1 && switch_channel_test_flag(peer_channels[i], CF_RING_READY)) + ) + && !switch_channel_test_flag(peer_channels[i], CF_TAGGED) + ) { if (!switch_strlen_zero(key)) { struct key_collect *collect; @@ -279,7 +282,7 @@ read_codec = switch_core_session_get_read_codec(session); - if (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { + if (switch_channel_test_flag(caller_channel, CF_ANSWERED)) { ringback_data = switch_channel_get_variable(caller_channel, "transfer_ringback"); } @@ -287,12 +290,14 @@ ringback_data = switch_channel_get_variable(caller_channel, "ringback"); } - switch_channel_set_variable(caller_channel, "originate_disposition", "failure"); - - + 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); @@ -342,10 +347,6 @@ } - if (ringback_data && !switch_channel_test_flag(caller_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { - switch_channel_pre_answer(caller_channel); - } - 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, @@ -434,7 +435,7 @@ } if (switch_core_session_dequeue_message(peer_session, &message) == SWITCH_STATUS_SUCCESS) { - switch_core_session_receive_message(session, message); + //switch_core_session_receive_message(session, message); if (switch_test_flag(message, SCSMF_DYNAMIC)) { switch_safe_free(message); @@ -679,7 +680,7 @@ if (caller_channel) { /* ringback is only useful when there is an originator */ ringback_data = NULL; - if (switch_channel_test_flag(caller_channel, CF_ANSWERED) || switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { + if (switch_channel_test_flag(caller_channel, CF_ANSWERED)) { ringback_data = switch_channel_get_variable(caller_channel, "transfer_ringback"); } @@ -757,11 +758,6 @@ or_argc = 1; } - if (caller_channel && or_argc > 1 && !ringback_data) { - switch_channel_ring_ready(caller_channel); - sent_ring = 1; - } - for (r = 0; r < or_argc; r++) { uint32_t hups; reason = SWITCH_CAUSE_UNALLOCATED; @@ -794,11 +790,6 @@ and_argc = 1; } - if (caller_channel && !sent_ring && and_argc > 1 && !ringback_data) { - switch_channel_ring_ready(caller_channel); - sent_ring = 1; - } - for (i = 0; i < and_argc; i++) { char *vdata; char *e = NULL; @@ -1083,7 +1074,12 @@ } while ((!caller_channel || switch_channel_ready(caller_channel)) && - check_channel_status(peer_channels, peer_sessions, and_argc, &idx, &hups, file, key, early_ok, &ring_ready)) { + check_channel_status(peer_channels, peer_sessions, and_argc, &idx, &hups, file, key, early_ok, &ring_ready, return_ring_ready)) { + + if (caller_channel && !sent_ring && ring_ready && !return_ring_ready) { + switch_channel_ring_ready(caller_channel); + sent_ring = 1; + } // When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. if ((to = (uint8_t) ((time(NULL) - start) >= (time_t) timelimit_sec)) @@ -1114,11 +1110,6 @@ break; } - if (ring_ready && return_ring_ready) { - status = SWITCH_STATUS_SUCCESS; - goto done; - } - if (ring_ready && read_frame && !pass) { if (ringback.fh) { uint8_t abuf[1024]; @@ -1226,8 +1217,10 @@ } } - if (switch_channel_test_flag(peer_channel, CF_ANSWERED) - || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { + if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || + (early_ok && switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) || + (return_ring_ready && switch_channel_test_flag(peer_channel, CF_RING_READY)) + ) { *bleg = peer_session; status = SWITCH_STATUS_SUCCESS; } else {

1 0

[commit] r7096 - freeswitch/trunk/libs/sqlite
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 10:09:21 2008 New Revision: 7096 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 10:09:21 2008 @@ -1 +1 @@ -Sat Jan 5 09:43:41 EST 2008 +Sat Jan 5 09:09:25 CST 2008

1 0

[commit] r7095 - freeswitch/trunk/libs/sqlite/src
by Freeswitch SVN 05 Jan '08

05 Jan '08

Author: anthm Date: Sat Jan 5 10:09:12 2008 New Revision: 7095 Modified: freeswitch/trunk/libs/sqlite/src/expr.c freeswitch/trunk/libs/sqlite/src/sqliteInt.h freeswitch/trunk/libs/sqlite/src/trigger.c Log: update Modified: freeswitch/trunk/libs/sqlite/src/expr.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/expr.c (original) +++ freeswitch/trunk/libs/sqlite/src/expr.c Sat Jan 5 10:09:12 2008 @@ -420,8 +420,8 @@ */ void sqlite3ExprDelete(Expr *p){ if( p==0 ) return; - if( p->span.dyn ) sqliteFree((char*)p->span.z); - if( p->token.dyn ) sqliteFree((char*)p->token.z); + if( p->span.dyn ) sqliteFree(p->span.z); + if( p->token.dyn ) sqliteFree(p->token.z); sqlite3ExprDelete(p->pLeft); sqlite3ExprDelete(p->pRight); sqlite3ExprListDelete(p->pList); @@ -478,7 +478,7 @@ return pNew; } void sqlite3TokenCopy(Token *pTo, Token *pFrom){ - if( pTo->dyn ) sqliteFree((char*)pTo->z); + if( pTo->dyn ) sqliteFree(pTo->z); if( pFrom->z ){ pTo->n = pFrom->n; pTo->z = (u8*)sqliteStrNDup((char*)pFrom->z, pFrom->n); 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 10:09:12 2008 @@ -297,7 +297,7 @@ #endif -#define sqliteFree(x) do { free(x); x = NULL; } while(x) //sqlite3FreeX(x) +#define sqliteFree(x) do { free((void *)x); x = NULL; } while(x) //sqlite3FreeX(x) #define sqliteAllocSize(x) sqlite3AllocSize(x) Modified: freeswitch/trunk/libs/sqlite/src/trigger.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/trigger.c (original) +++ freeswitch/trunk/libs/sqlite/src/trigger.c Sat Jan 5 10:09:12 2008 @@ -21,7 +21,7 @@ TriggerStep * pTmp = pTriggerStep; pTriggerStep = pTriggerStep->pNext; - if( pTmp->target.dyn ) sqliteFree((char*)pTmp->target.z); + if( pTmp->target.dyn ) sqliteFree(pTmp->target.z); sqlite3ExprDelete(pTmp->pWhere); sqlite3ExprListDelete(pTmp->pExprList); sqlite3SelectDelete(pTmp->pSelect); @@ -430,7 +430,7 @@ sqliteFree(pTrigger->table); sqlite3ExprDelete(pTrigger->pWhen); sqlite3IdListDelete(pTrigger->pColumns); - if( pTrigger->nameToken.dyn ) sqliteFree((char*)pTrigger->nameToken.z); + if( pTrigger->nameToken.dyn ) sqliteFree(pTrigger->nameToken.z); sqliteFree(pTrigger); }

1 0

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

05 Jan '08

Author: anthm Date: Sat Jan 5 09:58:26 2008 New Revision: 7094 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update 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 09:58:26 2008 @@ -549,7 +549,7 @@ char *var_val, *vars = NULL; const char *ringback_data = NULL; switch_codec_t *read_codec = NULL; - uint8_t sent_ring = 0, early_ok = 1; + uint8_t sent_ring = 0, early_ok = 1, return_ring_ready = 0; switch_core_session_message_t *message = NULL; switch_event_t *var_event = NULL; uint8_t fail_on_single_reject = 0; @@ -627,6 +627,8 @@ ok = 1; } else if (!strcasecmp((char *)hi->name, "ignore_early_media")) { ok = 1; + } else if (!strcasecmp((char *)hi->name, "return_ring_ready")) { + ok = 1; } else if (!strcasecmp((char *)hi->name, "originate_retries")) { ok = 1; } else if (!strcasecmp((char *)hi->name, "originate_retry_sleep_ms")) { @@ -708,6 +710,10 @@ early_ok = 0; } + if ((var_val = switch_event_get_header(var_event, "return_ring_ready")) && switch_true(var_val)) { + return_ring_ready = 1; + } + if ((var_val = switch_event_get_header(var_event, "originate_retries")) && switch_true(var_val)) { int32_t tmp; tmp = atoi(var_val); @@ -1108,6 +1114,11 @@ break; } + if (ring_ready && return_ring_ready) { + status = SWITCH_STATUS_SUCCESS; + goto done; + } + if (ring_ready && read_frame && !pass) { if (ringback.fh) { uint8_t abuf[1024];

1 0

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

05 Jan '08

Author: anthm Date: Sat Jan 5 09:48:04 2008 New Revision: 7093 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update 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 09:48:04 2008 @@ -292,7 +292,6 @@ if (ringback_data) { char *tmp_data = NULL; - ringback_t ringback = { 0 }; switch_buffer_create_dynamic(&ringback.audio_buffer, 512, 1024, 0); switch_buffer_set_loops(ringback.audio_buffer, -1);

1 0

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

05 Jan '08

Author: anthm Date: Sat Jan 5 09:43:50 2008 New Revision: 7092 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 09:43:50 2008 @@ -1 +1 @@ -Fri Jan 4 10:43:39 CST 2008 +Sat Jan 5 09:43:41 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 09:43:50 2008 @@ -296,15 +296,8 @@ #endif -static inline void sane_free(void *x) -{ - if (x) { - free(x); - x = NULL; - } -} -#define sqliteFree(x) sane_free(x) //sqlite3FreeX(x) +#define sqliteFree(x) do { free(x); x = NULL; } while(x) //sqlite3FreeX(x) #define sqliteAllocSize(x) sqlite3AllocSize(x)

1 0