October 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10205 - freeswitch/trunk/src
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: brian Date: Thu Oct 30 13:37:52 2008 New Revision: 10205 Modified: freeswitch/trunk/src/switch_core_file.c Log: revert previous change so voicemail length check works Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Thu Oct 30 13:37:52 2008 @@ -285,8 +285,6 @@ switch_core_destroy_memory_pool(&fh->memory_pool); } - memset(fh, 0, sizeof(*fh)); - return status; }

1 0

[commit] r10204 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 12:40:54 2008 New Revision: 10204 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: whatcha talking bout 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 Thu Oct 30 12:40:54 2008 @@ -1215,7 +1215,7 @@ } } switch_url_decode(route); - route_uri = strdup(route); + route_uri = route; if ((p = strchr(route_uri, ','))) { while (*(p-1) == ' ') { p--; @@ -1240,7 +1240,6 @@ switch_safe_free(contact); switch_safe_free(id); switch_safe_free(route); - switch_safe_free(route_uri); if (ext_profile) { sofia_glue_release_profile(ext_profile); }

1 0

[commit] r10203 - freeswitch/trunk/src
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 11:18:07 2008 New Revision: 10203 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix typo thanks MichaelGG Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Oct 30 11:18:07 2008 @@ -1639,7 +1639,7 @@ if (!(x_caller_profile = switch_xml_add_child_d(x_o, "originatee_caller_profile", off++))) { goto error; } - switch_ivr_set_xml_profile_data(x_caller_profile, caller_profile->originatee_caller_profile, 0); + switch_ivr_set_xml_profile_data(x_caller_profile, cp, 0); } }

1 0

[commit] r10202 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 08:46:09 2008 New Revision: 10202 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_core_timer.c Log: patch for FSCORE-205 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 Thu Oct 30 08:46:09 2008 @@ -308,10 +308,30 @@ static void deactivate_audio_device(void) { switch_mutex_lock(globals.device_lock); + /* LOCKED ************************************************************************************************** */ + if (globals.audio_stream) { CloseAudioStream(globals.audio_stream); globals.audio_stream = NULL; } + + if (globals.read_codec.implementation) { + switch_core_codec_destroy(&globals.read_codec); + } + + if (globals.write_codec.implementation) { + switch_core_codec_destroy(&globals.write_codec); + } + + if (globals.timer.timer_interface) { + switch_core_timer_destroy(&globals.timer); + } + + if (globals.hold_timer.timer_interface) { + switch_core_timer_destroy(&globals.hold_timer); + } + + /* UNLOCKED ************************************************************************************************* */ switch_mutex_unlock(globals.device_lock); } @@ -1142,13 +1162,17 @@ codec_ms = globals.codec_ms; } - if (switch_core_codec_init(&globals.read_codec, - "L16", - NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, - NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); - return SWITCH_STATUS_FALSE; - } else { + if (!globals.read_codec.implementation) { + if (switch_core_codec_init(&globals.read_codec, + "L16", + NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } + } + + if (!globals.write_codec.implementation) { if (switch_core_codec_init(&globals.write_codec, "L16", NULL, @@ -1160,25 +1184,29 @@ } } - if (switch_core_timer_init(&globals.timer, - globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, - module_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); - switch_core_codec_destroy(&globals.read_codec); - switch_core_codec_destroy(&globals.write_codec); - return SWITCH_STATUS_FALSE; + if (!globals.timer.timer_interface) { + if (switch_core_timer_init(&globals.timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + return SWITCH_STATUS_FALSE; + } } - if (switch_core_timer_init(&globals.hold_timer, + if (!globals.hold_timer.timer_interface) { + if (switch_core_timer_init(&globals.hold_timer, globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, - module_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n"); - switch_core_codec_destroy(&globals.read_codec); - switch_core_codec_destroy(&globals.write_codec); - switch_core_timer_destroy(&globals.timer); - return SWITCH_STATUS_FALSE; + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + switch_core_timer_destroy(&globals.timer); + return SWITCH_STATUS_FALSE; + } } - + globals.read_frame.rate = sample_rate; globals.read_frame.codec = &globals.read_codec; @@ -1204,7 +1232,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device!\n"); switch_core_codec_destroy(&globals.read_codec); switch_core_codec_destroy(&globals.write_codec); - + switch_core_timer_destroy(&globals.timer); + switch_core_timer_destroy(&globals.hold_timer); return SWITCH_STATUS_FALSE; } } Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Thu Oct 30 08:46:09 2008 @@ -285,6 +285,8 @@ switch_core_destroy_memory_pool(&fh->memory_pool); } + memset(fh, 0, sizeof(*fh)); + return status; } Modified: freeswitch/trunk/src/switch_core_timer.c ============================================================================== --- freeswitch/trunk/src/switch_core_timer.c (original) +++ freeswitch/trunk/src/switch_core_timer.c Thu Oct 30 08:46:09 2008 @@ -125,6 +125,8 @@ switch_core_destroy_memory_pool(&timer->memory_pool); } + memset(timer, 0, sizeof(*timer)); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10201 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Wed Oct 29 23:12:52 2008 New Revision: 10201 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: add path thing for mwi 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 Oct 29 23:12:52 2008 @@ -1193,7 +1193,8 @@ nua_handle_t *nh; struct mwi_helper *h = (struct mwi_helper *) pArg; sofia_profile_t *ext_profile = NULL, *profile = h->profile; - + char *route = NULL, *route_uri = NULL; + char *p; if (profile_name && strcasecmp(profile_name, h->profile->name)) { if ((ext_profile = sofia_glue_find_profile(profile_name))) { @@ -1204,17 +1205,42 @@ id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); contact = sofia_glue_get_url_from_contact(o_contact, 1); + if ((route = strstr(o_contact, ";fs_path="))) { + route = strdup(route + 9); + + for (p = route; p && *p ; p++) { + if (*p == '>' || *p == ';') { + *p = '\0'; + break; + } + } + switch_url_decode(route); + route_uri = strdup(route); + if ((p = strchr(route_uri, ','))) { + while (*(p-1) == ' ') { + p--; + } + if (*p) { + *p = '\0'; + } + } + } + + if (!route_uri && strstr(o_contact, ";fs_nat")) { + route_uri = contact; + } nh = nua_handle(profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(h->profile->url), TAG_END()); nua_notify(nh, NUTAG_NEWSUB(1), - TAG_IF(strstr(o_contact, ";fs_nat"), NUTAG_PROXY(contact)), + TAG_IF(route_uri, NUTAG_PROXY(route_uri)), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); switch_safe_free(contact); switch_safe_free(id); - + switch_safe_free(route); + switch_safe_free(route_uri); if (ext_profile) { sofia_glue_release_profile(ext_profile); }

1 0

[commit] r10200 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: mikej Date: Wed Oct 29 22:27:22 2008 New Revision: 10200 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: bug found by pyite in new filter feature. 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 Wed Oct 29 22:27:22 2008 @@ -177,8 +177,8 @@ if (listener->event_queue) { while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - if (!pop) continue; switch_event_t *pevent = (switch_event_t *) pop; + if (!pop) continue; switch_event_destroy(&pevent); } } @@ -214,7 +214,7 @@ switch_mutex_lock(listen_list.mutex); while(lp) { - uint8_t send = 0; + int send = 0; l = lp; lp = lp->next; @@ -245,7 +245,7 @@ send = 0; switch_mutex_lock(l->filter_mutex); - for (hp = l->filters->headers; hp; hp = hp->next) { + for (hp = l->filters->headers; hp && !send; hp = hp->next) { if ((hval = switch_event_get_header(event, hp->name))) { if (*hp->value == '/') { switch_regex_t *re = NULL;

1 0

[commit] r10199 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Wed Oct 29 20:52:11 2008 New Revision: 10199 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: apply patch from MODAPP-156 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 Oct 29 20:52:11 2008 @@ -245,22 +245,24 @@ } } - if (!(mypass1 && mypass2)) { + if (!switch_strlen_zero(mypass2) && !strcasecmp(mypass2, "user-choose")) { + mypass2 = NULL; + } + + if (!mypass1) { r->requestInfo.user = strdup(user); goto authed; } else { - if (mypass1) { - if (at) { - switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); - } else { - switch_snprintf(z, sizeof(z), "%s:%s", user, mypass1); - } - Base64Encode(z, t); + if (at) { + switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); + } else { + switch_snprintf(z, sizeof(z), "%s:%s", user, mypass1); + } + Base64Encode(z, t); - if (!strcmp(p, t)) { - r->requestInfo.user = strdup(box ? box : user); - goto authed; - } + if (!strcmp(p, t)) { + r->requestInfo.user = strdup(box ? box : user); + goto authed; } if (mypass2) { @@ -278,18 +280,16 @@ } if (box) { - if (mypass1) { - if (at) { - switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); - } else { - switch_snprintf(z, sizeof(z), "%s:%s", box, mypass1); - } - Base64Encode(z, t); + if (at) { + switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); + } else { + switch_snprintf(z, sizeof(z), "%s:%s", box, mypass1); + } + Base64Encode(z, t); - if (!strcmp(p, t)) { - r->requestInfo.user = strdup(box); - goto authed; - } + if (!strcmp(p, t)) { + r->requestInfo.user = strdup(box); + goto authed; } if (mypass2) {

1 0

[commit] r10198 - in freeswitch/trunk/src: . mod/event_handlers/mod_event_socket
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Wed Oct 29 20:39:55 2008 New Revision: 10198 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_event.c Log: add event socket listener filters filter <header-name> <header-value> filter <header-name> /<regexp>/ filter delete <header-name> filter delete all once even one filter is enabled you must pass a filter condition to get any events. which events are still limited by the events <event list> as always. 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 Wed Oct 29 20:39:55 2008 @@ -63,6 +63,7 @@ switch_memory_pool_t *pool; event_format_t format; switch_mutex_t *flag_mutex; + switch_mutex_t *filter_mutex; uint32_t flags; switch_log_level_t level; char *ebuf; @@ -79,6 +80,7 @@ switch_sockaddr_t *sa; char remote_ip[50]; switch_port_t remote_port; + switch_event_t *filters; struct listener *next; }; @@ -189,7 +191,11 @@ switch_thread_rwlock_unlock((*listener)->rwlock); switch_core_hash_destroy(&(*listener)->event_hash); switch_core_destroy_memory_pool(&(*listener)->pool); - + switch_mutex_lock((*listener)->filter_mutex); + if ((*listener)->filters) { + switch_event_destroy(&(*listener)->filters); + } + switch_mutex_unlock((*listener)->filter_mutex); *listener = NULL; } @@ -223,7 +229,8 @@ expire_listener(&l); continue; } - + + if (l->event_list[SWITCH_EVENT_ALL]) { send = 1; } else if ((l->event_list[event->event_id])) { @@ -232,6 +239,29 @@ } } + if (send && l->filters) { + switch_event_header_t *hp; + const char *hval; + + send = 0; + switch_mutex_lock(l->filter_mutex); + for (hp = l->filters->headers; hp; hp = hp->next) { + if ((hval = switch_event_get_header(event, hp->name))) { + if (*hp->value == '/') { + switch_regex_t *re = NULL; + int ovector[30]; + send = switch_regex_perform(hval, hp->value, &re, ovector, sizeof(ovector) / sizeof(ovector[0])); + switch_regex_safe_free(re); + } else { + if (!strcasecmp(hp->value, hval)) { + send = 1; + } + } + } + } + switch_mutex_unlock(l->filter_mutex); + } + if (send && switch_test_flag(l, LFLAG_MYEVENTS)) { char *uuid = switch_event_get_header(event, "unique-id"); if (!uuid || strcmp(uuid, switch_core_session_get_uuid(l->session))) { @@ -341,6 +371,8 @@ listener->session = session; switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); switch_set_flag(listener, LFLAG_AUTHED); for (x = 1; x < argc; x++) { @@ -520,6 +552,8 @@ listener->pool = pool; listener->format = EVENT_FORMAT_PLAIN; switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); switch_set_flag(listener, LFLAG_AUTHED); switch_set_flag(listener, LFLAG_STATEFUL); @@ -1049,6 +1083,44 @@ goto done; } + if (!strncasecmp(cmd, "filter ", 7)) { + char *header_name = cmd + 7; + char *header_val; + + strip_cr(header_name); + + while(header_name && *header_name && *header_name == ' ') header_name++; + + if (!(header_val = strchr(header_name, ' '))) { + switch_snprintf(reply, reply_len, "-ERR invalid syntax"); + goto done; + } + + *header_val++ = '\0'; + + + switch_mutex_lock(listener->filter_mutex); + if (!listener->filters) { + switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + } + + if (!strcasecmp(header_name, "delete")) { + if (!strcasecmp(header_val, "all")) { + switch_event_destroy(&listener->filters); + switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + } else { + switch_event_del_header(listener->filters, header_val); + } + switch_snprintf(reply, reply_len, "+OK filter deleted. [%s]", header_val); + } else { + switch_event_add_header_string(listener->filters, SWITCH_STACK_BOTTOM, header_name, header_val); + switch_snprintf(reply, reply_len, "+OK filter added. [%s]=[%s]", header_name, header_val); + } + switch_mutex_unlock(listener->filter_mutex); + + goto done; + } + if (listener->session || !strncasecmp(cmd, "myevents ", 9)) { switch_channel_t *channel = NULL; @@ -1651,7 +1723,11 @@ switch_thread_rwlock_wrlock(listener->rwlock); flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE); - + switch_mutex_lock(listener->filter_mutex); + if (listener->filters) { + switch_event_destroy(&listener->filters); + } + switch_mutex_unlock(listener->filter_mutex); if (listener->sock) { char disco_buf[512] = ""; const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; @@ -1831,6 +1907,8 @@ listener_pool = NULL; listener->format = EVENT_FORMAT_PLAIN; switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); switch_socket_addr_get(&listener->sa, SWITCH_TRUE, listener->sock); switch_get_addr(listener->remote_ip, sizeof(listener->remote_ip), listener->sa); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Oct 29 20:39:55 2008 @@ -605,13 +605,17 @@ SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, const char *header_name) { - switch_event_header_t *hp, *lp = NULL; + switch_event_header_t *hp, *lp = NULL, *tp; switch_status_t status = SWITCH_STATUS_FALSE; int x = 0; - for (hp = event->headers; hp; hp = hp->next) { + tp = event->headers; + while (tp) { + hp = tp; + tp = tp->next; + x++; switch_assert(x < 1000); - if (!strcmp(header_name, hp->name)) { + if (!strcasecmp(header_name, hp->name)) { if (lp) { lp->next = hp->next; } else { @@ -627,9 +631,9 @@ FREE(hp); } status = SWITCH_STATUS_SUCCESS; - break; + } else { + lp = hp; } - lp = hp; } return status;

1 0

[commit] r10197 - freeswitch/trunk/conf/dialplan/default
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: brian Date: Wed Oct 29 19:15:07 2008 New Revision: 10197 Added: freeswitch/trunk/conf/dialplan/default/01_example.com.xml - copied unchanged from r10196, /freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Removed: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Log: fix FSCORE-211

1 0

[commit] r10196 - in freeswitch/trunk/conf: . dialplan/default directory/default
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: brian Date: Wed Oct 29 19:14:22 2008 New Revision: 10196 Added: freeswitch/trunk/conf/directory/default/example.com.xml - copied unchanged from r10189, /freeswitch/trunk/conf/directory/default/provider.com.xml Removed: freeswitch/trunk/conf/directory/default/provider.com.xml Modified: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml freeswitch/trunk/conf/vars.xml Log: fix FSCORE-211 Modified: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default/01_provider.com.xml (original) +++ freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Wed Oct 29 19:14:22 2008 @@ -1,6 +1,6 @@ <include> - <extension name="local.provider.com"> + <extension name="local.example.com"> <condition field="${toll_allow}" expression="local"/> <condition field="destination_number" expression="^(\d{7})$"> <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> @@ -9,7 +9,7 @@ </condition> </extension> - <extension name="domestic.provider.com"> + <extension name="domestic.example.com"> <condition field="${toll_allow}" expression="domestic"/> <condition field="destination_number" expression="^(\d{11})$"> <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> @@ -18,7 +18,7 @@ </condition> </extension> - <extension name="international.provider.com"> + <extension name="international.example.com"> <condition field="${toll_allow}" expression="international"/> <condition field="destination_number" expression="^(011\d{10+})$"> <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Oct 29 19:14:22 2008 @@ -120,13 +120,13 @@ Setting up your default sip provider is easy. Below are some values that should work in most cases. - These are for conf/directory/default/provider.com.xml + These are for conf/directory/default/example.com.xml --> - <X-PRE-PROCESS cmd="set" data="default_provider=provider.com"/> + <X-PRE-PROCESS cmd="set" data="default_provider=example.com"/> <X-PRE-PROCESS cmd="set" data="default_provider_username=joeuser"/> <X-PRE-PROCESS cmd="set" data="default_provider_password=password"/> - <X-PRE-PROCESS cmd="set" data="default_provider_from_domain=provider.com"/> + <X-PRE-PROCESS cmd="set" data="default_provider_from_domain=example.com"/>  <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/> <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/>

1 0