May 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8524 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 22 May '08

22 May '08

Author: brian Date: Thu May 22 11:13:30 2008 New Revision: 8524 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak this Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu May 22 11:13:30 2008 @@ -137,9 +137,9 @@ <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/>  - <anti-action application="bind_meta_app" data="1 b o execute_extension::dx XML features"/> - <anti-action application="bind_meta_app" data="2 b o record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> - <anti-action application="bind_meta_app" data="3 b o execute_extension::cf XML features"/> + <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/> + <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> + <anti-action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/> <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/>

1 0

[commit] r8523 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 22 May '08

22 May '08

Author: brian Date: Thu May 22 11:07:56 2008 New Revision: 8523 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak this Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu May 22 11:07:56 2008 @@ -136,9 +136,10 @@ <action application="answer"/> <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> - <anti-action application="bind_meta_app" data="1 a a execute_extension::dx XML features"/> - <anti-action application="bind_meta_app" data="2 a a record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> - <anti-action application="bind_meta_app" data="3 a a execute_extension::cf XML features"/> +  + <anti-action application="bind_meta_app" data="1 b o execute_extension::dx XML features"/> + <anti-action application="bind_meta_app" data="2 b o record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> + <anti-action application="bind_meta_app" data="3 b o execute_extension::cf XML features"/> <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/>

1 0

[commit] r8522 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 May '08

22 May '08

Author: anthm Date: Thu May 22 10:41:11 2008 New Revision: 8522 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: tweak 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 Thu May 22 10:41:11 2008 @@ -1497,6 +1497,7 @@ char *p; sofia_profile_t *profile = NULL; const char *exclude_contact = NULL; + char *reply = ""; if (!cmd) { stream->write_function(stream, "%s", ""); @@ -1543,11 +1544,13 @@ if (profile) { struct cb_helper cb; switch_stream_handle_t mystream = { 0 }; + if (!domain || !strchr(domain, '.')) { domain = profile->name; } SWITCH_STANDARD_STREAM(mystream); + switch_assert(mystream.data); cb.profile = profile; cb.stream = &mystream; @@ -1561,19 +1564,20 @@ switch_assert(sql); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, contact_callback, &cb); switch_safe_free(sql); - if (mystream.data) { - char *str = mystream.data; - *(str + (strlen(str) - 1)) = '\0'; + reply = (char *) mystream.data; + if (!switch_strlen_zero(reply) && end_of(reply) == ',') { + end_of(reply) = '\0'; } - stream->write_function(stream, "%s", mystream.data); + stream->write_function(stream, "%s", reply); + reply = NULL; switch_safe_free(mystream.data); - goto end; } } - stream->write_function(stream, "%s", ""); + if (reply) { + stream->write_function(stream, "%s", reply); + } -end: switch_safe_free(data); if (profile) { 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 Thu May 22 10:41:11 2008 @@ -704,9 +704,14 @@ if (regtype == REG_REGISTER) { char *new_contact = NULL; + char *p; + + if ((p = strstr(contact_str, ";nat"))) { + *p = '\0'; + } if (exptime) { - if (nat_hack) { + if (is_nat || nat_hack) { new_contact = switch_mprintf("%s;expires=%ld;received=\"%s:%d\"", contact_str, (long)exptime, network_ip, network_port); } else { new_contact = switch_mprintf("%s;expires=%ld", contact_str, (long)exptime);

1 0

[commit] r8521 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 22 May '08

22 May '08

Author: brian Date: Wed May 21 22:32:47 2008 New Revision: 8521 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: thanks dasbus Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed May 21 22:32:47 2008 @@ -1538,9 +1538,9 @@ "pa dtmf <digit string>\n" "pa flags [on|off] [ear] [mouth]\n" "pa devlist\n" - "pa indev [#<num>|<partial name>\n" - "pa outdev [#<num>|<partial name>\n" - "pa ringdev [#<num>|<partial name>\n" "--------------------------------------------------------------------------------\n"; + "pa indev #<num>|<partial name>\n" + "pa outdev #<num>|<partial name>\n" + "pa ringdev #<num>|<partial name>\n" "--------------------------------------------------------------------------------\n"; if (stream->event) { http = switch_event_get_header(stream->event, "http-host");

1 0

[commit] r8520 - freeswitch/trunk/src/mod/formats/mod_sndfile
by Freeswitch SVN 22 May '08

22 May '08

Author: mikej Date: Wed May 21 22:16:32 2008 New Revision: 8520 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Log: fix finding of files in rate dirs on windows in mod_sndfile Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Wed May 21 22:16:32 2008 @@ -149,7 +149,7 @@ switch_zmalloc(alt_path, alt_len); switch_copy_string(alt_path, path, alt_len); - if ((last = strrchr(alt_path, *SWITCH_PATH_SEPARATOR))) { + if ((last = strrchr(alt_path, '/'))) { next = ++last; ldup = strdup(last); switch_assert(ldup); @@ -158,7 +158,18 @@ path = alt_path; } } - +#ifdef WIN32 + else if ((last = strrchr(alt_path, '\\'))) { + next = ++last; + ldup = strdup(last); + switch_assert(ldup); + switch_snprintf(next, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup); + if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { + path = alt_path; + } + } +#endif + if (!context->handle) { if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle));

1 0

[commit] r8519 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 22 May '08

22 May '08

Author: mikej Date: Wed May 21 21:57:04 2008 New Revision: 8519 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: fix local_stream with rates on windows (revert r8378) Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed May 21 21:57:04 2008 @@ -254,7 +254,7 @@ return SWITCH_STATUS_FALSE; } - alt_path = switch_mprintf("%s%s%d", path, SWITCH_PATH_SEPARATOR, handle->samplerate); + alt_path = switch_mprintf("%s/%d", path, handle->samplerate); switch_mutex_lock(globals.mutex); if ((source = switch_core_hash_find(globals.source_hash, alt_path))) {

1 0

[commit] r8518 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 May '08

22 May '08

Author: mikej Date: Wed May 21 21:24:13 2008 New Revision: 8518 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: var name scope masking and code before decl Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed May 21 21:24:13 2008 @@ -1231,14 +1231,14 @@ if ((profile->pflags & PFLAG_AGGRESSIVE_NAT_DETECTION)) { if (sip && sip->sip_via) { - const char *port = sip->sip_via->v_port; - const char *host = sip->sip_via->v_host; + const char *v_port = sip->sip_via->v_port; + const char *v_host = sip->sip_via->v_host; - if (host && sip->sip_via->v_received) { + if (v_host && sip->sip_via->v_received) { is_nat = "via received"; - } else if (host && strcmp(network_ip, host)) { + } else if (v_host && strcmp(network_ip, v_host)) { is_nat = "via host"; - } else if (port && atoi(port) != network_port) { + } else if (v_port && atoi(v_port) != network_port) { is_nat = "via port"; } } 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 Wed May 21 21:24:13 2008 @@ -465,8 +465,8 @@ if (contact->m_url) { const char *port = contact->m_url->url_port; char new_port[25] = ""; - display = contact->m_display; const char *contact_host = contact->m_url->url_host; + display = contact->m_display; if (is_nat) { reg_desc = "Registered(AUTO-NAT)";

1 0

[commit] r8517 - in freeswitch/trunk/src: . include
by Freeswitch SVN 22 May '08

22 May '08

Author: mikej Date: Wed May 21 21:08:30 2008 New Revision: 8517 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_session.c Log: add disable_app_log variable Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed May 21 21:08:30 2008 @@ -140,6 +140,7 @@ #define SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE "exec_after_bridge_app" #define SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE "exec_after_bridge_arg" #define SWITCH_MAX_FORWARDS_VARIABLE "max_forwards" +#define SWITCH_DISABLE_APP_LOG_VARIABLE "disable_app_log" #define SWITCH_SPEECH_KEY "speech" #define SWITCH_UUID_BRIDGE "uuid_bridge" #define SWITCH_BITS_PER_BYTE 8 Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed May 21 21:08:30 2008 @@ -1013,22 +1013,25 @@ const switch_application_interface_t *application_interface, const char *arg) { switch_app_log_t *log, *lp; switch_event_t *event; + const char *var; if (!arg) { arg = ""; } - log = switch_core_session_alloc(session, sizeof(*log)); + if (!(var = switch_channel_get_variable(session->channel, SWITCH_DISABLE_APP_LOG_VARIABLE)) || (!(switch_true(var)))) { + log = switch_core_session_alloc(session, sizeof(*log)); - log->app = switch_core_session_strdup(session, application_interface->interface_name); - log->arg = switch_core_session_strdup(session, arg); + log->app = switch_core_session_strdup(session, application_interface->interface_name); + log->arg = switch_core_session_strdup(session, arg); - for(lp = session->app_log; lp && lp->next; lp = lp->next); + for(lp = session->app_log; lp && lp->next; lp = lp->next); - if (lp) { - lp->next = log; - } else { - session->app_log = log; + if (lp) { + lp->next = log; + } else { + session->app_log = log; + } } if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r8516 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 21 May '08

21 May '08

Author: mikej Date: Wed May 21 19:12:38 2008 New Revision: 8516 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: don't deref NULL. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed May 21 19:12:38 2008 @@ -419,14 +419,17 @@ stream.write_function = http_stream_write; stream.raw_write_function = http_stream_raw_write; + if (!r || !r->uri) { + return FALSE; + } + if ((command = strstr(r->uri, "/api/"))) { command += 5; } else if ((command = strstr(r->uri, "/webapi/"))) { command += 8; html++; } else { - ret = FALSE; - goto end; + return FALSE; } if ((path_info = strchr(command, '/'))) { @@ -490,8 +493,7 @@ switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Domain", "%s", fs_domain); if (path_info) switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-Path-Info", "%s", path_info); - if (r->uri) - switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-URI", "%s", r->uri); + switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-URI", "%s", r->uri); if (r->query) switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-QUERY", "%s", r->query); if (r->host)

1 0

[commit] r8515 - freeswitch/trunk/src/mod/formats/mod_sndfile
by Freeswitch SVN 21 May '08

21 May '08

Author: mikej Date: Wed May 21 18:40:04 2008 New Revision: 8515 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Log: don't deref NULL. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Wed May 21 18:40:04 2008 @@ -323,18 +323,22 @@ char *p; struct format_map *map = switch_core_permanent_alloc(sizeof(*map)); switch_assert(map); - + map->ext = switch_core_permanent_strdup(info.extension); map->uext = switch_core_permanent_strdup(info.extension); map->format = info.format; - for (p = map->ext; *p; p++) { - *p = (char) tolower(*p); + if (map->ext) { + for (p = map->ext; *p; p++) { + *p = (char) tolower(*p); + } + switch_core_hash_insert(globals.format_hash, map->ext, map); } - for (p = map->uext; *p; p++) { - *p = (char) toupper(*p); + if (map->uext) { + for (p = map->uext; *p; p++) { + *p = (char) toupper(*p); + } + switch_core_hash_insert(globals.format_hash, map->uext, map); } - switch_core_hash_insert(globals.format_hash, map->ext, map); - switch_core_hash_insert(globals.format_hash, map->uext, map); supported_formats[len++] = (char *) info.extension; } format = info.format;

1 0