August 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r9389 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 31 Aug '08

31 Aug '08

Author: brian Date: Sun Aug 31 15:38:04 2008 New Revision: 9389 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: use callpark soft keys from linksys SPA phones. Thanks sekil Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Aug 31 15:38:04 2008 @@ -293,6 +293,39 @@ </condition> </extension> +  + <extension name="park"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="callpark"/> + <condition field="${sip_refer_to}"> + <expression><![CDATA[<sip:callpark@${domain};orbit=(\d+)>]]></expression> + <action application="fifo" data="$1@${domain} in undef $${hold_music}"/> + </condition> + </extension> + +  + <extension name="unpark"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="pickup"/> + <condition field="${sip_to_params}" expression="orbit\=(\d+)"> + <action application="answer"/> + <action application="fifo" data="$1@${domain} out nowait"/> + </condition> + </extension> + <extension name="show_info"> <condition field="destination_number" expression="^9992$"> <action application="answer"/>

1 0

[Freeswitch-svn] [commit] r9388 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 30 Aug '08

30 Aug '08

Author: brian Date: Sat Aug 30 14:25:53 2008 New Revision: 9388 Modified: freeswitch/trunk/conf/sip_profiles/external.xml Log: you have to have this on each profile for TLS to be enabled Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Sat Aug 30 14:25:53 2008 @@ -39,5 +39,17 @@ <param name="rtp-timeout-sec" value="300"/> <param name="rtp-hold-timeout-sec" value="1800"/>  + +  + <param name="tls" value="false"/> +  + <param name="tls-bind-params" value="transport=tls"/> +  + <param name="tls-sip-port" value="5081"/> +  + <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/> +  + <param name="tls-version" value="tlsv1"/> + </settings> </profile>

1 0

[Freeswitch-svn] [commit] r9386 - freeswitch/trunk/src
by Freeswitch SVN 29 Aug '08

29 Aug '08

Author: brian Date: Fri Aug 29 11:56:13 2008 New Revision: 9386 Modified: freeswitch/trunk/src/switch_channel.c Log: fix spelling Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Aug 29 11:56:13 2008 @@ -231,7 +231,7 @@ int x = 0; if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(channel), new_dtmf.digit, new_dtmf.duration); new_dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!new_dtmf.duration) { @@ -287,7 +287,7 @@ } if (dtmf.duration > switch_core_max_dtmf_duration(0)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "EXECSSIVE DTMF DIGIT LEN %c %d\n", dtmf.digit, dtmf.duration); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "EXCESSIVE DTMF DIGIT LEN %c %d\n", dtmf.digit, dtmf.duration); dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!dtmf.duration) { dtmf.duration = switch_core_default_dtmf_duration(0); @@ -325,7 +325,7 @@ free(dt); if (dtmf->duration > switch_core_max_dtmf_duration(0)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(channel), dtmf->digit, dtmf->duration); dtmf->duration = switch_core_max_dtmf_duration(0); } else if (!dtmf->duration) {

1 0

[Freeswitch-svn] [commit] r9385 - freeswitch/trunk/debian
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: brian Date: Thu Aug 28 15:37:21 2008 New Revision: 9385 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: tweak debian build to remove nat.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Thu Aug 28 15:37:21 2008 @@ -12,8 +12,6 @@ /opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml /opt/freeswitch/conf/dialplan/extensions/99999_enum.xml /opt/freeswitch/conf/sip_profiles/external.xml -/opt/freeswitch/conf/sip_profiles/nat.xml -/opt/freeswitch/conf/sip_profiles/nat/example.xml /opt/freeswitch/conf/sip_profiles/internal/example.xml /opt/freeswitch/conf/sip_profiles/internal.xml /opt/freeswitch/conf/sip_profiles/external/example.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Thu Aug 28 15:37:21 2008 @@ -48,8 +48,6 @@ opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml opt/freeswitch/conf/dialplan/extensions/99999_enum.xml opt/freeswitch/conf/sip_profiles/external.xml -opt/freeswitch/conf/sip_profiles/nat.xml -opt/freeswitch/conf/sip_profiles/nat/example.xml opt/freeswitch/conf/sip_profiles/internal/example.xml opt/freeswitch/conf/sip_profiles/internal.xml opt/freeswitch/conf/sip_profiles/external/example.xml

1 0

[Freeswitch-svn] [commit] r9384 - freeswitch/trunk
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: brian Date: Thu Aug 28 15:36:11 2008 New Revision: 9384 Modified: freeswitch/trunk/freeswitch.spec Log: fix spec Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu Aug 28 15:36:11 2008 @@ -283,7 +283,6 @@ %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/mrcp_profiles %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/nat %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/dialplan/extensions %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/external @@ -342,7 +341,6 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/external/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/nat/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/jingle_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/Makefile %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/grammar/model/communicator/*

1 0

[Freeswitch-svn] [commit] r9383 - in freeswitch/trunk/conf/sip_profiles: . nat
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: brian Date: Thu Aug 28 14:25:48 2008 New Revision: 9383 Removed: freeswitch/trunk/conf/sip_profiles/nat/ freeswitch/trunk/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/conf/sip_profiles/external.xml Log: external can do the same job of the nat profile. I have added an alias to the external profile for nat so it doesn't break backwards compat. Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Thu Aug 28 14:25:48 2008 @@ -7,6 +7,7 @@ <aliases> <alias name="outbound"/> + <alias name="nat"/>  </aliases> <domains>

1 0

[Freeswitch-svn] [commit] r9382 - in freeswitch/trunk/src: include mod/languages/mod_yaml
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: mikej Date: Thu Aug 28 14:23:17 2008 New Revision: 9382 Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c Log: fix mod_yaml build on newer gcc Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Aug 28 14:23:17 2008 @@ -276,6 +276,9 @@ #define switch_xml_set_attr_d(xml, name, value) \ switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup(name), strdup(switch_str_nil(value))) +#define switch_xml_set_attr_d_buf(xml, name, value) \ + switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup(name), strdup(value)) + ///\brief sets a flag for the given tag and returns the tag ///\param xml the xml node ///\param flag the flag to set Modified: freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c (original) +++ freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c Thu Aug 28 14:23:17 2008 @@ -154,7 +154,7 @@ } else { switch_set_string(value, scalar_data); param = switch_xml_add_child_d(current, "param", p_off++); - switch_xml_set_attr_d(param, "name", name); + switch_xml_set_attr_d_buf(param, "name", name); switch_xml_set_attr_d(param, "value", scalar_data); nv = 0; }

1 0

[Freeswitch-svn] [commit] r9381 - in freeswitch/trunk/src: include mod/languages/mod_yaml
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: mikej Date: Thu Aug 28 12:41:48 2008 New Revision: 9381 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c Log: fix mod_yaml build on newer gcc Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Aug 28 12:41:48 2008 @@ -106,6 +106,15 @@ !strcasecmp(expr, "allow") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +#define switch_true_buf(expr)\ +(( !strcasecmp(expr, "yes") ||\ +!strcasecmp(expr, "on") ||\ +!strcasecmp(expr, "true") ||\ +!strcasecmp(expr, "enabled") ||\ +!strcasecmp(expr, "active") ||\ +!strcasecmp(expr, "allow") ||\ +atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE + /*! \brief Evaluate the falsefullness of a string expression \param expr a string expression Modified: freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c (original) +++ freeswitch/trunk/src/mod/languages/mod_yaml/mod_yaml.c Thu Aug 28 12:41:48 2008 @@ -476,7 +476,7 @@ } else { switch_set_string(value, scalar_data); if (!strcasecmp(category, "settings")) { - if (!strcasecmp(name, "bind_config") && switch_true(value)) { + if (!strcasecmp(name, "bind_config") && switch_true_buf(value)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Binding To XML Config\n"); switch_xml_bind_search_function(yaml_fetch, switch_xml_parse_section_string("config"), NULL); }

1 0

[Freeswitch-svn] [commit] r9380 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: brian Date: Thu Aug 28 12:32:06 2008 New Revision: 9380 Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: its suppress.. but we still support the supress variant. Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml Thu Aug 28 12:32:06 2008 @@ -73,8 +73,8 @@   -  -  +  +   <param name="nonce-ttl" value="60"/> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu Aug 28 12:32:06 2008 @@ -91,8 +91,8 @@   -  -  +  +   <param name="nonce-ttl" value="60"/> 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 Thu Aug 28 12:32:06 2008 @@ -145,7 +145,7 @@ PFLAG_RESPAWN = (1 << 9), PFLAG_GREEDY = (1 << 10), PFLAG_MULTIREG = (1 << 11), - PFLAG_SUPRESS_CNG = (1 << 12), + PFLAG_SUPPRESS_CNG = (1 << 12), PFLAG_TLS = (1 << 13), PFLAG_CHECKUSER = (1 << 14), PFLAG_SECURE = (1 << 15), 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 Thu Aug 28 12:32:06 2008 @@ -1155,11 +1155,11 @@ } else { profile->pflags &= ~PFLAG_MULTIREG; } - } else if (!strcasecmp(var, "supress-cng")) { + } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) { if (switch_true(val)) { - profile->pflags |= PFLAG_SUPRESS_CNG; + profile->pflags |= PFLAG_SUPPRESS_CNG; } else { - profile->pflags &= ~PFLAG_SUPRESS_CNG; + profile->pflags &= ~PFLAG_SUPPRESS_CNG; } } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) { if (switch_true(val)) { @@ -1585,9 +1585,9 @@ if (switch_true(val)) { profile->pflags |= PFLAG_MULTIREG; } - } else if (!strcasecmp(var, "supress-cng")) { + } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) { if (switch_true(val)) { - profile->pflags |= PFLAG_SUPRESS_CNG; + profile->pflags |= PFLAG_SUPPRESS_CNG; } } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) { if (switch_true(val)) { @@ -1727,7 +1727,7 @@ } } - if ((!profile->cng_pt) && (!sofia_test_pflag(profile, PFLAG_SUPRESS_CNG))) { + if ((!profile->cng_pt) && (!sofia_test_pflag(profile, PFLAG_SUPPRESS_CNG))) { profile->cng_pt = SWITCH_RTP_CNG_PAYLOAD; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Aug 28 12:32:06 2008 @@ -48,8 +48,9 @@ const char *pass_fmtp = switch_channel_get_variable(tech_pvt->channel, "sip_video_fmtp"); const char *ov_fmtp = switch_channel_get_variable(tech_pvt->channel, "sip_force_video_fmtp"); - if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPRESS_CNG) || - ((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val))) { + if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) || + ((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val)) || + ((val = switch_channel_get_variable(tech_pvt->channel, "suppress_cng")) && switch_true(val))) { use_cng = 0; }

1 0

[Freeswitch-svn] [commit] r9379 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: brian Date: Thu Aug 28 10:15:05 2008 New Revision: 9379 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: You should only use these when needed... Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu Aug 28 10:15:05 2008 @@ -35,8 +35,8 @@  <param name="sip-ip" value="$${local_ip_v4}"/> <param name="hold-music" value="$${hold_music}"/> - <param name="apply-nat-acl" value="rfc1918"/> - <param name="aggressive-nat-detection" value="true"/> +  +    <param name="apply-inbound-acl" value="domains"/>

1 0