January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11332 - freeswitch/trunk/conf
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: brian Date: Wed Jan 21 12:48:54 2009 New Revision: 11332 Log: FSSCRIPTS-13 Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Jan 21 12:48:54 2009 @@ -129,6 +129,7 @@ <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/> <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/> <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500, 3500, 440.0, 0.0)"/> + <X-PRE-PROCESS cmd="set" data="rs-ring=%(1000, 4000, 425.0, 0.0)"/> <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/> <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/> <!--

1 0

[commit] r11331 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: anthm Date: Wed Jan 21 12:44:07 2009 New Revision: 11331 Log: FSCORE-276 Modified: freeswitch/trunk/src/switch_odbc.c Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Wed Jan 21 12:44:07 2009 @@ -32,6 +32,10 @@ #include <switch.h> #include <switch_odbc.h> +#if (ODBCVER < 0x0300) +#define SQL_NO_DATA SQL_SUCCESS +#endif + struct switch_odbc_handle { char *dsn; char *username; @@ -222,6 +226,10 @@ result = SQLExecute(stmt); + if (result != SQL_SUCCESS && result != SQL_SUCCESS_WITH_INFO) { + goto error; + } + SQLRowCount (stmt, &m); rc = SQLNumResultCols (stmt, &nresultcols); if (rc != SQL_SUCCESS){ @@ -351,7 +359,7 @@ result = SQLExecute(stmt); - if (result != SQL_SUCCESS && result != SQL_SUCCESS_WITH_INFO) { + if (result != SQL_SUCCESS && result != SQL_SUCCESS_WITH_INFO && result != SQL_NO_DATA) { goto error; } @@ -366,8 +374,12 @@ int y = 0; int done = 0; - if (!(result = SQLFetch(stmt)) == SQL_SUCCESS) { - err++; + result = SQLFetch(stmt); + + if (result != SQL_SUCCESS) { + if (result != SQL_NO_DATA){ + err++; + } break; }

1 0

[commit] r11330 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: anthm Date: Wed Jan 21 12:41:53 2009 New Revision: 11330 Log: MODAPP-201 Modified: freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Wed Jan 21 12:41:53 2009 @@ -37,8 +37,13 @@ static void switch_core_media_bug_destroy(switch_media_bug_t *bug) { - switch_buffer_destroy(&bug->raw_read_buffer); - switch_buffer_destroy(&bug->raw_write_buffer); + if (bug->raw_read_buffer) { + switch_buffer_destroy(&bug->raw_read_buffer); + } + + if (bug->raw_write_buffer) { + switch_buffer_destroy(&bug->raw_write_buffer); + } } SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(switch_media_bug_t *bug, uint32_t flag) @@ -197,8 +202,10 @@ switch_media_bug_t *bug; //, *bp; switch_size_t bytes; - if (flags & SMBF_WRITE_REPLACE) { + *new_bug = NULL; + #if 0 + if (flags & SMBF_WRITE_REPLACE) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { @@ -208,11 +215,9 @@ } } switch_thread_rwlock_unlock(session->bug_rwlock); -#endif } if (flags & SMBF_READ_REPLACE) { -#if 0 switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { if (switch_test_flag(bp, SMBF_READ_REPLACE)) { @@ -222,8 +227,8 @@ } } switch_thread_rwlock_unlock(session->bug_rwlock); -#endif } +#endif if (!(bug = switch_core_session_alloc(session, sizeof(*bug)))) { return SWITCH_STATUS_MEMERR; @@ -260,8 +265,7 @@ if (bug->callback) { switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT); if (result == SWITCH_FALSE) { - switch_core_media_bug_remove(session, &bug); - *new_bug = NULL; + switch_core_media_bug_destroy(bug); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error attaching BUG to %s\n", switch_channel_get_name(session->channel)); return SWITCH_STATUS_GENERR; } @@ -377,7 +381,9 @@ last = bp; } switch_thread_rwlock_unlock(session->bug_rwlock); - status = switch_core_media_bug_close(&bp); + if (bp) { + status = switch_core_media_bug_close(&bp); + } } if (!session->bugs && session->bug_codec.implementation) {

1 0

[commit] r11329 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: silik0n Date: Wed Jan 21 01:49:25 2009 New Revision: 11329 Log: fix a few bugs Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Wed Jan 21 01:49:25 2009 @@ -154,21 +154,23 @@ status = SWITCH_STATUS_FALSE; goto reallydone; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Opened ODBC Database!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opened ODBC Database!\n"); } if (switch_odbc_handle_connect(globals.master_odbc) != SWITCH_ODBC_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); status = SWITCH_STATUS_FALSE; goto reallydone; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Opened ODBC Database!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opened ODBC Database!\n"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.db_dsn); - if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from numbers", NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the numbers table\?\?)\n"); - } - if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from gateways", NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the gateways table\?\?)\n"); + if (!globals.custom_query){ + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from numbers", NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the numbers table\?\?)\n"); + } + if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from gateways", NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the gateways table\?\?)\n"); + } } } else { #endif @@ -191,30 +193,29 @@ return status; } -static char SQL_LOOKUP[] = "SELECT gateways.gateway_ip, gateways.group, gateways.limit, gateways.techprofile, numbers.acctcode, numbers.translated from gateways, numbers where numbers.number = '%s' and numbers.gateway_id = gateways.gateway_id limit 1;"; +static char SQL_LOOKUP[] = "SELECT gateways.gateway_ip, gateways.group, gateways.limit, gateways.techprofile, numbers.acctcode, numbers.translated from gateways, numbers where numbers.number = '%q' and numbers.gateway_id = gateways.gateway_id limit 1;"; static switch_status_t route_lookup(char *dn, easyroute_results_t *results, int noat, char *seperator) { +#ifdef SWITCH_HAVE_ODBC switch_status_t sstatus = SWITCH_STATUS_SUCCESS; - char sql[1024] = ""; + char *sql = NULL; route_callback_t pdata; memset(&pdata, 0, sizeof(pdata)); if (!globals.custom_query){ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing static Query\n[%s]\n", SQL_LOOKUP); - snprintf(sql, 1024, SQL_LOOKUP, dn); + sql = switch_mprintf(SQL_LOOKUP, dn); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing static Query\n[%s]\n", sql); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing custom Query\n[%s]\n", globals.custom_query); - snprintf(sql, 1024, globals.custom_query, dn); + sql = switch_mprintf(globals.custom_query, dn); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing custom Query\n[%s]\n", sql); } if (globals.mutex){ switch_mutex_lock(globals.mutex); } /* Do the Query */ -#ifdef SWITCH_HAVE_ODBC if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, route_callback, &pdata) == SWITCH_ODBC_SUCCESS){ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL Query\n[%s]\n", sql); char tmp_profile[129]; char tmp_gateway[129]; @@ -341,7 +342,7 @@ return SWITCH_STATUS_FALSE; } -#ifdef SWITCH_HAVE_ODBC +#ifndef SWITCH_HAVE_ODBC stream->write_function(stream, "mod_easyroute requires you enable core odbc support\n"); return SWITCH_STATUS_SUCCESS; #endif @@ -359,6 +360,7 @@ } if (argc == 2) { if (!strcasecmp(argv[1], "noat")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Entering noat.\n"); noat = 1; } else if (!strcasecmp(argv[1], "seperator")) { if (argc == 3){

1 0

[commit] r11328 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: mikej Date: Tue Jan 20 20:18:03 2009 New Revision: 11328 Log: fix build Modified: freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Tue Jan 20 20:18:03 2009 @@ -260,7 +260,8 @@ if (bug->callback) { switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT); if (result == SWITCH_FALSE) { - switch_core_media_bug_remove(session, new_bug); + switch_core_media_bug_remove(session, &bug); + *new_bug = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error attaching BUG to %s\n", switch_channel_get_name(session->channel)); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Jan 20 20:18:03 2009 @@ -388,6 +388,11 @@ int hits = 2; char *p = ring_array[fx], *q; + if (!p) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n"); + continue; + } + if (!(hits = atoi(p))) { hits = 2; }

1 0

[commit] r11327 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: mikej Date: Tue Jan 20 20:09:41 2009 New Revision: 11327 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 Jan 20 20:09:41 2009 @@ -7817,6 +7817,32 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_chat_send(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8) { + int jresult ; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + char *arg5 = (char *) 0 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + char *arg8 = (char *) 0 ; + switch_status_t result; + + arg1 = (char *)jarg1; + arg2 = (char *)jarg2; + arg3 = (char *)jarg3; + arg4 = (char *)jarg4; + arg5 = (char *)jarg5; + arg6 = (char *)jarg6; + arg7 = (char *)jarg7; + arg8 = (char *)jarg8; + result = (switch_status_t)switch_core_chat_send((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8); + jresult = result; + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CMD_CHUNK_LEN_get() { int jresult ; int result; @@ -14764,10 +14790,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_chat_interface_chat_send_set(void * jarg1, void * jarg2) { switch_chat_interface *arg1 = (switch_chat_interface *) 0 ; - switch_status_t (*arg2)(char *,char *,char *,char *,char *,char *) = (switch_status_t (*)(char *,char *,char *,char *,char *,char *)) 0 ; + switch_status_t (*arg2)(char const *,char const *,char const *,char const *,char const *,char const *,char const *) = (switch_status_t (*)(char const *,char const *,char const *,char const *,char const *,char const *,char const *)) 0 ; arg1 = (switch_chat_interface *)jarg1; - arg2 = (switch_status_t (*)(char *,char *,char *,char *,char *,char *))jarg2; + arg2 = (switch_status_t (*)(char const *,char const *,char const *,char const *,char const *,char const *,char const *))jarg2; if (arg1) (arg1)->chat_send = arg2; } @@ -14776,10 +14802,10 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_chat_interface_chat_send_get(void * jarg1) { void * jresult ; switch_chat_interface *arg1 = (switch_chat_interface *) 0 ; - switch_status_t (*result)(char *,char *,char *,char *,char *,char *) = 0 ; + switch_status_t (*result)(char const *,char const *,char const *,char const *,char const *,char const *,char const *) = 0 ; arg1 = (switch_chat_interface *)jarg1; - result = (switch_status_t (*)(char *,char *,char *,char *,char *,char *)) ((arg1)->chat_send); + result = (switch_status_t (*)(char const *,char const *,char const *,char const *,char const *,char const *,char const *)) ((arg1)->chat_send); jresult = (void *)result; return jresult; } 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 Jan 20 20:09:41 2009 @@ -1943,6 +1943,11 @@ freeswitchPINVOKE.switch_cond_next(); } + public static switch_status_t switch_core_chat_send(string name, string proto, string from, string to, string subject, string body, string type, string hint) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_chat_send(name, proto, from, to, subject, body, type, hint); + return ret; + } + public static void switch_console_loop() { freeswitchPINVOKE.switch_console_loop(); } @@ -6183,6 +6188,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_cond_next")] public static extern void switch_cond_next(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_chat_send")] + public static extern int switch_core_chat_send(string jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_CMD_CHUNK_LEN_get")] public static extern int SWITCH_CMD_CHUNK_LEN_get(); @@ -11286,18 +11294,18 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t { +public class SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t { private HandleRef swigCPtr; - internal SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t() { + protected SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -11316,18 +11324,18 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t { +public class SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t { private HandleRef swigCPtr; - internal SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t() { + protected SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_f_p_p_switch_core_session_p_p_apr_pool_t_p_void__switch_call_cause_t obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -11346,18 +11354,18 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t { +public class SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t { private HandleRef swigCPtr; - internal SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t() { + protected SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_f_p_p_switch_loadable_module_interface_p_apr_pool_t__switch_status_t obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -17410,13 +17418,13 @@ } } - public SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t chat_send { + public SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t chat_send { set { - freeswitchPINVOKE.switch_chat_interface_chat_send_set(swigCPtr, SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t.getCPtr(value)); + freeswitchPINVOKE.switch_chat_interface_chat_send_set(swigCPtr, SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t.getCPtr(value)); } get { IntPtr cPtr = freeswitchPINVOKE.switch_chat_interface_chat_send_get(swigCPtr); - SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_char_p_char_p_char_p_char_p_char_p_char__switch_status_t(cPtr, false); + SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char__switch_status_t(cPtr, false); return ret; } }

1 0

[commit] r11326 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: brian Date: Tue Jan 20 17:53:05 2009 New Revision: 11326 Log: cast to char 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 Tue Jan 20 17:53:05 2009 @@ -540,7 +540,7 @@ *p = '\0'; } } - ldl_handle_send_msg(profile->handle, from, to, NULL, switch_str_nil(body)); + ldl_handle_send_msg(profile->handle, (char*)from, (char*)to, NULL, switch_str_nil(body)); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile %s\n", f_host ? f_host : "NULL"); return SWITCH_STATUS_FALSE;

1 0

[commit] r11325 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: brian Date: Tue Jan 20 17:43:34 2009 New Revision: 11325 Log: doh 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 Tue Jan 20 17:43:34 2009 @@ -507,7 +507,7 @@ } static switch_status_t chat_send(const char *proto, const char *from, const char *to, const char *subject, - const char *body, const char *type, const char *hint); + const char *body, const char *type, const char *hint) { char *user, *host, *f_user = NULL, *ffrom = NULL, *f_host = NULL, *f_resource = NULL; mdl_profile_t *profile = NULL;

1 0

[commit] r11324 - freeswitch/trunk/src/mod/languages/mod_managed
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: michaelgg Date: Tue Jan 20 16:35:15 2009 New Revision: 11324 Log: This should fix mono crash on Linux Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Tue Jan 20 16:35:15 2009 @@ -47,6 +47,7 @@ #include <mono/jit/jit.h> #include <mono/metadata/assembly.h> #include <mono/metadata/environment.h> +#include <mono/metadata/mono-config.h> #include <mono/metadata/threads.h> #include <mono/metadata/debug-helpers.h> #endif Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Tue Jan 20 16:35:15 2009 @@ -49,7 +49,7 @@ SWITCH_BEGIN_EXTERN_C SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load); -SWITCH_MODULE_DEFINITION(mod_managed, mod_managed_load, NULL, NULL); +SWITCH_MODULE_DEFINITION_EX(mod_managed, mod_managed_load, NULL, NULL, SMODF_GLOBAL_SYMBOLS); SWITCH_STANDARD_API(managedrun_api_function); /* ExecuteBackground */ SWITCH_STANDARD_API(managed_api_function); /* Execute */ @@ -186,6 +186,11 @@ return SWITCH_STATUS_FALSE; } +#ifndef WIN32 + // So linux can find the .so + mono_config_parse_memory("<configuration><dllmap dll=\"mod_managed\" target=\"mod_managed.so\"/></configuration>"); +#endif + switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL); globals.domain = mono_jit_init(filename); @@ -336,13 +341,12 @@ /* Run loader */ MonoObject * exception = NULL; MonoObject * objResult = mono_runtime_invoke(globals.loadMethod, NULL, NULL, &exception); - success = *(int *) mono_object_unbox(objResult); - if (exception) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load threw an exception.\n"); mono_print_unhandled_exception(exception); return SWITCH_STATUS_FALSE; } + success = *(int *) mono_object_unbox(objResult); #endif if (success) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n");

1 0

[commit] r11323 - freeswitch/trunk
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: brian Date: Tue Jan 20 15:55:27 2009 New Revision: 11323 Log: try to fix osx build when you --enable-core-odbc-support Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Jan 20 15:55:27 2009 @@ -153,7 +153,7 @@ lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) -libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) +libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_DEPLIBS) libfreeswitch_la_LIBADD = $(CORE_LIBS) libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES) nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jan 20 15:55:27 2009 @@ -175,11 +175,15 @@ AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) ESL_LDFLAGS= +PLATFORM_CORE_DEPLIBS= # tweak platform specific flags case "$host" in *darwin*) APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX) APR_REMOVEFROM(SWITCH_AM_CFLAGS, -fPIC) + if test "x$enable_core_odbc_support" != "xno"; then + APR_ADDTO(PLATFORM_CORE_DEPLIBS, --framework CoreFoundation) + fi ;; *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) @@ -196,6 +200,7 @@ AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS) AC_SUBST(ESL_LDFLAGS) +AC_SUBST(PLATFORM_CORE_DEPLIBS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN)

1 0