- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10757 - freeswitch/trunk/src/mod/endpoints/mod_iax
by FreeSWITCH SVN 14 Dec '08

14 Dec '08

Author: mikej Date: Sun Dec 14 11:45:25 2008 New Revision: 10757 Log: MODENDP-160 __NetBSD__ is a better define to use than NETBSD Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax-client.h Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/iax-client.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/iax-client.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/iax-client.h Sun Dec 14 11:45:25 2008 @@ -23,7 +23,7 @@ #pragma warning(disable:4200) #endif -#if !defined(LINUX) && !defined(NETBSD) +#if !defined(LINUX) && !defined(__NetBSD__) #define socklen_t int #endif

1 0

[commit] r10756 - freeswitch/trunk/src
by FreeSWITCH SVN 14 Dec '08

14 Dec '08

Author: mikej Date: Sun Dec 14 11:41:33 2008 New Revision: 10756 Log: FSCORE-254 NetBSD does not have RLIMIT_AS Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Dec 14 11:41:33 2008 @@ -781,7 +781,7 @@ setrlimit(RLIMIT_CPU, &rlp); setrlimit(RLIMIT_DATA, &rlp); setrlimit(RLIMIT_FSIZE, &rlp); -#ifndef __OpenBSD__ +#if !defined(__OpenBSD__) && !defined(__NetBSD__) setrlimit(RLIMIT_AS, &rlp); #endif #endif

1 0

[commit] r10755 - freeswitch/trunk/src/include
by FreeSWITCH SVN 14 Dec '08

14 Dec '08

Author: mikej Date: Sun Dec 14 11:38:21 2008 New Revision: 10755 Log: FSCORE-252 Core NetBSD features are disabled if _XOPEN_SOURCE is defined Modified: freeswitch/trunk/src/include/switch.h Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Sun Dec 14 11:38:21 2008 @@ -54,7 +54,7 @@ #define FREESWITCH_ITAD "543" #define __EXTENSIONS__ 1 #ifndef MACOSX -#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) +#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__) #ifndef __cplusplus #define _XOPEN_SOURCE 600 #endif

1 0

[commit] r10754 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 14 Dec '08

14 Dec '08

Author: mikej Date: Sun Dec 14 11:37:38 2008 New Revision: 10754 Log: type tweak Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sun Dec 14 11:37:38 2008 @@ -1723,7 +1723,7 @@ switch_input_args_t args = { 0 }; int32 ms = 0; jsval ret = JS_TRUE; - int sync; + int32 sync = 0; METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session);

1 0

[commit] r10749 - freeswitch/trunk/scripts/contrib/mcollins
by FreeSWITCH SVN 13 Dec '08

13 Dec '08

Author: mcollins Date: Sat Dec 13 01:31:32 2008 New Revision: 10749 Log: Add uuid_send_dtmf.lua script Added: freeswitch/trunk/scripts/contrib/mcollins/uuid_send_dtmf.lua (contents, props changed) Added: freeswitch/trunk/scripts/contrib/mcollins/uuid_send_dtmf.lua ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mcollins/uuid_send_dtmf.lua Sat Dec 13 01:31:32 2008 @@ -0,0 +1,44 @@ +--[[ + + uuid_send_dtmf.lua + +Do uuid_send_dtmf from dialplan +accepts three args: uuid, time, and dtmf +uuid is the uuid of the session +time is the "+ <seconds>" value in seconds +dtmf is the sequence of dtmf digit(s) to send + +NOTE: only the "+<seconds>" syntax of sched_api is supported here +NOTE: No error checking, so don't forget to send all args + +Example dialplan call: + <action application="lua" data="uuid_send_dtmf.lua ${uuid} 10 123"/> + +--]] + +-- Do not hangup at end of script +session:setAutoHangup(false); + +-- get an api object +api = freeswitch.API(); + +-- get the calling args (uuid, time, dtmf) +uuid = argv[1]; +time = argv[2]; +dtmf = argv[3]; + +apicmd = "sched_api"; +apiarg = "+" .. time .. " none uuid_send_dtmf " .. uuid .. " " .. dtmf; + +freeswitch.console_log("NOTICE","apicmd: " .. apicmd .. "\n"); +freeswitch.console_log("NOTICE","apiarg: " .. apiarg .. "\n\n"); + +if uuid then + -- schedule the uuid_send_dtmf + res = api:execute(apicmd,apiarg); + freeswitch.console_log("ERR","Result is " .. res .. "\n\n"); +else + freeswitch.console_log("ERR","Did not receive a uuid for this call!\n"); +end + +-- All done!

1 0

[commit] r10748 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 13 Dec '08

13 Dec '08

Author: mcollins Date: Fri Dec 12 23:57:27 2008 New Revision: 10748 Log: api command sent through sched_api was getting the last char lopped off Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Dec 12 23:57:27 2008 @@ -2106,7 +2106,7 @@ } switch_zmalloc(api_task, sizeof(*api_task) + strlen(dcmd) + 1); - switch_copy_string(api_task->cmd, dcmd, strlen(dcmd)); + switch_copy_string(api_task->cmd, dcmd, strlen(dcmd) + 1); api_task->recur = recur; id = switch_scheduler_add_task(when, sch_api_callback, (char *) __SWITCH_FUNC__, group, 0, api_task, SSHF_FREE_ARG);

1 0

[commit] r10747 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: brian Date: Fri Dec 12 18:53:37 2008 New Revision: 10747 Log: more tweaks Modified: freeswitch/trunk/conf/autoload_configs/java.conf.xml freeswitch/trunk/conf/autoload_configs/lua.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/java.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/java.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/java.conf.xml Fri Dec 12 18:53:37 2008 @@ -4,7 +4,7 @@  <options>  - <option value="-Djava.class.path=/usr/local/freeswitch/scripts/freeswitch.jar"/> + <option value="-Djava.class.path=$${base_dir}/scripts/freeswitch.jar"/>  <option value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=127.0.0.1:8000"/> </options> Modified: freeswitch/trunk/conf/autoload_configs/lua.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/lua.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/lua.conf.xml Fri Dec 12 18:53:37 2008 @@ -13,7 +13,7 @@ These entries will be pre-pended to the LUA_PATH environment variable -->  -  +

1 0

[commit] r10746 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: brian Date: Fri Dec 12 18:51:45 2008 New Revision: 10746 Log: w00t Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Fri Dec 12 18:51:45 2008 @@ -97,7 +97,7 @@    </profile>

1 0

[commit] r10745 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: anthm Date: Fri Dec 12 18:07:20 2008 New Revision: 10745 Log: fix presence on jabber to be less ambiguous Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Dec 12 18:07:20 2008 @@ -413,6 +413,7 @@ char *rpid = switch_event_get_header(event, "rpid"); char *type = switch_event_get_header(event, "event_subtype"); char *sql; + char pstr[128] = ""; if (globals.running != 1) { return; @@ -475,10 +476,12 @@ status = "Away"; } + if (proto) { + switch_snprintf(pstr, sizeof(pstr), "%s+", proto); + } sql = - switch_mprintf("select sub_from, sub_to,'%q','%q','%q','%q' from jabber_subscriptions where sub_to like '%%%q'", type, rpid, status, proto, from); - + switch_mprintf("select sub_from, sub_to,'%q','%q','%q','%q' from jabber_subscriptions where sub_to = '%q%q'", type, rpid, status, proto, pstr, from); for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val);

1 0

[commit] r10744 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 12 Dec '08

12 Dec '08

Author: anthm Date: Fri Dec 12 17:34:41 2008 New Revision: 10744 Log: sonus sonus sonus, sonus is a 4 letter word Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c 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 Fri Dec 12 17:34:41 2008 @@ -2197,6 +2197,16 @@ switch_set_flag_locked(tech_pvt, TFLAG_BUGGY_2833); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Activate Buggy RFC2833 Mode!\n"); } + + if (strstr(tech_pvt->origin, "Sonus_UAC")) { + switch_set_flag_locked(tech_pvt, TFLAG_BUGGY_2833); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Hello,\nI see you have a Sonus!\n" + "FYI, Sonus cannot follow the RFC on the proper way to send DTMF.\n" + "Sadly, my creator had to spend several hours figuring this out so I thought you'd like to know that!\n" + "Don't worry, DTMF will work but you may want to ask them to fix it......\n" + ); + } } if ((m = sdp->sdp_media) && (m->m_mode == sdp_sendonly || m->m_mode == sdp_inactive)) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Dec 12 17:34:41 2008 @@ -1204,6 +1204,9 @@ rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, rtp_session->dtmf_data.out_digit_sub_sofar, rtp_session->dtmf_data.out_digit_dur, rtp_session->seq); + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833)) { + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts + samples; + } } if (loops != 1) {

1 0