January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7323 - freeswitch/trunk/src
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: mikej Date: Wed Jan 23 11:23:01 2008 New Revision: 7323 Modified: freeswitch/trunk/src/switch_rtp.c Log: possible fix or MODENDP-79 - Duplicate rtp timestamps from portaudio to sip Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Jan 23 11:23:01 2008 @@ -1543,6 +1543,9 @@ rtp_session->ts = (uint32_t) timestamp; } else if (rtp_session->timer.timer_interface) { rtp_session->ts = rtp_session->timer.samplecount; + if (rtp_session->ts <= rtp_session->last_write_ts) { + rtp_session->ts = rtp_session->last_write_ts + rtp_session->samples_per_interval; + } } else { rtp_session->ts += rtp_session->samples_per_interval; }

1 0

[commit] r7322 - freeswitch/trunk/src
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: anthm Date: Wed Jan 23 10:26:57 2008 New Revision: 7322 Modified: freeswitch/trunk/src/switch_time.c Log: detect broken monotonic clocks Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Wed Jan 23 10:26:57 2008 @@ -96,17 +96,27 @@ return now; } +#if defined(HAVE_CLOCK_GETTIME) +static int MONO = 1; +#else +static int MONO = 0; +#endif + static switch_time_t time_now(int64_t offset) { switch_time_t now; #if defined(HAVE_CLOCK_GETTIME) - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - now = ts.tv_sec * APR_USEC_PER_SEC + (ts.tv_nsec/1000) + offset; - -#else + if (MONO) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + now = ts.tv_sec * APR_USEC_PER_SEC + (ts.tv_nsec/1000) + offset; + } else { +#endif now = switch_time_now(); + +#if defined(HAVE_CLOCK_GETTIME) + } #endif return now; @@ -283,6 +293,24 @@ runtime.sps = runtime.sps_total; switch_mutex_unlock(runtime.throttle_mutex); + if (MONO) { + int loops; + for(loops = 0; loops < 3; loops++) { + ts = time_now(0); + /* if it returns the same value every time it won't be of much use.*/ + if (ts == last) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Broken MONOTONIC Clock Detected!, Support Disabled.\n"); + MONO = 0; + runtime.reference = switch_time_now(); + runtime.initiated = runtime.reference; + } + switch_yield(STEP_MIC); + last = ts; + } + } + + ts = 0; + last = 0; while (globals.RUNNING == 1) { runtime.reference += STEP_MIC;

1 0

[commit] r7320 - in freeswitch/trunk/src/mod: applications/mod_soundtouch endpoints/mod_alsa formats/mod_tone_stream languages/mod_java
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: anthm Date: Tue Jan 22 20:13:24 2008 New Revision: 7320 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_alsa/ (props changed) freeswitch/trunk/src/mod/formats/mod_tone_stream/ (props changed) freeswitch/trunk/src/mod/languages/mod_java/ (props changed) Log: svn:ignore props

1 0

[commit] r7318 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 23 Jan '08

23 Jan '08

Author: brian Date: Tue Jan 22 19:45:27 2008 New Revision: 7318 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 22 19:45:27 2008 @@ -122,7 +122,7 @@ <condition field="${sip_to_params}" expression="intercom\=true"/> <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> - <action application="export" data="sip_h_Call-Info=<sip:$${domain}>;answer-after=0"/> + <action application="export" data="sip_h_Call-Info=answer-after=0"/> <action application="export" data="sip_auto_answer=true"/> <action application="bridge" data="user/${dialed_ext}@$${domain}"/> </condition> @@ -279,7 +279,7 @@ </extension> <extension name="is_secure"> - <condition field="${sip_secure_media_confirmed}" expression="^true$" break="never"> + <condition field="${sip_secure_media_confirmed}" expression="^true$"> <action application="sleep" data="1000"/> <action application="gentones" data="${bong-ring}"/> </condition>

1 0

[commit] r7317 - freeswitch/trunk/src
by Freeswitch SVN 22 Jan '08

22 Jan '08

Author: anthm Date: Tue Jan 22 09:16:45 2008 New Revision: 7317 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 Tue Jan 22 09:16:45 2008 @@ -1039,7 +1039,7 @@ /* Helper function used when separating strings to remove quotes, leading / trailing spaces, and to convert escaped characters. */ -static char *cleanup_separated_string(char *str) +static char *cleanup_separated_string(char *str, char delim) { char *ptr; char *dest; @@ -1057,7 +1057,7 @@ if (*ptr == ESCAPE_META) { e = *(ptr+1); - if (e == '\'' || e == '"' || (e = unescape_char(*(ptr+1))) != *(ptr+1)) { + if (e == '\'' || e == '"' || (delim && e == delim) || (e = unescape_char(*(ptr+1))) != *(ptr+1)) { ++ptr; *dest++ = e; end = dest; @@ -1117,7 +1117,7 @@ } /* strip quotes, escaped chars and leading / trailing spaces */ for (i = 0; i < count; ++i) { - array[i] = cleanup_separated_string(array[i]); + array[i] = cleanup_separated_string(array[i], delim); } return count; } @@ -1175,7 +1175,7 @@ } /* strip quotes, escaped chars and leading / trailing spaces */ for (i = 0; i < count; ++i) { - array[i] = cleanup_separated_string(array[i]); + array[i] = cleanup_separated_string(array[i], 0); } return count; }

1 0

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

21 Jan '08

Author: anthm Date: Mon Jan 21 18:52:34 2008 New Revision: 7316 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_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 18:52:34 2008 @@ -1727,6 +1727,10 @@ goto error; } + if (profile->domain_name && profile->domain_name != profile->name) { + profile_name = profile->domain_name; + } + if ((dest_to = strchr(dest, '^'))) { *dest_to++ = '\0'; tech_pvt->dest_to = switch_core_session_alloc(nsession, strlen(dest_to) + 5); @@ -1749,11 +1753,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->domain_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->domain_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->domain_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; }

1 0

[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