- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7597 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 12 Feb '08

12 Feb '08

Author: brian Date: Tue Feb 12 15:03:09 2008 New Revision: 7597 Modified: freeswitch/trunk/conf/directory/default/intelefone.net.noload Log: woops Modified: freeswitch/trunk/conf/directory/default/intelefone.net.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/intelefone.net.noload (original) +++ freeswitch/trunk/conf/directory/default/intelefone.net.noload Tue Feb 12 15:03:09 2008 @@ -13,7 +13,7 @@ <param name="proxy" value="208.64.252.122"/> <param name="register-proxy" value="208.64.252.122"/> <param name="retry_seconds" value="30"/> - <param name="extension" value="18186981869"/> + <param name="extension" value="%%USERNAME%%"/> <param name="context" value="public"/> </gateway> </gateways>

1 0

[commit] r7596 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 12 Feb '08

12 Feb '08

Author: brian Date: Tue Feb 12 15:02:46 2008 New Revision: 7596 Added: freeswitch/trunk/conf/directory/default/intelefone.net.noload Log: grrr.. LOVE SIP! This is an example of a provider doing things weird but this works for said provider. Added: freeswitch/trunk/conf/directory/default/intelefone.net.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/intelefone.net.noload Tue Feb 12 15:02:46 2008 @@ -0,0 +1,25 @@ + +<include> + <user id="%%AUTHUSERNAME%%"> + <gateways> + <gateway name="sip.intelefone.net"> + <param name="from-user" value="%%USERNAME%%"/> + <param name="from-domain" value="sip.intelefone.net"/> + <param name="username" value="%%AUTHUSERNAME%%"/> + <param name="realm" value="U-Phone"/> + <param name="password" value="%%PASSWORD%%"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="true"/> + <param name="proxy" value="208.64.252.122"/> + <param name="register-proxy" value="208.64.252.122"/> + <param name="retry_seconds" value="30"/> + <param name="extension" value="18186981869"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="%%PASSWORD%%"/> + </params> + </user> +</include> +

1 0

[commit] r7595 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Feb '08

12 Feb '08

Author: brian Date: Tue Feb 12 00:31:47 2008 New Revision: 7595 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 Feb 12 00:31:47 2008 @@ -282,8 +282,11 @@ <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> <!-- <extension name="refer"> - <condition field="${sip_refer_to}" expression="<sip:${destination_number}@$${domain}>"/> - <condition field="${sip_refer_to}" expression="<sip:(.*)@(.*)>"> + <condition field="${sip_refer_to}"> + <expression><![CDATA[<sip:${destination_number}@$${domain}>]]></expression> + </condition> + <condition field="${sip_refer_to}"> + <expression><![CDATA[<sip:(.*)@(.*)>]]></expression> <action application="set" data="refer_user=$1"/> <action application="set" data="refer_domain=$2"/> <action application="info"/>

1 0

[commit] r7594 - freeswitch/trunk/src
by Freeswitch SVN 12 Feb '08

12 Feb '08

Author: anthm Date: Mon Feb 11 20:27:50 2008 New Revision: 7594 Modified: freeswitch/trunk/src/switch_core_memory.c Log: add per-pool mutexes option Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Mon Feb 11 20:27:50 2008 @@ -35,6 +35,7 @@ #include <switch.h> #include "private/switch_core_pvt.h" /*#define LOCK_MORE*/ +/*#define PER_POOL_LOCK 1*/ static struct { switch_mutex_t *mem_lock; @@ -256,8 +257,30 @@ if (switch_queue_trypop(memory_manager.pool_recycle_queue, &pop) == SWITCH_STATUS_SUCCESS) { *pool = (switch_memory_pool_t *) pop; } else { +#ifdef PER_POOL_LOCK + apr_allocator_t *my_allocator = NULL; + apr_thread_mutex_t *my_mutex; + + if ((apr_allocator_create(&my_allocator)) != APR_SUCCESS) { + return SWITCH_STATUS_MEMERR; + } + + if ((apr_pool_create_ex(pool, NULL, NULL, my_allocator)) != APR_SUCCESS) { + apr_allocator_destroy(my_allocator); + my_allocator = NULL; + return SWITCH_STATUS_MEMERR; + } + + if ((apr_thread_mutex_create(&my_mutex, APR_THREAD_MUTEX_DEFAULT, *pool)) != APR_SUCCESS) { + return SWITCH_STATUS_MEMERR; + } + + apr_allocator_mutex_set(my_allocator, my_mutex); + apr_allocator_owner_set(my_allocator, *pool); +#else apr_pool_create(pool, NULL); switch_assert(*pool != NULL); +#endif } #ifdef DEBUG_ALLOC2 @@ -358,10 +381,14 @@ } pool = (switch_memory_pool_t *) pop; +#if PER_POOL_LOCK + apr_pool_destroy(pool); +#else apr_pool_clear(pool); if (switch_queue_trypush(memory_manager.pool_recycle_queue, pool) != SWITCH_STATUS_SUCCESS) { apr_pool_destroy(pool); } +#endif pool = NULL; x--; } @@ -403,12 +430,35 @@ { switch_thread_t *thread; switch_threadattr_t *thd_attr; - +#ifdef PER_POOL_LOCK + apr_allocator_t *my_allocator = NULL; + apr_thread_mutex_t *my_mutex; +#endif memset(&memory_manager, 0, sizeof(memory_manager)); +#ifdef PER_POOL_LOCK + if ((apr_allocator_create(&my_allocator)) != APR_SUCCESS) { + abort(); + } + + if ((apr_pool_create_ex(&memory_manager.memory_pool, NULL, NULL, my_allocator)) != APR_SUCCESS) { + apr_allocator_destroy(my_allocator); + my_allocator = NULL; + abort(); + } + + if ((apr_thread_mutex_create(&my_mutex, APR_THREAD_MUTEX_DEFAULT, memory_manager.memory_pool)) != APR_SUCCESS) { + abort(); + } + + apr_allocator_mutex_set(my_allocator, my_mutex); + apr_allocator_owner_set(my_allocator, memory_manager.memory_pool); +#else apr_pool_create(&memory_manager.memory_pool, NULL); switch_assert(memory_manager.memory_pool != NULL); +#endif + switch_mutex_init(&memory_manager.mem_lock, SWITCH_MUTEX_NESTED, memory_manager.memory_pool); switch_queue_create(&memory_manager.pool_queue, 50000, memory_manager.memory_pool); switch_queue_create(&memory_manager.pool_recycle_queue, 50000, memory_manager.memory_pool);

1 0

[commit] r7593 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: anthm Date: Mon Feb 11 18:55:18 2008 New Revision: 7593 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: add silly workaround to compensate for xml catch-22 with expressions with <> in them Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Mon Feb 11 18:55:18 2008 @@ -46,7 +46,7 @@ static int parse_exten(switch_core_session_t *session, switch_caller_profile_t *caller_profile, switch_xml_t xexten, switch_caller_extension_t **extension) { - switch_xml_t xcond, xaction; + switch_xml_t xcond, xaction, xexpression; switch_channel_t *channel = switch_core_session_get_channel(session); char *exten_name = (char *) switch_xml_attr_soft(xexten, "name"); int proceed = 0; @@ -66,8 +66,12 @@ field = (char *) switch_xml_attr(xcond, "field"); - expression = (char *) switch_xml_attr_soft(xcond, "expression"); - + if ((xexpression = switch_xml_child(xcond, "expression"))) { + expression = switch_str_nil(xexpression->txt); + } else { + expression = (char *) switch_xml_attr_soft(xcond, "expression"); + } + if ((expression_expanded = switch_channel_expand_variables(channel, expression)) == expression) { expression_expanded = NULL; } else {

1 0

[commit] r7592 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: brian Date: Mon Feb 11 18:26:56 2008 New Revision: 7592 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: clean up Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Feb 11 18:26:56 2008 @@ -63,18 +63,6 @@ <action application="db" data="insert/last_dial/global/${uuid}"/> </condition> </extension> -  -  <extension name="eavesdrop"> <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$"> @@ -165,26 +153,6 @@ </extension>  -  - -  <extension name="conferences"> @@ -272,8 +240,6 @@ </condition> </extension> - - <extension name="delay_echo"> <condition field="destination_number" expression="^9995$"> <action application="answer"/> @@ -314,7 +280,36 @@ </extension> <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> - +  +  +  <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> <action application="unset" data="sip_secure_media"/>

1 0

[commit] r7591 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: brian Date: Mon Feb 11 17:21:36 2008 New Revision: 7591 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: adding neat example of how to override the RURI on an outbound sip request to a registered user Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Feb 11 17:21:36 2008 @@ -65,15 +65,15 @@ </extension>   <extension name="eavesdrop"> @@ -165,6 +165,26 @@ </extension>  +  + +  <extension name="conferences">

1 0

[commit] r7590 - in freeswitch/trunk: build conf conf/autoload_configs conf/dialplan
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: brian Date: Mon Feb 11 16:52:38 2008 New Revision: 7590 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/autoload_configs/modules.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/vars.xml Log: add video examples to default config Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Mon Feb 11 16:52:38 2008 @@ -10,6 +10,7 @@ applications/mod_limit applications/mod_expr applications/mod_esf +applications/mod_fsv #applications/mod_soundtouch #applications/mod_rss #asr_tts/mod_cepstral @@ -21,7 +22,7 @@ codecs/mod_amr codecs/mod_g729 codecs/mod_gsm -#codecs/mod_h26x +codecs/mod_h26x #codecs/mod_voipcodecs codecs/mod_ilbc codecs/mod_l16 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Mon Feb 11 16:52:38 2008 @@ -44,6 +44,7 @@ <load module="mod_voicemail"/> <load module="mod_limit"/> <load module="mod_esf"/> + <load module="mod_fsv"/>   Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Feb 11 16:52:38 2008 @@ -238,6 +238,22 @@ </condition> </extension> + <extension name="video_record"> + <condition field="destination_number" expression="^9993$"> + <action application="answer"/> + <action application="record_fsv" data="/tmp/testrecord.fsv"/> + </condition> + </extension> + + <extension name="video_playback"> + <condition field="destination_number" expression="^9994$"> + <action application="answer"/> + <action application="play_fsv" data="/tmp/testrecord.fsv"/> + </condition> + </extension> + + + <extension name="delay_echo"> <condition field="destination_number" expression="^9995$"> <action application="answer"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Feb 11 16:52:38 2008 @@ -62,7 +62,7 @@ H264 - H.264 Video --> - <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU@20i,PCMA@20i"/> + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU@20i,PCMA@20i,H263"/> <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU@20i,PCMA@20i"/> <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/>

1 0

[commit] r7589 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: anthm Date: Mon Feb 11 16:20:43 2008 New Revision: 7589 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.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 Mon Feb 11 16:20:43 2008 @@ -1382,6 +1382,8 @@ char *domain = NULL; char *profile_name = NULL; char *p; + sofia_profile_t *profile = NULL; + if (!cmd) { stream->write_function(stream, "%s", ""); @@ -1409,7 +1411,6 @@ if (user && profile_name) { char *sql; - sofia_profile_t *profile; if (!(profile = sofia_glue_find_profile(profile_name))) { profile_name = domain; @@ -1449,6 +1450,11 @@ end: switch_safe_free(data); + + if (profile) { + sofia_glue_release_profile(profile); + } + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7588 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Feb '08

11 Feb '08

Author: anthm Date: Mon Feb 11 15:47:20 2008 New Revision: 7588 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: auto append domain name on ^ notation 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 Feb 11 15:47:20 2008 @@ -1564,7 +1564,7 @@ switch_caller_profile_t *caller_profile = NULL; private_object_t *tech_pvt = NULL; switch_channel_t *nchannel; - char *host, *dest_to; + char *host = NULL, *dest_to = NULL; *new_session = NULL; @@ -1679,8 +1679,6 @@ if ((dest_to = strchr(dest, '^'))) { *dest_to++ = '\0'; - tech_pvt->dest_to = switch_core_session_alloc(nsession, strlen(dest_to) + 5); - switch_snprintf(tech_pvt->dest_to, strlen(dest_to) + 5, "sip:%s", dest_to); } if ((host = strchr(dest, '%'))) { @@ -1696,12 +1694,13 @@ cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; goto error; } - } else if (!strchr(dest, '@')) { + } else if (!(host = 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))) { tech_pvt->dest = switch_core_session_strdup(nsession, buf); tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile_name); + host = profile_name; } else { 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; @@ -1713,6 +1712,15 @@ } } + if (dest_to) { + if (strchr(dest_to, '@')) { + tech_pvt->dest_to = switch_core_session_sprintf(nsession, "sip:%s", dest_to); + } else { + tech_pvt->dest_to = switch_core_session_sprintf(nsession, "sip:%s@%s", dest_to, host); + } + } + + if (!tech_pvt->dest_to) { tech_pvt->dest_to = tech_pvt->dest; }

1 0