- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7315 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: brian Date: Mon Jan 21 17:24:41 2008 New Revision: 7315 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: you must use the domain attr if the profile doesn't match the domain Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Mon Jan 21 17:24:41 2008 @@ -1,5 +1,5 @@  -<profile name="default"> +<profile name="default" domain="$${domain}">  <aliases> <alias name="$${domain}"/>

1 0

[commit] r7314 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: anthm Date: Mon Jan 21 15:36:10 2008 New Revision: 7314 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Jan 21 15:36:10 2008 @@ -477,7 +477,7 @@ if (!authorization || stale) { sofia_reg_auth_challange(nua, profile, nh, regtype, to_host, stale); - if (regtype == REG_REGISTER) { + if (regtype == REG_REGISTER && profile->debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Requesting Registration from: [%s@%s]\n", to_user, to_host); } return 1; @@ -533,9 +533,10 @@ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "Register:\nFrom: [%s@%s]\nContact: [%s]\nExpires: [%ld]\n", to_user, to_host, contact_str, (long) exptime); - + if (profile->debug) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "Register:\nFrom: [%s@%s]\nContact: [%s]\nExpires: [%ld]\n", to_user, to_host, contact_str, (long) exptime); + } if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip");

1 0

[commit] r7313 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: anthm Date: Mon Jan 21 15:14:53 2008 New Revision: 7313 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.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 Mon Jan 21 15:14:53 2008 @@ -1198,6 +1198,7 @@ if ((profile = sofia_glue_find_profile(argv[1]))) { stream->write_function(stream, "%s\n", line); stream->write_function(stream, "Name \t%s\n", switch_str_nil(argv[1])); + stream->write_function(stream, "Domain Name\t%s\n", switch_str_nil(profile->domain_name)); if (strcasecmp(argv[1], profile->name)) { stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name)); } @@ -1748,11 +1749,11 @@ } else if (!strchr(dest, '@')) { char buf[128]; tech_pvt->e_dest = switch_core_session_strdup(nsession, dest); - if (sofia_reg_find_reg_url(profile, dest, profile->name, buf, sizeof(buf))) { + if (sofia_reg_find_reg_url(profile, dest, profile->domain_name, buf, sizeof(buf))) { tech_pvt->dest = switch_core_session_strdup(nsession, buf); - tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile->name); + tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile->domain_name); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile->domain_name); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; goto error; } 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 Mon Jan 21 15:14:53 2008 @@ -234,6 +234,7 @@ struct sofia_profile { int debug; char *name; + char *domain_name; char *dbname; char *dialplan; char *context; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Jan 21 15:14:53 2008 @@ -871,6 +871,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Settings, check the new config!\n"); } else { char *xprofilename = (char *) switch_xml_attr_soft(xprofile, "name"); + char *xprofiledomain = (char *) switch_xml_attr(xprofile, "domain"); switch_memory_pool_t *pool = NULL; if (!xprofilename) { @@ -902,6 +903,12 @@ profile->name = switch_core_strdup(profile->pool, xprofilename); switch_snprintf(url, sizeof(url), "sofia_reg_%s", xprofilename); + if (xprofiledomain) { + profile->domain_name = switch_core_strdup(profile->pool, xprofiledomain); + } else { + profile->domain_name = profile->name; + } + profile->dbname = switch_core_strdup(profile->pool, url); switch_core_hash_init(&profile->chat_hash, profile->pool); switch_core_hash_init(&profile->sub_hash, profile->pool); @@ -2374,6 +2381,7 @@ } switch_channel_set_variable(channel, "sofia_profile_name", profile->name); + switch_channel_set_variable(channel, "sofia_profile_domain_name", profile->domain_name); if (!switch_strlen_zero(sip->sip_from->a_display)) { displayname = sip->sip_from->a_display;

1 0

[commit] r7312 - in freeswitch/trunk/src: . include
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: anthm Date: Mon Jan 21 13:17:12 2008 New Revision: 7312 Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_event.c Log: add func to expand event headers from a template string Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Mon Jan 21 13:17:12 2008 @@ -283,6 +283,7 @@ \note the body parameter can be shadowed by the switch_event_reserve_subclass_detailed function */ SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2, 3); +SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const char *in); SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(_In_z_ char *file, _In_z_ char *func, _In_ int line, _In_z_ const char *proto, _In_z_ const char *login, Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Jan 21 13:17:12 2008 @@ -1007,6 +1007,267 @@ return SWITCH_STATUS_MEMERR; } + +#define resize(l) {\ +char *dp;\ +olen += (len + l + block);\ +cpos = c - data;\ +if ((dp = realloc(data, olen))) {\ + data = dp;\ + c = data + cpos;\ + memset(c, 0, olen - cpos);\ + }} \ + +SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const char *in) +{ + char *p, *c = NULL; + char *data, *indup; + size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; + const char *q, *sub_val = NULL; + char *cloned_sub_val = NULL; + char *func_val = NULL; + int nv = 0; + + q = in; + while(q && *q) { + if (!(p = strchr(q, '$'))) { + break; + } + + if (*(p-1) == '\\') { + q = p + 1; + continue; + } + + if (*(p+1) != '{') { + q = p + 1; + continue; + } + + nv = 1; + break; + } + + if (!nv) { + return (char *)in; + } + + nv = 0; + olen = strlen(in) + 1; + indup = strdup(in); + + if ((data = malloc(olen))) { + memset(data, 0, olen); + c = data; + for (p = indup; p && *p; p++) { + vtype = 0; + + if (*p == '\\') { + if (*(p + 1) == '$') { + nv = 1; + } else if (*(p + 1) == '\\') { + *c++ = *p++; + len++; + continue; + } + p++; + } + + if (*p == '$' && !nv) { + if (*(p+1)) { + if (*(p+1) == '{') { + vtype = 1; + } else { + nv = 1; + } + } else { + nv = 1; + } + } + + if (nv) { + *c++ = *p; + len++; + nv = 0; + continue; + } + + if (vtype) { + char *s = p, *e, *vname, *vval = NULL; + size_t nlen; + + s++; + + if (vtype == 1 && *s == '{') { + br = 1; + s++; + } + + e = s; + vname = s; + while (*e) { + if (br == 1 && *e == '}') { + br = 0; + *e++ = '\0'; + break; + } + + if (br > 0) { + if (e != s && *e == '{') { + br++; + } else if (br > 1 && *e == '}') { + br--; + } + } + + e++; + } + p = e; + + if ((vval = strchr(vname, '('))) { + e = vval - 1; + *vval++ = '\0'; + while(*e == ' ') { + *e-- = '\0'; + } + e = vval; + br = 1; + while(e && *e) { + if (*e == '(') { + br++; + } else if (br > 1 && *e == ')') { + br--; + } else if (br == 1 && *e == ')') { + *e = '\0'; + break; + } + e++; + } + + vtype = 2; + } + + if (vtype == 1) { + char *expanded = NULL; + int offset = 0; + int ooffset = 0; + char *ptr; + + if ((expanded = switch_event_expand_headers(event, (char *)vname)) == vname) { + expanded = NULL; + } else { + vname = expanded; + } + if ((ptr = strchr(vname, ':'))) { + *ptr++ = '\0'; + offset = atoi(ptr); + if ((ptr = strchr(ptr, ':'))) { + ptr++; + ooffset = atoi(ptr); + } + } + + if (!(sub_val = switch_event_get_header(event, vname))) { + sub_val = switch_core_get_variable(vname); + } + + if (offset || ooffset) { + cloned_sub_val = strdup(sub_val); + switch_assert(cloned_sub_val); + sub_val = cloned_sub_val; + } + + if (offset >= 0) { + sub_val += offset; + } else if ((size_t)abs(offset) <= strlen(sub_val)) { + sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset); + } + + if (ooffset > 0 && (size_t)ooffset < strlen(sub_val)) { + if ((ptr = (char *)sub_val + ooffset)) { + *ptr = '\0'; + } + } + + switch_safe_free(expanded); + } else { + switch_stream_handle_t stream = { 0 }; + char *expanded = NULL; + + SWITCH_STANDARD_STREAM(stream); + + if (stream.data) { + char *expanded_vname = NULL; + + if ((expanded_vname = switch_event_expand_headers(event, (char *)vname)) == vname) { + expanded_vname = NULL; + } else { + vname = expanded_vname; + } + + if ((expanded = switch_event_expand_headers(event, vval)) == vval) { + expanded = NULL; + } else { + vval = expanded; + } + + if (switch_api_execute(vname, vval, NULL, &stream) == SWITCH_STATUS_SUCCESS) { + func_val = stream.data; + sub_val = func_val; + } else { + free(stream.data); + } + + switch_safe_free(expanded); + switch_safe_free(expanded_vname); + + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + free(data); + free(indup); + return (char *)in; + } + } + if ((nlen = sub_val ? strlen(sub_val) : 0)) { + if (len + nlen >= olen) { + resize(nlen); + } + + len += nlen; + strcat(c, sub_val); + c += nlen; + } + + switch_safe_free(func_val); + switch_safe_free(cloned_sub_val); + sub_val = NULL; + vname = NULL; + vtype = 0; + br = 0; + } + if (len + 1 >= olen) { + resize(1); + } + + if (sp) { + *c++ = ' '; + sp = 0; + len++; + } + + if (*p == '$') { + p--; + } else { + *c++ = *p; + len++; + } + } + } + free(indup); + + return data; +} + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r7311 - in freeswitch/trunk/src: . include include/private mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: anthm Date: Mon Jan 21 12:14:43 2008 New Revision: 7311 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_async.c Log: fix obscure race condition Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Mon Jan 21 12:14:43 2008 @@ -153,6 +153,7 @@ uint32_t flags; uint8_t ready; time_t stop_time; + switch_thread_id_t thread_id; struct switch_media_bug *next; }; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jan 21 12:14:43 2008 @@ -830,6 +830,7 @@ SMBF_READ_REPLACE - Replace the Read Stream SMBF_STEREO - Record in stereo SMBF_ANSWER_RECORD_REQ - Don't record until the channel is answered +SMBF_THREAD_LOCK - Only let the same thread who created the bug remove it. </pre> */ typedef enum { @@ -840,7 +841,8 @@ SMBF_READ_REPLACE = (1 << 3), SMBF_READ_PING = (1 << 4), SMBF_STEREO = (1 << 5), - SMBF_RECORD_ANSWER_REQ = (1 << 6) + SMBF_RECORD_ANSWER_REQ = (1 << 6), + SMBF_THREAD_LOCK = (1 << 7) } switch_media_bug_flag_t; /*! 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 Mon Jan 21 12:14:43 2008 @@ -1748,11 +1748,11 @@ } else if (!strchr(dest, '@')) { char buf[128]; tech_pvt->e_dest = switch_core_session_strdup(nsession, dest); - if (sofia_reg_find_reg_url(profile, dest, profile_name, buf, sizeof(buf))) { + if (sofia_reg_find_reg_url(profile, dest, profile->name, buf, sizeof(buf))) { tech_pvt->dest = switch_core_session_strdup(nsession, buf); - tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile_name); + tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile->name); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile->name); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; goto error; } Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Mon Jan 21 12:14:43 2008 @@ -244,6 +244,12 @@ switch_buffer_create_dynamic(&bug->raw_write_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER); switch_mutex_init(&bug->write_mutex, SWITCH_MUTEX_NESTED, session->pool); } + + if ((bug->flags & SMBF_THREAD_LOCK)) { + bug->thread_id = switch_thread_self(); + } + + bug->ready = 1; switch_thread_rwlock_wrlock(session->bug_rwlock); bug->next = session->bugs; @@ -269,6 +275,11 @@ if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { + if (bp->thread_id && bp->thread_id != switch_thread_self()) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); + continue; + } + if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); } @@ -287,6 +298,11 @@ { switch_media_bug_t *bp = *bug; if (bp) { + if (bp->thread_id && bp->thread_id != switch_thread_self()) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); + return SWITCH_STATUS_FALSE; + } + if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); bp->ready = 0; @@ -308,6 +324,11 @@ if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { + if (bp->thread_id && bp->thread_id != switch_thread_self()) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); + continue; + } + if (!bp->ready) { continue; } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Jan 21 12:14:43 2008 @@ -657,7 +657,8 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n", switch_channel_get_name((*session)->channel), switch_channel_state_name(switch_channel_get_state((*session)->channel))); - + + switch_core_media_bug_remove_all(*session); switch_ivr_deactivate_unicast(*session); switch_scheduler_del_task_group((*session)->uuid_str); @@ -674,7 +675,7 @@ switch_event_fire(&event); } - switch_core_media_bug_remove_all(*session); + switch_buffer_destroy(&(*session)->raw_read_buffer); switch_buffer_destroy(&(*session)->raw_write_buffer); switch_ivr_clear_speech_cache(*session); @@ -694,10 +695,7 @@ switch_core_session_t *session = obj; session->thread = thread; - - switch_core_session_run(session); - switch_core_media_bug_remove_all(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %"SWITCH_SIZE_T_FMT" (%s) Locked, Waiting on external entities\n", session->id, switch_channel_get_name(session->channel)); switch_core_session_write_lock(session); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Jan 21 12:14:43 2008 @@ -503,9 +503,10 @@ switch_channel_t *tchannel = switch_core_session_get_channel(tsession); switch_frame_t *read_frame, write_frame = { 0 }; switch_codec_t codec = {0}; - int16_t buf[1024]; + int16_t buf[8192]; switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); - + int tlen = tread_codec->implementation->bytes_per_frame; + ep = switch_core_session_alloc(session, sizeof(*ep)); switch_channel_pre_answer(channel); @@ -543,7 +544,7 @@ if (switch_core_media_bug_add(tsession, eavesdrop_callback, ep, 0, - SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING, + SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING | SMBF_THREAD_LOCK, &bug) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot attach bug\n"); goto end; @@ -630,11 +631,10 @@ switch_buffer_unlock(ep->w_buffer); } - - if (len > tread_codec->implementation->bytes_per_frame) { - len = tread_codec->implementation->bytes_per_frame; + if (len > tlen) { + len = tlen; } - + if (switch_buffer_inuse(ep->buffer) >= len) { switch_buffer_lock(ep->buffer); while (switch_buffer_inuse(ep->buffer) >= len) {

1 0

[commit] r7310 - freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: intralanman Date: Mon Jan 21 10:06:53 2008 New Revision: 7310 Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Log: whoops, these are pretty important lines Modified: freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/intralanman/PHP/fs_curl/fs_dialplan.php Mon Jan 21 10:06:53 2008 @@ -75,6 +75,9 @@ private function writeDialplan($dpArray) { //print_r($dpArray); if (is_array($dpArray)) { + $this -> xmlw -> startElement('section'); + $this -> xmlw -> writeAttribute('name', 'dialplan'); + $this -> xmlw -> writeAttribute('description', 'FreeSWITCH Dialplan'); //$this -> comment('dpArray is an array'); foreach ($dpArray as $context => $extensions_array) { //$this -> comment($context); @@ -121,6 +124,8 @@ // </context> $this -> xmlw -> endElement(); } + // </section> + $this -> xmlw -> endElement(); } } }

1 0

[commit] r7309 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jan '08

21 Jan '08

Author: mikej Date: Sun Jan 20 19:35:33 2008 New Revision: 7309 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add optional var/param for seperately setting the rtp timeout when on hold 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 Sun Jan 20 19:35:33 2008 @@ -288,6 +288,7 @@ uint32_t session_timeout; uint32_t max_proceeding; uint32_t rtp_timeout_sec; + uint32_t rtp_hold_timeout_sec; char *odbc_dsn; char *odbc_user; char *odbc_pass; @@ -374,6 +375,7 @@ uint32_t owner_id; uint32_t session_id; uint32_t max_missed_packets; + uint32_t max_missed_hold_packets; /** VIDEO **/ switch_frame_t video_read_frame; switch_codec_t video_read_codec; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Sun Jan 20 19:35:33 2008 @@ -1011,6 +1011,11 @@ if (v >= 0) { profile->rtp_timeout_sec = v; } + } else if (!strcasecmp(var, "rtp-hold-timeout-sec")) { + int v = atoi(val); + if (v >= 0) { + profile->rtp_hold_timeout_sec = v; + } } else if (!strcasecmp(var, "manage-presence")) { if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; 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 Sun Jan 20 19:35:33 2008 @@ -1226,6 +1226,7 @@ switch_status_t status; char tmp[50]; uint32_t rtp_timeout_sec = tech_pvt->profile->rtp_timeout_sec; + uint32_t rtp_hold_timeout_sec = tech_pvt->profile->rtp_hold_timeout_sec; switch_assert(tech_pvt != NULL); @@ -1370,12 +1371,27 @@ rtp_timeout_sec = v; } } + + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_hold_timeout_sec"))) { + int v = atoi(val); + if (v >= 0) { + rtp_hold_timeout_sec = v; + } + } if (rtp_timeout_sec) { tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / tech_pvt->read_codec.implementation->samples_per_frame; switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); + if (!rtp_hold_timeout_sec) { + rtp_hold_timeout_sec = rtp_timeout_sec * 10; + } + } + + if (rtp_hold_timeout_sec) { + tech_pvt->max_missed_hold_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_hold_timeout_sec) / + tech_pvt->read_codec.implementation->samples_per_frame; } if (tech_pvt->te) { @@ -1540,7 +1556,7 @@ switch_channel_presence(tech_pvt->channel, "unknown", "hold"); if (tech_pvt->max_missed_packets) { - switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets * 10); + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_hold_packets); } if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) {

1 0

[commit] r7308 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: anthm Date: Sun Jan 20 17:39:08 2008 New Revision: 7308 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix mem leak Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Jan 20 17:39:08 2008 @@ -481,7 +481,7 @@ switch_xml_free(xml); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML ERROR!\n"); - continue; + goto endloop; } } @@ -496,6 +496,9 @@ switch_socket_send(listener->sock, listener->ebuf, &len); switch_safe_free(listener->ebuf); + + endloop: + switch_event_destroy(&pevent); } } }

1 0

[commit] r7307 - freeswitch/trunk/libs/apr-util/misc
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: mikej Date: Sun Jan 20 16:49:01 2008 New Revision: 7307 Modified: freeswitch/trunk/libs/apr-util/misc/apr_queue.c Log: return error instead of segfaulting on pool allocation failure when creating a queue. Modified: freeswitch/trunk/libs/apr-util/misc/apr_queue.c ============================================================================== --- freeswitch/trunk/libs/apr-util/misc/apr_queue.c (original) +++ freeswitch/trunk/libs/apr-util/misc/apr_queue.c Sun Jan 20 16:49:01 2008 @@ -126,7 +126,9 @@ } /* Set all the data in the queue to NULL */ - queue->data = apr_pcalloc(a, queue_capacity * sizeof(void*)); + queue->data = apr_palloc(a, queue_capacity * sizeof(void*)); + if (!queue->data) return APR_ENOMEM; + memset(queue->data, 0, queue_capacity * sizeof(void*)); queue->bounds = queue_capacity; queue->nelts = 0; queue->in = 0;

1 0

[commit] r7306 - freeswitch/trunk/src
by Freeswitch SVN 20 Jan '08

20 Jan '08

Author: anthm Date: Sun Jan 20 14:05:16 2008 New Revision: 7306 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 Sun Jan 20 14:05:16 2008 @@ -1056,7 +1056,8 @@ int esc = 0; if (*ptr == ESCAPE_META) { - if ((e = unescape_char(*(ptr+1))) != e) { + e = *(ptr+1); + if (e == '\'' || e == '"' || (e = unescape_char(*(ptr+1))) != *(ptr+1)) { ++ptr; *dest++ = e; end = dest;

1 0