- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6111 - freeswitch/trunk/src
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 17:03:15 2007 New Revision: 6111 Modified: freeswitch/trunk/src/switch_odbc.c Log: fix tupe Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Wed Oct 31 17:03:15 2007 @@ -185,7 +185,7 @@ { int ret = 0; SQLHSTMT stmt = NULL; - SQLINTEGER m = 0; + SQLLEN m = 0; int result; switch_event_t *event; switch_odbc_status_t recon = 0; @@ -305,7 +305,7 @@ { SQLHSTMT stmt = NULL; SQLSMALLINT c = 0, x = 0; - SQLINTEGER m = 0, t = 0; + SQLLEN m = 0, t = 0; int result; assert(callback != NULL);

1 0

[commit] r6110 - freeswitch/trunk/src
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 16:37:30 2007 New Revision: 6110 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: fix path bs Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Oct 31 16:37:30 2007 @@ -675,25 +675,14 @@ } if (!strstr(file, SWITCH_URL_SEPARATOR)) { - if (switch_is_file_path(file)) { - char *new_file; - uint32_t len; - len = (uint32_t) strlen(file) + (uint32_t) strlen(prefix) + 10; - new_file = switch_core_session_alloc(session, len); - snprintf(new_file, len, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, file); - file = new_file; + if (!switch_is_file_path(file)) { + file = switch_core_session_sprintf(session, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, file); } - if ((ext = strrchr(file, '.'))) { ext++; } else { - char *new_file; - uint32_t len; ext = read_codec->implementation->iananame; - len = (uint32_t) strlen(file) + (uint32_t) strlen(ext) + 2; - new_file = switch_core_session_alloc(session, len); - snprintf(new_file, len, "%s.%s", file, ext); - file = new_file; + file = switch_core_session_sprintf(session, "%s.%s", file, ext); asis = 1; } }

1 0

[commit] r6109 - freeswitch/trunk/src/mod/languages/mod_mono
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: brian Date: Wed Oct 31 16:12:22 2007 New Revision: 6109 Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Log: more path ps Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.c Wed Oct 31 16:12:22 2007 @@ -79,7 +79,7 @@ */ SWITCH_MODULE_LOAD_FUNCTION(mod_mono_load) { - *module_interface = &mono_module_interface; + *module_interface = mono_module_interface; /* Initialise memory pool */ if (switch_core_new_memory_pool(&mono_pool) != SWITCH_STATUS_SUCCESS) { @@ -99,8 +99,8 @@ char *assembly_dir = (char *) switch_core_alloc(mono_pool, assembly_dir_len); char *assembly_file = (char *) switch_core_alloc(mono_pool, assembly_file_len); - snprintf(assembly_dir, assembly_dir_len, "%s/%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_MONO_LIBDIR); - snprintf(assembly_file, assembly_file_len, "%s/%s%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_MONO_LIBDIR, SWITCH_MONO_ASSEMBLY); + snprintf(assembly_dir, assembly_dir_len, "%s%s%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR, SWITCH_MONO_LIBDIR); + snprintf(assembly_file, assembly_file_len, "%s%s%s%s", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR, SWITCH_MONO_LIBDIR, SWITCH_MONO_ASSEMBLY); if (switch_file_exists(assembly_file, mono_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not find FreeSwitch.NET assembly\n"); @@ -122,7 +122,7 @@ switch_size_t module_dir_len = strlen(SWITCH_GLOBAL_dirs.mod_dir) + strlen(SWITCH_MONO_MODULES) + 2; /* Account for / and \0 */ char *module_dir = (char *) switch_core_alloc(mono_pool, module_dir_len); - snprintf(module_dir, module_dir_len, "%s/%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_MONO_MODULES); + snprintf(module_dir, module_dir_len, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, SWITCH_MONO_MODULES); /* Initialise the mono domain */ if (!(globals.domain = mono_jit_init("freeswitch"))) {

1 0

[commit] r6108 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: brian Date: Wed Oct 31 16:06:21 2007 New Revision: 6108 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: more path bs Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed Oct 31 16:06:21 2007 @@ -101,7 +101,7 @@ switch_size_t olen; uint8_t *abuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0}; - snprintf(path_buf, sizeof(path_buf), "%s/%s", source->location, fname); + snprintf(path_buf, sizeof(path_buf), "%s%s%s", source->location, SWITCH_PATH_SEPARATOR, fname); fname = path_buf; if (switch_core_file_open(&fh, (char *)fname,

1 0

[commit] r6107 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: brian Date: Wed Oct 31 16:04:11 2007 New Revision: 6107 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: more path bs Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Oct 31 16:04:11 2007 @@ -2027,7 +2027,7 @@ if (!switch_is_file_path(file)) { if (conference->sound_prefix) { - if (!(dfile = switch_mprintf("%s/%s", conference->sound_prefix, file))) { + if (!(dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) { goto done; } file = dfile; @@ -2129,7 +2129,7 @@ if (!switch_is_file_path(file)) { if (member->conference->sound_prefix) { - if (!(dfile = switch_mprintf("%s/%s", member->conference->sound_prefix, file))) { + if (!(dfile = switch_mprintf("%s%s%s", member->conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) { goto done; } file = dfile; @@ -3814,7 +3814,7 @@ if (conference->sound_prefix) { - if (!(dpath = switch_mprintf("%s/%s", conference->sound_prefix, path))) { + if (!(dpath = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, path))) { status = SWITCH_STATUS_MEMERR; goto done; } @@ -4276,7 +4276,7 @@ char *dfile = NULL; if (conference->sound_prefix) { - dfile = switch_mprintf("%s/%s", conference->sound_prefix, conference->kicked_sound); + dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, conference->kicked_sound); assert(dfile); toplay = dfile; } else {

1 0

[commit] r6106 - freeswitch/trunk/src
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 16:03:30 2007 New Revision: 6106 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: fix path bs Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Oct 31 16:03:30 2007 @@ -675,7 +675,7 @@ } if (!strstr(file, SWITCH_URL_SEPARATOR)) { - if (prefix && *file != '/' && *file != '\\' && *(file + 1) != ':') { + if (switch_is_file_path(file)) { char *new_file; uint32_t len; len = (uint32_t) strlen(file) + (uint32_t) strlen(prefix) + 10;

1 0

[commit] r6105 - in freeswitch/trunk/src: . include
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 15:59:40 2007 New Revision: 6105 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_ivr_play_say.c Log: fix path bs Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Wed Oct 31 15:59:40 2007 @@ -50,7 +50,7 @@ codec->implementation->samples_per_second, \ codec->implementation->microseconds_per_frame / 1000) #ifdef WIN32 -#define switch_is_file_path(file) (*(file +1) == ':' || *file == '/' || strstr(file, SWITCH_URL_SEPARATOR)) +#define switch_is_file_path(file) (*file == '\\' || *(file +1) == ':' || *file == '/' || strstr(file, SWITCH_URL_SEPARATOR)) #else #define switch_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) #endif Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Oct 31 15:59:40 2007 @@ -680,7 +680,7 @@ uint32_t len; len = (uint32_t) strlen(file) + (uint32_t) strlen(prefix) + 10; new_file = switch_core_session_alloc(session, len); - snprintf(new_file, len, "%s/%s", prefix, file); + snprintf(new_file, len, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, file); file = new_file; }

1 0

[commit] r6104 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: lzwierko Date: Wed Oct 31 15:57:31 2007 New Revision: 6104 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.h Log: Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Oct 31 15:57:31 2007 @@ -1,8 +1,8 @@ /* * mod_opalh323.cpp * - * Opal-H323 gluer for Freeswitch - * This file implements fontend of OpalH323 module functions + * Opal gluer for Freeswitch + * This file implements fontend of Opal module functions * that is all functions that are used for communication * between FreeSWITCH core and this module * @@ -24,7 +24,7 @@ * * Contributor(s): * - * $Log: mod_opalh323.cpp,v $ + * $Log: mod_opal.cpp,v $ * * Revision 1.00 2007/10/24 07:29:52 lzwierko * Initial revision @@ -111,6 +111,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"Starting loading mod_opal\n"); /* frontend initialization*/ *module_interface =NULL; *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -118,6 +119,7 @@ assert(*module_interface); if(!module_interface) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"Can not create loadable module interfacer\n"); return SWITCH_STATUS_MEMERR; } opalh323_endpoint_interface = (switch_endpoint_interface_t*)switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); @@ -130,16 +132,19 @@ assert(opal_manager); if(!opal_manager) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"Can not create opal manger\n"); return SWITCH_STATUS_MEMERR; } if(!opal_manager->initialize(modname,pool,opalh323_endpoint_interface)) { delete opal_manager; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"Can not initialize opal manger\n"); return SWITCH_STATUS_FALSE; /* if can't initialize return general error */ } /* indicate that the module should continue to be loaded */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,"mod_opal loaded ok!\n"); return SWITCH_STATUS_SUCCESS; } @@ -149,7 +154,7 @@ * it dealocates OPAL core * */ -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opalh323_shutdown) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opal_shutdown) { /* deallocate OPAL manager */ delete opal_manager; Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Wed Oct 31 15:57:31 2007 @@ -1,7 +1,7 @@ /* * mod_opalh323.h * - * Opal-H323 gluer for Freeswitch header file + * Opal gluer for Freeswitch header file * * Copyright (c) 2007 Lukasz Zwierko (lzwierko(a)gmail.com) * @@ -20,7 +20,7 @@ * * Contributor(s): ______________________________________. * - * $Log: mod_opalh323.cpp,v $ + * $Log: mod_opal.cpp,v $ * * Revision 1.00 2007/10/24 07:29:52 lzwierko * Initial revision Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.cpp Wed Oct 31 15:57:31 2007 @@ -1,7 +1,7 @@ /* * opalh323_backend.cpp * - * Backend for OpalH323 module, implements + * Backend for Opal module, implements * H323 handling via OPAL library * * Copyright (c) 2007 Lukasz Zwierko (lzwierko(a)gmail.com) @@ -21,7 +21,7 @@ * * Contributor(s): * - * $Log: opalh323_backend.cpp,v $ + * $Log: opal_backend.cpp,v $ * * Revision 1.00 2007/10/24 07:29:52 lzwierko * Initial revision @@ -229,7 +229,7 @@ if(!session) { ///TODO add cause to the connection - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate session object?\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate session object?\n"); return FALSE; } @@ -239,7 +239,7 @@ { ///TODO add cause to the connection switch_core_session_destroy(&session); - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate private object?\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate private object?\n"); return false; } tech_pvt->m_opalConnection = &connection; @@ -299,7 +299,7 @@ /** lunch thread */ if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); deleteSessionToken(connection.GetToken()); switch_mutex_unlock(tech_pvt->m_mutex); OpalH323Private_Delete(tech_pvt); @@ -436,55 +436,55 @@ switch(i_message->message_id) { case SWITCH_MESSAGE_REDIRECT_AUDIO: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_REDIRECT_AUDIO\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG ,"SWITCH_MESSAGE_REDIRECT_AUDIO\n"); break; case SWITCH_MESSAGE_TRANSMIT_TEXT: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_TRANSMIT_TEXT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_TRANSMIT_TEXT\n"); break; case SWITCH_MESSAGE_INDICATE_ANSWER: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_ANSWER\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_ANSWER\n"); /* set call answer */ //tech_prv->m_opalConnection->AnsweringCall(AnswerCallNow); break; case SWITCH_MESSAGE_INDICATE_PROGRESS: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_PROGRESS\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_PROGRESS\n"); break; case SWITCH_MESSAGE_INDICATE_BRIDGE: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BRIDGE\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_BRIDGE\n"); break; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNBRIDGE\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_UNBRIDGE\n"); break; case SWITCH_MESSAGE_INDICATE_TRANSFER: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_TRANSFER\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_TRANSFER\n"); break; case SWITCH_MESSAGE_INDICATE_RINGING: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_RINGING\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_RINGING\n"); break; case SWITCH_MESSAGE_INDICATE_MEDIA: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_MEDIA\n"); break; case SWITCH_MESSAGE_INDICATE_NOMEDIA: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_NOMEDIA\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_NOMEDIA\n"); break; case SWITCH_MESSAGE_INDICATE_HOLD: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_HOLD\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_HOLD\n"); break; case SWITCH_MESSAGE_INDICATE_UNHOLD: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNHOLD\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_UNHOLD\n"); break; case SWITCH_MESSAGE_INDICATE_REDIRECT: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REDIRECT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_REDIRECT\n"); break; case SWITCH_MESSAGE_INDICATE_REJECT: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REJECT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_REJECT\n"); break; case SWITCH_MESSAGE_INDICATE_BROADCAST: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BROADCAST\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_BROADCAST\n"); break; case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT\n"); break; } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.h Wed Oct 31 15:57:31 2007 @@ -21,7 +21,7 @@ * * Contributor(s): * - * $Log: opalh323_backend.cpp,v $ + * $Log: opal_backend.cpp,v $ * * Revision 1.00 2007/10/24 07:29:52 lzwierko * Initial revision

1 0

[commit] r6103 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 14:51:22 2007 New Revision: 6103 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Log: change types for odbc Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Wed Oct 31 14:51:22 2007 @@ -356,7 +356,7 @@ if (odbc_obj->stmt) { SQLSMALLINT c = 0, x = 0; - SQLINTEGER m = 0; + SQLLEN m = 0; char code[66560]; snprintf(code, sizeof(code), "~var _oDbC_dB_RoW_DaTa_ = {}"); @@ -370,7 +370,7 @@ if (m > 0) { for (x = 1; x <= c; x++) { SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLUINTEGER ColumnSize; + SQLULEN ColumnSize; SQLCHAR name[1024] = ""; SQLCHAR *data = odbc_obj->colbuf; SQLCHAR *esc = NULL;

1 0

[commit] r6102 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 14:47:03 2007 New Revision: 6102 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: change types for odbc 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 Oct 31 14:47:03 2007 @@ -1885,11 +1885,11 @@ char *ret = NULL; SQLHSTMT stmt; SQLCHAR name[1024]; - SQLINTEGER m = 0; + SQLLEN m = 0; if (switch_odbc_handle_exec(profile->master_odbc, sql, &stmt) == SWITCH_ODBC_SUCCESS) { SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLUINTEGER ColumnSize; + SQLULEN ColumnSize; SQLRowCount(stmt, &m); if (m <= 0) { @@ -1901,7 +1901,7 @@ } SQLDescribeCol(stmt, 1, name, sizeof(name), &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); - SQLGetData(stmt, 1, SQL_C_CHAR, (SQLCHAR *)resbuf, (SQLINTEGER)len, NULL); + SQLGetData(stmt, 1, SQL_C_CHAR, (SQLCHAR *)resbuf, (SQLLEN)len, NULL); SQLFreeHandle(SQL_HANDLE_STMT, stmt); ret = resbuf; }

1 0