- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

05 Jan '08

Author: cypromis Date: Sat Jan 5 05:58:33 2008 New Revision: 7091 Modified: freeswitch/trunk/libs/sqlite/src/util.c Log: typo in zNew = sqliteMallocRaw(n+1); util.c 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 05:58:33 2008 @@ -729,7 +729,7 @@ char *sqlite3StrNDup(const char *z, int n){ char *zNew; if( z==0 ) return 0; - zNew = sqliteMallocRaw(n+1, 1); + zNew = sqliteMallocRaw(n+1); if( zNew ){ memcpy(zNew, z, n); zNew[n] = 0;

1 0

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

05 Jan '08

Author: mikej Date: Fri Jan 4 22:36:08 2008 New Revision: 7088 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: cleanup/don't mask varname. Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Jan 4 22:36:08 2008 @@ -331,8 +331,6 @@ 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); - //ringback.ts.debug = 1; - //ringback.ts.debug_stream = switch_core_get_console(); 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); @@ -411,8 +409,6 @@ 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); - //ringback.ts.debug = 1; - //ringback.ts.debug_stream = switch_core_get_console(); 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); @@ -455,7 +451,7 @@ if (read_frame && !pass) { if (ringback.fh) { - uint8_t abuf[1024]; + uint8_t fbuf[1024]; switch_size_t mlen, olen; unsigned int pos = 0; @@ -466,18 +462,18 @@ } olen = mlen; - switch_core_file_read(ringback.fh, abuf, &olen); + switch_core_file_read(ringback.fh, fbuf, &olen); if (olen == 0) { olen = mlen; ringback.fh->speed = 0; switch_core_file_seek(ringback.fh, &pos, 0, SEEK_SET); - switch_core_file_read(ringback.fh, abuf, &olen); + switch_core_file_read(ringback.fh, fbuf, &olen); if (olen == 0) { break; } } - write_frame.data = abuf; + write_frame.data = fbuf; write_frame.datalen = (uint32_t) (ringback.asis ? olen : olen * 2); } else if (ringback.audio_buffer) { if ((write_frame.datalen = (uint32_t) switch_buffer_read_loop(ringback.audio_buffer,

1 0

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

05 Jan '08

Author: mikej Date: Fri Jan 4 22:35:15 2008 New Revision: 7087 Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h freeswitch/trunk/libs/sqlite/src/util.c Log: use strndup replacement on msvc Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h ============================================================================== --- freeswitch/trunk/libs/sqlite/src/sqliteInt.h (original) +++ freeswitch/trunk/libs/sqlite/src/sqliteInt.h Fri Jan 4 22:35:15 2008 @@ -287,7 +287,11 @@ #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 Modified: freeswitch/trunk/libs/sqlite/src/util.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/util.c (original) +++ freeswitch/trunk/libs/sqlite/src/util.c Fri Jan 4 22:35:15 2008 @@ -729,7 +729,7 @@ char *sqlite3StrNDup(const char *z, int n){ char *zNew; if( z==0 ) return 0; - zNew = sqlite3MallocRaw(n+1, 1); + zNew = sqliteMallocRaw(n+1, 1); if( zNew ){ memcpy(zNew, z, n); zNew[n] = 0;

1 0