- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6769 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: brian Date: Thu Dec 13 15:19:59 2007 New Revision: 6769 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: move this Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 13 15:19:59 2007 @@ -56,14 +56,6 @@ </condition> </extension> - <extension name="add-group"> - <condition field="destination_number" expression="^81(\d{2})$"> - <action application="answer"/> - <action application="group" data="insert:$1:${sofia_contact(${sip_from_user}@${domain})}"/> - <action application="gentones" data="%(1000, 0, 640)"/> - </condition> - </extension> - <extension name="del-group"> <condition field="destination_number" expression="^80(\d{2})$"> <action application="answer"/> @@ -72,6 +64,14 @@ </condition> </extension> + <extension name="add-group"> + <condition field="destination_number" expression="^81(\d{2})$"> + <action application="answer"/> + <action application="group" data="insert:$1:${sofia_contact(${sip_from_user}@${domain})}"/> + <action application="gentones" data="%(1000, 0, 640)"/> + </condition> + </extension> + <extension name="call-group-simo"> <condition field="destination_number" expression="^82(\d{2})$"> <action application="bridge" data="${group(call:$1)}"/>

1 0

[commit] r6768 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: anthm Date: Thu Dec 13 15:12:42 2007 New Revision: 6768 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: add buffering to local_stream 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 Thu Dec 13 15:12:42 2007 @@ -31,7 +31,7 @@ */ #include <switch.h> /* for apr_pstrcat */ - +#define DEFAULT_PREBUFFER_SIZE 1024 * 64 SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load); SWITCH_MODULE_DEFINITION(mod_local_stream, mod_local_stream_load, NULL, NULL); @@ -66,6 +66,7 @@ uint32_t prebuf; char *timer_name; local_stream_context_t *context_list; + int total; switch_dir_t *dir_handle; switch_mutex_t *mutex; switch_memory_pool_t *pool; @@ -80,13 +81,22 @@ char file_buf[128] = "", path_buf[512] = ""; switch_timer_t timer = {0}; int fd = -1; - + switch_buffer_t *audio_buffer; + switch_byte_t *dist_buf; + switch_size_t used; + if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); return NULL; } + if (!source->prebuf) { + source->prebuf = DEFAULT_PREBUFFER_SIZE; + } + switch_buffer_create_dynamic(&audio_buffer, 1024, source->prebuf + 10, 0); + dist_buf = switch_core_alloc(source->pool, source->prebuf + 10); + while(RUNNING) { const char *fname; @@ -155,13 +165,27 @@ break; } - switch_mutex_lock(source->mutex); - for (cp = source->context_list; cp; cp = cp->next) { - switch_mutex_lock(cp->audio_mutex); - switch_buffer_write(cp->audio_buffer, abuf, olen * 2); - switch_mutex_unlock(cp->audio_mutex); + switch_buffer_write(audio_buffer, abuf, olen * 2); + used = switch_buffer_inuse(audio_buffer); + + if (!source->total) { + if (used >= source->prebuf) { + switch_buffer_read(audio_buffer, abuf, olen * 2); + } + } else { + int dist_len = ((source->prebuf * 95) / 100); + + if (used >= dist_len) { + switch_buffer_read(audio_buffer, dist_buf, used); + switch_mutex_lock(source->mutex); + for (cp = source->context_list; cp; cp = cp->next) { + switch_mutex_lock(cp->audio_mutex); + switch_buffer_write(cp->audio_buffer, dist_buf, used); + switch_mutex_unlock(cp->audio_mutex); + } + switch_mutex_unlock(source->mutex); + } } - switch_mutex_unlock(source->mutex); } } @@ -238,6 +262,7 @@ switch_mutex_lock(source->mutex); context->next = source->context_list; source->context_list = context; + source->total++; switch_mutex_unlock(source->mutex); end: @@ -261,6 +286,7 @@ } last = cp; } + context->source->total--; switch_mutex_unlock(context->source->mutex); switch_buffer_destroy(&context->audio_buffer); @@ -278,17 +304,20 @@ switch_size_t bytes = 0; size_t need = *len * 2; + switch_mutex_lock(context->audio_mutex); if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) { *len = bytes / 2; } else { - if (need > 2560) { - need = 2560; + if (need > context->source->samples * 2) { + need = context->source->samples * 2; } - memset(data, 255, need); - *len = need / 2; + + memset(data, 0, need); + *len = need / 2; } switch_mutex_unlock(context->audio_mutex); + handle->sample_count += *len; return SWITCH_STATUS_SUCCESS; } @@ -351,7 +380,7 @@ source->interval = 20; source->channels = 1; source->timer_name = "soft"; - + source->prebuf = DEFAULT_PREBUFFER_SIZE; for (param = switch_xml_child(directory, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name");

1 0

[commit] r6767 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: anthm Date: Thu Dec 13 15:08:53 2007 New Revision: 6767 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: stfu voicemuppet Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu Dec 13 15:08:53 2007 @@ -110,6 +110,9 @@ struct curl_slist *slist = NULL; long httpRes = 0; struct curl_slist *headers = NULL; + char hostname[256] = ""; + + gethostname(hostname, sizeof(hostname)); if (!binding) { return NULL; @@ -125,7 +128,8 @@ return xml; } - if (!(data = switch_mprintf("section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s", + if (!(data = switch_mprintf("hostname=%s&section=%s&tag_name=%s&key_name=%s&key_value=%s%s%s", + hostname, section, tag_name ? tag_name : "", key_name ? key_name : "",

1 0

[commit] r6766 - freeswitch/trunk/src
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: mikej Date: Thu Dec 13 14:15:12 2007 New Revision: 6766 Modified: freeswitch/trunk/src/switch_rtp.c Log: use switch_port_t in release_port Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Dec 13 14:15:12 2007 @@ -310,7 +310,7 @@ return END_PORT; } -static void release_port(const char *host, int port) +static void release_port(const char *host, switch_port_t port) { switch_core_port_allocator_t *alloc = NULL;

1 0

[commit] r6765 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: brian Date: Thu Dec 13 14:07:07 2007 New Revision: 6765 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: fix voicemail macros Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Thu Dec 13 14:07:07 2007 @@ -54,7 +54,7 @@ <match> <action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="say" data="1" method="pronounced" type="items"/> - <action function="play-file" data="voicemail/vm-$2.wav"/> + <action function="play-file" data="voicemail/vm-new.wav"/> <action function="play-file" data="voicemail/vm-message.wav"/> <action function="play-file" data="voicemail/vm-in_folder.wav"/> </match> @@ -147,23 +147,23 @@ </macro> <macro name="voicemail_listen_file_check"> - <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> + <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <match> - <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$2" method="pronounced" type="name_spelled"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-save_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$3" method="pronounced" type="name_spelled"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-delete_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$4" method="pronounced" type="name_spelled"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-forward_to_email.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$4" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-return_call.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$5" method="pronounced" type="name_spelled"/> </match> </input> </macro> @@ -200,23 +200,6 @@ </input> </macro> - <macro name="marked-urgent"> - <input pattern="^(.*)$"> - <match> - <action function="play-file" data="voicemail/vm-urgent.wav"/> - <action function="play-file" data="voicemail/vm-message.wav"/> - </match> - </input> - </macro> - - <macro name="saved"> - <input pattern="^(.*)$"> - <match> - <action function="play-file" data="voicemail/vm-saved.wav"/> - </match> - </input> - </macro> - <macro name="voicemail_greeting_selected"> <input pattern="^(.*)$"> <match> @@ -269,20 +252,38 @@ </match> </input> </macro> - - <macro name="voicemail_ack"> - <input pattern="^(.*)$"> +  + <macro name="voicemail_ack"> + <input pattern="^(deleted)$"> + <match> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-$1.wav"/> + </match> + </input> + <input pattern="^(saved)$"> <match> <action function="play-file" data="voicemail/vm-message.wav"/> <action function="play-file" data="voicemail/vm-$1.wav"/> </match> </input> + <input pattern="^(emailed)$"> + <match> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-saved.wav"/> + </match> + </input> + <input pattern="^(marked-urgent)$"> + <match> + <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-saved.wav"/> + </match> + </input> </macro> <macro name="voicemail_say_date"> <input pattern="^(.*)$"> <match> - <action function="say" data="$strftime($1|%A, %B %d %Y, %I %M %p)" method="pronounced" type="current_date_time"/> + <action function="say" data="$1" method="pronounced" type="current_date_time"/> </match> </input> </macro>

1 0

[commit] r6760 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: brian Date: Thu Dec 13 12:48:05 2007 New Revision: 6760 Modified: freeswitch/trunk/conf/autoload_configs/sofia.conf.xml Log: add log-level to sofia global settings Modified: freeswitch/trunk/conf/autoload_configs/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/sofia.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/sofia.conf.xml Thu Dec 13 12:48:05 2007 @@ -1,4 +1,8 @@ <configuration name="sofia.conf" description="sofia Endpoint"> + <global_settings> + <param name="log-level" value="0"/> + </global_settings> + <profiles> <X-PRE-PROCESS cmd="include" data="../sip_profiles/*.xml"/> </profiles>

1 0

[commit] r6759 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: brian Date: Thu Dec 13 12:33:01 2007 New Revision: 6759 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: look extension to extension intercom Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 13 12:33:01 2007 @@ -85,6 +85,15 @@ </condition> </extension> + <extension name="extension-intercom"> + <condition field="destination_number" expression="^8(10[01][0-9])$"> + <action application="set" data="dialed_ext=$1"/> + <action application="set" data="sip_h_Call-Info=<sip:$${local_ip_v4}>;answer-after=0"/> + <action application="set" data="sip_auto_answer=true"/> + <action application="set" data="export_vars=sip_h_Call-Info,sip_auto_answer"/> + <action application="bridge" data="USER/${dialed_ext}@$${domain}"/> + </condition> + </extension> <!-- if the calling party is the called party, go to their VM

1 0

[commit] r6758 - freeswitch/trunk/src
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: anthm Date: Thu Dec 13 12:25:33 2007 New Revision: 6758 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Dec 13 12:25:33 2007 @@ -335,8 +335,7 @@ alloc = switch_core_hash_find(alloc_hash, ip); if (!alloc) { if (switch_core_port_allocator_new(START_PORT, END_PORT, SPF_EVEN, &alloc) != SWITCH_STATUS_SUCCESS) { - port = 0; - goto end; + abort(); } switch_core_hash_insert(alloc_hash, ip, alloc); @@ -346,7 +345,6 @@ port = 0; } - end: switch_mutex_unlock(port_lock); return port; }

1 0

[commit] r6757 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: anthm Date: Thu Dec 13 12:17:28 2007 New Revision: 6757 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/data.c Log: safe_free Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/data.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/data.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/data.c Thu Dec 13 12:17:28 2007 @@ -42,6 +42,7 @@ #include "token.h" +#define safe_free(it) if (it) {free(it);it=NULL;} /********************************************************************* ** List *********************************************************************/ @@ -69,10 +70,10 @@ if (sl->autofree) { unsigned int i; for (i = sl->size; i > 0; --i) - free(sl->item[i-1]); + safe_free(sl->item[i-1]); } - free(sl->item); + safe_free(sl->item); } sl->item = NULL; sl->size = 0; @@ -87,7 +88,7 @@ if (sl->item) { unsigned int i; for (i = sl->size; i > 0; --i) - free(sl->item[i-1]); + safe_free(sl->item[i-1]); } } @@ -215,7 +216,7 @@ /* ************** Implement the static buffers ***/ } else - free(buf->data); + safe_free(buf->data); buf->size=0; buf->staticid=0; @@ -348,11 +349,11 @@ if (t->size) for (i=t->size;i>0;i--) { - free(t->item[i-1].name); - free(t->item[i-1].value); + safe_free(t->item[i-1].name); + safe_free(t->item[i-1].value); }; - free(t->item); + safe_free(t->item); } TableInit(t); @@ -382,12 +383,12 @@ if (TableFindIndex(t,name,&i)) { - free(t->item[i].value); + safe_free(t->item[i].value); if (value) t->item[i].value=strdup(value); else { - free(t->item[i].name); + safe_free(t->item[i].name); if (--t->size>0) t->item[i]=t->item[t->size]; }; @@ -521,7 +522,7 @@ while (pz) { npz=pz->next; - free(pz); + safe_free(pz); pz=npz; }; }

1 0

[commit] r6756 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: brian Date: Thu Dec 13 12:17:15 2007 New Revision: 6756 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml Log: grrr Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Thu Dec 13 12:17:15 2007 @@ -6,7 +6,7 @@ name can be a file name, function name or 'all' value is one or more of debug,info,notice,warning,err,crit,alert,all --> - <map name="all" value="debug,info,notice,warning,err,crit,alert"/> + <map name="all" value="info,notice,warning,err,crit,alert"/> </mappings> <settings>

1 0