- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12566 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 10:14:24 2009 New Revision: 12566 Log: add sip_from_display var and fix backwards switch_strisr calls Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_ivr_originate.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 Wed Mar 11 10:14:24 2009 @@ -1176,6 +1176,7 @@ const char *invite_contact_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_contact_params"); const char *invite_from_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_from_params"); const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri"); + const char *from_display = switch_channel_get_variable(tech_pvt->channel, "sip_from_display"); if (switch_strlen_zero(tech_pvt->dest)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error!\n"); @@ -1277,10 +1278,11 @@ or did he just suggest it to make our lives miserable? */ use_from_str = from_str; - if (!strcasecmp(tech_pvt->caller_profile->caller_id_name, "_undef_")) { + if (!from_display && !strcasecmp(tech_pvt->caller_profile->caller_id_name, "_undef_")) { from_str = switch_core_session_sprintf(session, "<%s>", use_from_str); } else { - from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); + from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", from_display ? from_display : + tech_pvt->caller_profile->caller_id_name, use_from_str); } if (!(call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id"))) { Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Mar 11 10:14:24 2009 @@ -1435,15 +1435,15 @@ new_profile->flags = SWITCH_CPF_NONE; - if (switch_stristr(tmp, "screen")) { + if (switch_stristr("screen", tmp)) { switch_set_flag(new_profile, SWITCH_CPF_SCREEN); } - if (switch_stristr(tmp, "hide_name")) { + if (switch_stristr("hide_name", tmp)) { switch_set_flag(new_profile, SWITCH_CPF_HIDE_NAME); } - if (switch_stristr(tmp, "hide_number")) { + if (switch_stristr("hide_number", tmp)) { switch_set_flag(new_profile, SWITCH_CPF_HIDE_NUMBER); }

1 0

[commit] r12565 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 09:49:37 2009 New Revision: 12565 Log: silence err 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 Wed Mar 11 09:49:37 2009 @@ -1613,9 +1613,12 @@ rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + + /** if (setrlimit(RLIMIT_STACK, &rlim) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); } + **/ #endif if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -1643,10 +1646,12 @@ #if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; - rlim.rlim_max = SWITCH_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; + /** if (setrlimit(RLIMIT_STACK, &rlim) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed!\n"); } + **/ #endif if (wait) {

1 0

[commit] r12564 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: mrene Date: Wed Mar 11 08:15:41 2009 New Revision: 12564 Log: Revert 12561 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 Wed Mar 11 08:15:41 2009 @@ -1146,21 +1146,8 @@ switch_dtmf_t *dtmf = (switch_dtmf_t *) input; if (dtmf) { - JSString *str = NULL; - /* FSCORE-327 - If a javascript garbage collection is in progress, - JS_NewStringCopyZ returns NULL */ - int try = 100; - while (try-- && !str) { - if ((str = JS_NewStringCopyZ(cb_state->cx, "dtmf"))) break; - switch_yield(10000); - } - - if (!str) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Javascript memory allocation failed\n"); - } - - if (str && (Event = new_js_dtmf(dtmf, var_name, cb_state->cx, cb_state->obj))) { - argv[argc++] = STRING_TO_JSVAL(str); + if ((Event = new_js_dtmf(dtmf, var_name, cb_state->cx, cb_state->obj))) { + argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); argv[argc++] = OBJECT_TO_JSVAL(Event); } else { jss->stack_depth--;

1 0

[commit] r12563 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 08:15:02 2009 New Revision: 12563 Log: still use intended caller id domain in rpid even when from uri is overridden Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.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 Wed Mar 11 08:15:02 2009 @@ -1202,7 +1202,12 @@ use_from_str = tech_pvt->from_str; } - rpid_domain = switch_core_session_strdup(session, use_from_str); + if (!switch_strlen_zero(tech_pvt->gateway_from_str)) { + rpid_domain = switch_core_session_strdup(session, tech_pvt->gateway_from_str); + } else if (!switch_strlen_zero(tech_pvt->from_str)) { + rpid_domain = switch_core_session_strdup(session, tech_pvt->from_str); + } + sofia_glue_get_url_from_contact(rpid_domain, 0); if ((rpid_domain = strrchr(rpid_domain, '@'))) { rpid_domain++;

1 0

[commit] r12562 - freeswitch/trunk/support-d
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: anthm Date: Wed Mar 11 08:14:18 2009 New Revision: 12562 Log: tweak .emacs Modified: freeswitch/trunk/support-d/.emacs Modified: freeswitch/trunk/support-d/.emacs ============================================================================== --- freeswitch/trunk/support-d/.emacs (original) +++ freeswitch/trunk/support-d/.emacs Wed Mar 11 08:14:18 2009 @@ -7,7 +7,7 @@ ;(setq cperl-hairy t) (global-unset-key "\C-h") (global-set-key "\C-h" 'delete-backward-char) -;(load "/usr/share/emacs/site-lisp/rng-auto.el") +(load "/usr/share/emacs/site-lisp/rng-auto.el") (require 'cc-mode) (defun my-build-tab-stop-list (width) @@ -171,6 +171,7 @@ (font-lock-function-name-face "limegreen") (font-lock-variable-name-face "Yellow") (font-lock-type-face "Yellow") + (font-lock-reference-face "Purple") )) ;; Load the font-lock package. (require 'font-lock)

1 0

[commit] r12561 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: mrene Date: Wed Mar 11 07:39:37 2009 New Revision: 12561 Log: FSCORE-327 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 Wed Mar 11 07:39:37 2009 @@ -1146,8 +1146,21 @@ switch_dtmf_t *dtmf = (switch_dtmf_t *) input; if (dtmf) { - if ((Event = new_js_dtmf(dtmf, var_name, cb_state->cx, cb_state->obj))) { - argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); + JSString *str = NULL; + /* FSCORE-327 - If a javascript garbage collection is in progress, + JS_NewStringCopyZ returns NULL */ + int try = 100; + while (try-- && !str) { + if ((str = JS_NewStringCopyZ(cb_state->cx, "dtmf"))) break; + switch_yield(10000); + } + + if (!str) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Javascript memory allocation failed\n"); + } + + if (str && (Event = new_js_dtmf(dtmf, var_name, cb_state->cx, cb_state->obj))) { + argv[argc++] = STRING_TO_JSVAL(str); argv[argc++] = OBJECT_TO_JSVAL(Event); } else { jss->stack_depth--;

1 0

[commit] r12560 - freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: mrene Date: Tue Mar 10 17:07:44 2009 New Revision: 12560 Log: More textmate snippets Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_CONFIG_ITEM.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_STATUS_FALSE.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_STATUS_SUCCESS.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_get_channel.tmSnippet Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_CONFIG_ITEM.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_CONFIG_ITEM.tmSnippet Tue Mar 10 17:07:44 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>SWITCH_CONFIG_ITEM("${1:key}", SWITCH_CONFIG_${2:}, 0, &${3:globals.item}, (void*)$4, ${5:NULL}, "${6:syntax}", "${7:documentation}")</string> + <key>name</key> + <string>SWITCH_CONFIG_ITEM</string> + <key>tabTrigger</key> + <string>configitem</string> + <key>uuid</key> + <string>154CD9B8-6383-41C1-9F6E-A574AC6867D2</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_STATUS_FALSE.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_STATUS_FALSE.tmSnippet Tue Mar 10 17:07:44 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>SWITCH_STATUS_FALSE</string> + <key>name</key> + <string>SWITCH_STATUS_FALSE</string> + <key>tabTrigger</key> + <string>ssf</string> + <key>uuid</key> + <string>19295878-37A1-4234-8035-38DA07E17CAA</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_STATUS_SUCCESS.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_STATUS_SUCCESS.tmSnippet Tue Mar 10 17:07:44 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>SWITCH_STATUS_SUCCESS</string> + <key>name</key> + <string>SWITCH_STATUS_SUCCESS</string> + <key>tabTrigger</key> + <string>sss</string> + <key>uuid</key> + <string>3F544B00-2D0B-4C60-804E-EF63C609E7D8</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_get_channel.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_get_channel.tmSnippet Tue Mar 10 17:07:44 2009 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>if ((${1:channel} = switch_core_session_get_channel(${2:session})) { + $0 +}</string> + <key>name</key> + <string>switch_core_session_get_channel</string> + <key>tabTrigger</key> + <string>getchan</string> + <key>uuid</key> + <string>8107A427-59E7-4FB0-AA1B-28F4A15A2B63</string> +</dict> +</plist>

1 0

[commit] r12559 - in freeswitch/trunk/scripts/contrib/mrene/textmate: . FreeSWITCH.tmbundle FreeSWITCH.tmbundle/Snippets
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: mrene Date: Tue Mar 10 16:42:10 2009 New Revision: 12559 Log: TextMate bundle Added: freeswitch/trunk/scripts/contrib/mrene/textmate/ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_ADD_API.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_ADD_APP.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_locate.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_log_printf.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_mutex_lock.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_mutex_unlock.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_rdlock.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_tryrdlock.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_unlock.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_wrlock.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/untitled.tmSnippet freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/info.plist Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_ADD_API.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_ADD_API.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>SWITCH_ADD_API(api_interface, "${1:app name}", "${2:description}",${3:function ptr}, "${4:syntax}"); +</string> + <key>name</key> + <string>SWITCH_ADD_API</string> + <key>tabTrigger</key> + <string>addapi</string> + <key>uuid</key> + <string>63A39832-470E-4839-8098-4CC537FAA46D</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_ADD_APP.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/SWITCH_ADD_APP.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>SWITCH_ADD_APP(app_interface, "${1:name}", "${2:short description}", "${3:long description}", ${4:function}, "${5:syntax}", ${6:SAF_NONE}); +</string> + <key>name</key> + <string>SWITCH_ADD_APP</string> + <key>tabTrigger</key> + <string>addapp</string> + <key>uuid</key> + <string>1D16269D-A544-4909-867E-70028ED7961B</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_locate.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_core_session_locate.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>if ((${1:session} = switch_core_session_locate($2)) { + $0 + switch_core_session_rwunlock($1); +}</string> + <key>name</key> + <string>switch_core_session_locate</string> + <key>tabTrigger</key> + <string>slocate</string> + <key>uuid</key> + <string>8940F795-2A0A-411F-AB98-48DEAB07AD69</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_log_printf.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_log_printf.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_${1:DEBUG}, "$2"$3); +</string> + <key>name</key> + <string>switch_log_printf</string> + <key>tabTrigger</key> + <string>log</string> + <key>uuid</key> + <string>CCE4CE1C-2E71-4EDB-9733-1CDE38FA831E</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_mutex_lock.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_mutex_lock.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>switch_mutex_lock($1);</string> + <key>name</key> + <string>switch_mutex_lock</string> + <key>tabTrigger</key> + <string>mlock</string> + <key>uuid</key> + <string>BC5BFA60-002A-40F2-A6FE-72CEE4AAE330</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_mutex_unlock.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_mutex_unlock.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>switch_mutex_unlock($1);</string> + <key>name</key> + <string>switch_mutex_unlock</string> + <key>tabTrigger</key> + <string>munlock</string> + <key>uuid</key> + <string>C41EC675-F09C-4596-8C14-662403B27D54</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_rdlock.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_rdlock.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>switch_thread_rwlock_rdlock($1);</string> + <key>name</key> + <string>switch_thread_rwlock_rdlock</string> + <key>tabTrigger</key> + <string>rdlock</string> + <key>uuid</key> + <string>FB9588B8-3540-41F6-BC2D-7A6F3083BDA4</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_tryrdlock.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_tryrdlock.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>if (switch_thread_rwlock_tryrdlock($1) != SWITCH_STATUS_SUCCESS) { + $2 +} +$0</string> + <key>name</key> + <string>switch_thread_rwlock_tryrdlock</string> + <key>tabTrigger</key> + <string>tryrdlock</string> + <key>uuid</key> + <string>091C4224-A49A-4C68-AEA1-A25FEEAB0DE8</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_unlock.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_unlock.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>switch_thread_rwlock_unlock($1);</string> + <key>name</key> + <string>switch_thread_rwlock_unlock</string> + <key>tabTrigger</key> + <string>rwunlock</string> + <key>uuid</key> + <string>D7C796FB-389A-4D1B-A64B-BCAE45B4CEAF</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_wrlock.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/switch_thread_rwlock_wrlock.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>switch_thread_rwlock_wrlock($1);</string> + <key>name</key> + <string>switch_thread_rwlock_wrlock</string> + <key>tabTrigger</key> + <string>wrlock</string> + <key>uuid</key> + <string>86B6BF3F-C2C5-413C-A2FD-58D02D4B0AC0</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/untitled.tmSnippet ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/Snippets/untitled.tmSnippet Tue Mar 10 16:42:10 2009 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>content</key> + <string>if (switch_thread_rwlock_trywrlock($1) != SWITCH_STATUS_SUCCESS) { + $2 +} +$0</string> + <key>name</key> + <string>switch_thread_rwlock_trywrlock</string> + <key>tabTrigger</key> + <string>trywrlock</string> + <key>uuid</key> + <string>40D09664-79B0-4983-84FB-8007DD80E0D5</string> +</dict> +</plist> Added: freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/info.plist ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/textmate/FreeSWITCH.tmbundle/info.plist Tue Mar 10 16:42:10 2009 @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>name</key> + <string>FreeSWITCH</string> + <key>ordering</key> + <array> + <string>CCE4CE1C-2E71-4EDB-9733-1CDE38FA831E</string> + <string>40D09664-79B0-4983-84FB-8007DD80E0D5</string> + <string>BC5BFA60-002A-40F2-A6FE-72CEE4AAE330</string> + <string>C41EC675-F09C-4596-8C14-662403B27D54</string> + <string>8940F795-2A0A-411F-AB98-48DEAB07AD69</string> + <string>63A39832-470E-4839-8098-4CC537FAA46D</string> + <string>091C4224-A49A-4C68-AEA1-A25FEEAB0DE8</string> + <string>D7C796FB-389A-4D1B-A64B-BCAE45B4CEAF</string> + <string>86B6BF3F-C2C5-413C-A2FD-58D02D4B0AC0</string> + <string>FB9588B8-3540-41F6-BC2D-7A6F3083BDA4</string> + </array> + <key>uuid</key> + <string>5A009C17-72DB-453A-8BF9-02AFD085B5B8</string> +</dict> +</plist>

1 0

[commit] r12558 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: mikej Date: Tue Mar 10 16:38:45 2009 New Revision: 12558 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Tue Mar 10 16:38:45 2009 @@ -3824,6 +3824,26 @@ } +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_vmprintf(char * jarg1, void * jarg2) { + char * jresult ; + char *arg1 = (char *) 0 ; + va_list arg2 ; + char *result = 0 ; + va_list *argp2 ; + + arg1 = (char *)jarg1; + argp2 = (va_list *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null va_list", 0); + return 0; + } + arg2 = *argp2; + result = (char *)switch_vmprintf((char const *)arg1,arg2); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_switch_regex_compile(char * jarg1, int jarg2, void * jarg3, void * jarg4, void * jarg5) { void * jresult ; char *arg1 = (char *) 0 ; @@ -5010,6 +5030,20 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_remove_callback(void * jarg1, void * jarg2) { + int jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_media_bug_callback_t arg2 = (switch_media_bug_callback_t) 0 ; + switch_status_t result; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_media_bug_callback_t)jarg2; + result = (switch_status_t)switch_core_media_bug_remove_callback(arg1,arg2); + jresult = result; + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_close(void * jarg1) { int jresult ; switch_media_bug_t **arg1 = (switch_media_bug_t **) 0 ; @@ -10617,6 +10651,29 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_on_reporting_set(void * jarg1, void * jarg2) { + switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ; + switch_state_handler_t arg2 = (switch_state_handler_t) 0 ; + + arg1 = (switch_state_handler_table *)jarg1; + arg2 = (switch_state_handler_t)jarg2; + if (arg1) (arg1)->on_reporting = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_state_handler_table_on_reporting_get(void * jarg1) { + void * jresult ; + switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ; + switch_state_handler_t result; + + arg1 = (switch_state_handler_table *)jarg1; + result = (switch_state_handler_t) ((arg1)->on_reporting); + jresult = (void *)result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_state_handler_table_padding_set(void * jarg1, void * jarg2) { switch_state_handler_table *arg1 = (switch_state_handler_table *) 0 ; void **arg2 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Tue Mar 10 16:38:45 2009 @@ -817,6 +817,12 @@ return ret; } + public static string switch_vmprintf(string zFormat, SWIGTYPE_p_va_list ap) { + string ret = freeswitchPINVOKE.switch_vmprintf(zFormat, SWIGTYPE_p_va_list.getCPtr(ap)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + public static SWIGTYPE_p_real_pcre switch_regex_compile(string pattern, int options, ref string errorptr, SWIGTYPE_p_int erroroffset, SWIGTYPE_p_unsigned_char tables) { IntPtr cPtr = freeswitchPINVOKE.switch_regex_compile(pattern, options, ref errorptr, SWIGTYPE_p_int.getCPtr(erroroffset), SWIGTYPE_p_unsigned_char.getCPtr(tables)); SWIGTYPE_p_real_pcre ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_real_pcre(cPtr, false); @@ -924,6 +930,11 @@ return ret; } + public static switch_status_t switch_core_media_bug_remove_callback(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__switch_bool_t callback) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_media_bug_remove_callback(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__switch_bool_t.getCPtr(callback)); + return ret; + } + public static switch_status_t switch_core_media_bug_close(SWIGTYPE_p_p_switch_media_bug bug) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_media_bug_close(SWIGTYPE_p_p_switch_media_bug.getCPtr(bug)); return ret; @@ -5340,6 +5351,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_mprintf")] public static extern string switch_mprintf(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_vmprintf")] + public static extern string switch_vmprintf(string jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_regex_compile")] public static extern IntPtr switch_regex_compile(string jarg1, int jarg2, ref string jarg3, HandleRef jarg4, HandleRef jarg5); @@ -5622,6 +5636,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_media_bug_remove")] public static extern int switch_core_media_bug_remove(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_media_bug_remove_callback")] + public static extern int switch_core_media_bug_remove_callback(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_media_bug_close")] public static extern int switch_core_media_bug_close(HandleRef jarg1); @@ -6873,6 +6890,12 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_state_handler_table_on_park_get")] public static extern IntPtr switch_state_handler_table_on_park_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_state_handler_table_on_reporting_set")] + public static extern void switch_state_handler_table_on_reporting_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_state_handler_table_on_reporting_get")] + public static extern IntPtr switch_state_handler_table_on_reporting_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_state_handler_table_padding_set")] public static extern void switch_state_handler_table_padding_set(HandleRef jarg1, HandleRef jarg2); @@ -15384,6 +15407,36 @@ using System; using System.Runtime.InteropServices; +public class SWIGTYPE_p_va_list { + private HandleRef swigCPtr; + + internal SWIGTYPE_p_va_list(IntPtr cPtr, bool futureUse) { + swigCPtr = new HandleRef(this, cPtr); + } + + protected SWIGTYPE_p_va_list() { + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + + internal static HandleRef getCPtr(SWIGTYPE_p_va_list obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + +using System; +using System.Runtime.InteropServices; + public class SWIGTYPE_p_void { private HandleRef swigCPtr; @@ -17230,6 +17283,7 @@ namespace FreeSWITCH.Native { [System.Flags] public enum switch_caller_profile_flag_enum_t { + SWITCH_CPF_NONE = 0, SWITCH_CPF_SCREEN = (1 << 0), SWITCH_CPF_HIDE_NAME = (1 << 1), SWITCH_CPF_HIDE_NUMBER = (1 << 2) @@ -17294,6 +17348,7 @@ CF_VERBOSE_EVENTS, CF_PAUSE_BUGS, CF_DIVERT_EVENTS, + CF_BLOCK_STATE, CF_FLAG_MAX } @@ -17320,6 +17375,7 @@ CS_HIBERNATE, CS_RESET, CS_HANGUP, + CS_REPORTING, CS_DONE, CS_NONE } @@ -20058,6 +20114,7 @@ public enum switch_event_types_t { SWITCH_EVENT_CUSTOM, + SWITCH_EVENT_CLONE, SWITCH_EVENT_CHANNEL_CREATE, SWITCH_EVENT_CHANNEL_DESTROY, SWITCH_EVENT_CHANNEL_STATE, @@ -24071,7 +24128,8 @@ SWITCH_SHN_ON_CONSUME_MEDIA, SWITCH_SHN_ON_HIBERNATE, SWITCH_SHN_ON_RESET, - SWITCH_SHN_ON_PARK + SWITCH_SHN_ON_PARK, + SWITCH_SHN_ON_REPORTING } } @@ -24226,6 +24284,17 @@ } } + public SWIGTYPE_p_f_p_switch_core_session__switch_status_t on_reporting { + set { + freeswitchPINVOKE.switch_state_handler_table_on_reporting_set(swigCPtr, SWIGTYPE_p_f_p_switch_core_session__switch_status_t.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_state_handler_table_on_reporting_get(swigCPtr); + SWIGTYPE_p_f_p_switch_core_session__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_switch_core_session__switch_status_t(cPtr, false); + return ret; + } + } + public SWIGTYPE_p_p_void padding { set { freeswitchPINVOKE.switch_state_handler_table_padding_set(swigCPtr, SWIGTYPE_p_p_void.getCPtr(value));

1 0

[commit] r12557 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 10 Mar '09

10 Mar '09

Author: mikej Date: Tue Mar 10 14:58:34 2009 New Revision: 12557 Log: Wed Mar 4 12:24:57 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta_incoming_magic(): if callback is NULL, return any magic Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 10 14:58:34 2009 @@ -1 +1 @@ -Tue Mar 10 14:56:15 CDT 2009 +Tue Mar 10 14:57:43 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 10 14:58:34 2009 @@ -5828,11 +5828,21 @@ return irq ? irq->irq_status : 400; } -/** Get context pointer for an incoming transaction */ +/** Get application context for a server transaction. + * + * @param irq server transaction + * @param callback callback pointer + * + * Return the application context bound to the server transaction. If the @a + * callback function pointer is given, return application context only if + * the callback matches with the callback bound to the server transaction. + * + */ nta_incoming_magic_t *nta_incoming_magic(nta_incoming_t *irq, nta_ack_cancel_f *callback) { - return irq && irq->irq_callback == callback ? irq->irq_magic : NULL; + return irq && (callback == NULL || irq->irq_callback == callback) + ? irq->irq_magic : NULL; } /** When received.

1 0