- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9917 - freeswitch/trunk/src
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: mikej Date: Thu Oct 9 18:44:48 2008 New Revision: 9917 Modified: freeswitch/trunk/src/switch_rtp.c Log: don't autoadjust on break packets sent to ourself Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Oct 9 18:44:48 2008 @@ -975,7 +975,7 @@ SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session) { - char o = 42; + int o = 42; switch_size_t len = sizeof(o); switch_assert(rtp_session != NULL); @@ -1267,7 +1267,14 @@ goto end; } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + do_2833(rtp_session); + bytes = 0; + return_cng_frame(); + } + + if (bytes > 12 && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { const char *tx_host; const char *old_host; char bufa[30], bufb[30]; @@ -1308,13 +1315,6 @@ } } - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); - do_2833(rtp_session); - bytes = 0; - return_cng_frame(); - } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { /* Fast PASS! */ *flags |= SFF_PROXY_PACKET;

1 0

[commit] r9916 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Thu Oct 9 13:53:21 2008 New Revision: 9916 Modified: freeswitch/trunk/conf/dialplan/public.xml Log: this is a bit sip centric but using the sip_req_host does make more sense in this case Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Thu Oct 9 13:53:21 2008 @@ -38,7 +38,7 @@ <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)" break="never">  <action application="export" data="domain_name=$1"/> - <anti-action application="export" data="domain_name=$${domain}"/> + <anti-action application="export" data="domain_name=${sip_req_host}"/> </condition> </extension>

1 0

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

09 Oct '08

Author: brian Date: Thu Oct 9 13:28:32 2008 New Revision: 9915 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: remove extra debug not needed 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 Oct 9 13:28:32 2008 @@ -72,7 +72,6 @@ { if (status >= 300 && sip && sip->sip_call_id) { char *sql; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "delete subscriptions for failed notify\n"); sql = switch_mprintf("delete from sip_subscriptions where call_id='%q'", sip->sip_call_id->i_id); switch_assert(sql != NULL); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); @@ -195,12 +194,12 @@ } } } - +#if 0 if (status != 100 && status != 200) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "event [%s] status [%d][%s] session: %s\n", nua_event_name(event), status, phrase, session ? switch_channel_get_name(channel) : "n/a"); } - +#endif if (session) { switch_core_session_signal_lock(session);

1 0

[commit] r9914 - in freeswitch/trunk/conf: . sip_profiles
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Thu Oct 9 12:19:37 2008 New Revision: 9914 Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/conf/vars.xml Log: This moves some basic settings into vars.xml so you don't have to touch the sip profiles to enable tls or change the ports. Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Thu Oct 9 12:19:37 2008 @@ -18,7 +18,7 @@ <param name="debug" value="0"/> <param name="sip-trace" value="no"/> <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5080"/> + <param name="sip-port" value="$${external_sip_port}"/> <param name="dialplan" value="XML"/> <param name="context" value="public"/> <param name="dtmf-duration" value="100"/> @@ -60,8 +60,8 @@ <param name="tls" value="$${external_ssl_enable}"/>  <param name="tls-bind-params" value="transport=tls"/> -  - <param name="tls-sip-port" value="5081"/> +  + <param name="tls-sip-port" value="$${external_tls_port}"/>  <param name="tls-cert-dir" value="$${external_ssl_dir}"/>  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 Oct 9 12:19:37 2008 @@ -11,7 +11,7 @@ <param name="context" value="public"/> <param name="rfc2833-pt" value="101"/>  - <param name="sip-port" value="5060"/> + <param name="sip-port" value="$${internal_sip_port}"/> <param name="dialplan" value="XML"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> @@ -44,15 +44,15 @@   - <param name="tls" value="false"/> + <param name="tls" value="$${internal_ssl_enable}"/>  <param name="tls-bind-params" value="transport=tls"/>  - <param name="tls-sip-port" value="5061"/> + <param name="tls-sip-port" value="$${internal_tls_port}"/>  - <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/> + <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>  - <param name="tls-version" value="tlsv1"/> + <param name="tls-version" value="$${sip_tls_version}"/>   @@ -88,7 +88,7 @@    - <param name="auth-calls" value="true"/> + <param name="auth-calls" value="$${internal_auth_calls}"/>  <param name="auth-all-packets" value="false"/>  @@ -114,13 +114,13 @@   - <param name="tls" value="$${internal_ip6_ssl_enable}"/> + <param name="tls" value="$${internal_ssl_enable}"/>  <param name="tls-bind-params" value="transport=tls"/>  - <param name="tls-sip-port" value="5061"/> + <param name="tls-sip-port" value="$${internal_tls_port}"/>  - <param name="tls-cert-dir" value="$${internal_ip6_ssl_dir}"/> + <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>  <param name="tls-version" value="$${sip_tls_version}"/> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu Oct 9 12:19:37 2008 @@ -41,7 +41,7 @@ <param name="context" value="public"/> <param name="rfc2833-pt" value="101"/>  - <param name="sip-port" value="5060"/> + <param name="sip-port" value="$${internal_sip_port}"/> <param name="dialplan" value="XML"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> @@ -88,7 +88,7 @@  <param name="tls-bind-params" value="transport=tls"/>  - <param name="tls-sip-port" value="5061"/> + <param name="tls-sip-port" value="$${internal_tls_port}"/>  <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>  @@ -128,7 +128,7 @@    - <param name="auth-calls" value="true"/> + <param name="auth-calls" value="$${internal_auth_calls}"/>  <param name="auth-all-packets" value="false"/>  Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Thu Oct 9 12:19:37 2008 @@ -130,15 +130,20 @@ <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/>  <X-PRE-PROCESS cmd="set" data="sip_tls_version=tlsv1"/> +  + <X-PRE-PROCESS cmd="set" data="internal_auth_calls=true"/> + <X-PRE-PROCESS cmd="set" data="internal_sip_port=5060"/> + <X-PRE-PROCESS cmd="set" data="internal_tls_port=5061"/> <X-PRE-PROCESS cmd="set" data="internal_ssl_enable=false"/> <X-PRE-PROCESS cmd="set" data="internal_ssl_dir=$${base_dir}/conf/ssl"/> -  - <X-PRE-PROCESS cmd="set" data="internal_ip6_ssl_enable=false"/> - <X-PRE-PROCESS cmd="set" data="internal_ip6_ssl_dir=$${base_dir}/conf/ssl"/> +  + <X-PRE-PROCESS cmd="set" data="external_auth_calls=false"/> + <X-PRE-PROCESS cmd="set" data="external_sip_port=5080"/> + <X-PRE-PROCESS cmd="set" data="external_tls_port=5081"/> <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false"/> <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${base_dir}/conf/ssl"/>

1 0

[commit] r9913 - freeswitch/trunk/src
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: mikej Date: Thu Oct 9 12:05:35 2008 New Revision: 9913 Modified: freeswitch/trunk/src/switch.c Log: FSCORE-198 (runtime select the mod dir) Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Oct 9 12:05:35 2008 @@ -297,6 +297,7 @@ "\t-conf [confdir] -- specify an alternate config dir\n" "\t-log [logdir] -- specify an alternate log dir\n" "\t-db [dbdir] -- specify an alternate db dir\n" + "\t-mod [moddir] -- specify an alternate mod dir\n" "\t-scripts [scriptsdir] -- specify an alternate scripts dir\n"; for (x = 1; x < argc; x++) { @@ -478,6 +479,22 @@ known_opt++; } + if (argv[x] && !strcmp(argv[x], "-mod")) { + x++; + if (argv[x] && strlen(argv[x])) { + SWITCH_GLOBAL_dirs.mod_dir = (char *) malloc(strlen(argv[x]) + 1); + if (!SWITCH_GLOBAL_dirs.mod_dir) { + fprintf(stderr, "Allocation error\n"); + return 255; + } + strcpy(SWITCH_GLOBAL_dirs.mod_dir, argv[x]); + } else { + fprintf(stderr, "When using -mod you must specify a module directory\n"); + return 255; + } + known_opt++; + } + if (argv[x] && !strcmp(argv[x], "-log")) { x++; if (argv[x] && strlen(argv[x])) {

1 0

[commit] r9912 - freeswitch/trunk/src/include
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: anthm Date: Thu Oct 9 08:58:49 2008 New Revision: 9912 Modified: freeswitch/trunk/src/include/switch_cpp.h Log: init flags to 0 Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Thu Oct 9 08:58:49 2008 @@ -33,6 +33,7 @@ caller_profile.aniii = ""; \ caller_profile.rdnis = ""; \ caller_profile.username = ""; \ + flags = 0; \ on_hangup = NULL; \ memset(&cb_state, 0, sizeof(cb_state)); \ hook_state = CS_NEW; \

1 0

[commit] r9911 - in freeswitch/trunk/conf: . dialplan
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Thu Oct 9 01:17:14 2008 New Revision: 9911 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/vars.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Oct 9 01:17:14 2008 @@ -303,7 +303,7 @@   - <action application="conference_set_auto_outcall" data="sofia/gateway/asterlink.com/19184238080"/> + <action application="conference_set_auto_outcall" data="sofia/gateway/$${default_provider}/19184238080"/> <action application="conference_set_auto_outcall" data="sofia/default/888(a)conference.freeswitch.org"/> <action application="conference" data="cool@default"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Thu Oct 9 01:17:14 2008 @@ -75,6 +75,7 @@ Used by: dingaling.conf.xml --> <X-PRE-PROCESS cmd="set" data="bind_server_ip=auto"/> +  <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/> +  <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/> +  <X-PRE-PROCESS cmd="set" data="unroll_loops=true"/> + <!-- outbound_caller_id and outbound_caller_name The caller ID telephone number we should use when calling out. Used by: conference.conf.xml and user directory for default

1 0

[commit] r9910 - freeswitch/trunk/src/mod/dotnet
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: mikej Date: Wed Oct 8 22:52:28 2008 New Revision: 9910 Removed: freeswitch/trunk/src/mod/dotnet/ Log: rm unused dir

1 0

[commit] r9909 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Wed Oct 8 22:50:23 2008 New Revision: 9909 Modified: freeswitch/trunk/conf/dialplan/public.xml Log: lets not do this by default it might confuse people Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Wed Oct 8 22:50:23 2008 @@ -61,20 +61,20 @@  +  <extension name="transfer_to_default"> <condition> <action application="transfer" data="${destination_number} XML default"/> </condition> </extension> - + --> </context> </include>

1 0

[commit] r9908 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Wed Oct 8 22:19:51 2008 New Revision: 9908 Modified: freeswitch/trunk/conf/dialplan/public.xml Log: allow the public context to challenge if they make it to the end before any matches so you can mix auth and non-auth in public. Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Wed Oct 8 22:19:51 2008 @@ -58,6 +58,23 @@ You can place files in the public directory to get included. --> <X-PRE-PROCESS cmd="include" data="public/*.xml"/> + +  + <extension name="check_auth" continue="true"> + <condition field="${sip_authorized}" expression="^true$" break="never"> + <anti-action application="respond" data="407"/> + </condition> + </extension> + +  + <extension name="transfer_to_default"> + <condition> + <action application="transfer" data="${destination_number} XML default"/> + </condition> + </extension> </context> </include>

1 0