- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5295 - freeswitch/trunk/libs/libteletone/src
by Freeswitch SVN 08 Jun '07

08 Jun '07

Author: mikej Date: Fri Jun 8 12:15:03 2007 New Revision: 5295 Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Log: solaris requires us to use inline not __inline__ Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Fri Jun 8 12:15:03 2007 @@ -80,9 +80,8 @@ #include <stdio.h> #include <stdlib.h> #ifdef _MSC_VER -#ifndef __inline__ -#define __inline__ __inline -#endif +#undef inline +#define inline __inline typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; @@ -131,7 +130,7 @@ extern int16_t TELETONE_SINES[SINE_TABLE_MAX]; -static __inline__ int16_t teletone_dds_modulate_sample(teletone_dds_state_t *dds) +static inline int16_t teletone_dds_modulate_sample(teletone_dds_state_t *dds) { int32_t bitmask = dds->phase_accumulator, sine_index = (bitmask >>= 23) & SINE_TABLE_LEN; int16_t sample; @@ -151,12 +150,12 @@ return (int16_t) (sample * dds->scale_factor >> 15); } -static __inline__ void teletone_dds_state_set_tx_level(teletone_dds_state_t *dds, float tx_level) +static inline void teletone_dds_state_set_tx_level(teletone_dds_state_t *dds, float tx_level) { dds->scale_factor = (int) (powf(10.0f, (tx_level - DBM0_MAX_POWER) / 20.0f) * (32767.0f * 1.414214f)); } -static __inline__ void teletone_dds_state_set_tone(teletone_dds_state_t *dds, teletone_process_t tone, uint32_t rate, float tx_level) +static inline void teletone_dds_state_set_tone(teletone_dds_state_t *dds, teletone_process_t tone, uint32_t rate, float tx_level) { dds->phase_accumulator = 0; dds->phase_rate = (int32_t) ((tone * MAX_PHASE_ACCUMULATOR) / rate);

1 0

[commit] r5294 - freeswitch/trunk/conf
by Freeswitch SVN 08 Jun '07

08 Jun '07

Author: anthm Date: Fri Jun 8 11:47:33 2007 New Revision: 5294 Modified: freeswitch/trunk/conf/directory.xml Log: add missing example to config Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Fri Jun 8 11:47:33 2007 @@ -35,6 +35,12 @@   </params> + <variables> +  + <variable name="testing" value="this"/> +  + </variables> + <vcard>  </vcard>

1 0

[commit] r5293 - freeswitch/trunk/src
by Freeswitch SVN 08 Jun '07

08 Jun '07

Author: anthm Date: Fri Jun 8 11:43:59 2007 New Revision: 5293 Modified: freeswitch/trunk/src/switch_core_sqldb.c Log: change language in harmless sql warnings and skip one we know happens all the time for no reason Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri Jun 8 11:43:59 2007 @@ -64,9 +64,10 @@ if (errmsg) { begin_retries--; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", errmsg); if (strstr(errmsg, "cannot start a transaction within a transaction")) { again = 1; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL Retry [%s]\n", errmsg); } switch_core_db_free(errmsg);

1 0

[commit] r5292 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan
by Freeswitch SVN 08 Jun '07

08 Jun '07

Author: mikej Date: Fri Jun 8 11:34:39 2007 New Revision: 5292 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Log: merge changes from MODLANG-30 and MODLANG-31. changed to use switch_cut_path instead of basename for portablility. Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Fri Jun 8 11:34:39 2007 @@ -128,7 +128,7 @@ if (file) { snprintf(buf, B64BUFFLEN, "\n\n--%s\nContent-Type: application/octet-stream\n" "Content-Transfer-Encoding: base64\n" - "Content-Description: Sound attachment.\n" "Content-Disposition: attachment; filename=\"%s\"\n\n", bound, file); + "Content-Description: Sound attachment.\n" "Content-Disposition: attachment; filename=\"%s\"\n\n", bound, (argc > 5) ? JS_GetStringBytes(JS_ValueToString(cx,argv[5])) : switch_cut_path(file)); if (!write_buf(fd, buf)) return JS_FALSE;

1 0

[commit] r5291 - in freeswitch/trunk/src: . mod/event_handlers/mod_event_socket
by Freeswitch SVN 08 Jun '07

08 Jun '07

Author: anthm Date: Fri Jun 8 11:17:43 2007 New Revision: 5291 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_event.c Log: fix accidental missing event enum name Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Jun 8 11:17:43 2007 @@ -129,19 +129,24 @@ if (!switch_test_flag(l, LFLAG_EVENTS)) { continue; } - - if (l->event_list[(uint8_t) SWITCH_EVENT_ALL]) { + + if (l->event_list[SWITCH_EVENT_ALL]) { send = 1; - } else if ((l->event_list[(uint8_t) event->event_id])) { + } else if ((l->event_list[event->event_id])) { if (event->event_id != SWITCH_EVENT_CUSTOM || (event->subclass && switch_core_hash_find(l->event_hash, event->subclass->name))) { send = 1; } + } else { + int x; + for(x = 0; x <= SWITCH_EVENT_ALL; x++) { + printf("%d ", l->event_list[x]); + } } if (send && switch_test_flag(l, LFLAG_MYEVENTS)) { char *uuid = switch_event_get_header(event, "unique-id"); if (!uuid || strcmp(uuid, switch_core_session_get_uuid(l->session))) { - send = 1; + send = 0; } } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Jun 8 11:17:43 2007 @@ -133,6 +133,7 @@ "CODEC", "BACKGROUND_JOB", "DETECTED_SPEECH", + "DETECTED_FAX", "PRIVATE_COMMAND", "HEARTBEAT", "TRAP",

1 0

[commit] r5290 - in freeswitch/trunk: . src src/include
by Freeswitch SVN 08 Jun '07

08 Jun '07

Author: mikej Date: Fri Jun 8 10:52:50 2007 New Revision: 5290 Modified: freeswitch/trunk/configure.in freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_stun.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_xml.c Log: sun studio/solaris build fixes Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Jun 8 10:52:50 2007 @@ -123,6 +123,8 @@ APR_ADDTO(SWITCH_AM_CFLAGS, -DPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -KPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -DPIC) + APR_ADDTO(SWITCH_AM_CXXFLAGS, "-features=extensions") + APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib) elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Fri Jun 8 10:52:50 2007 @@ -53,8 +53,10 @@ #define __EXTENSIONS__ 1 #ifndef MACOSX #ifndef _XOPEN_SOURCE +#ifndef __cplusplus #define _XOPEN_SOURCE 600 #endif +#endif #ifndef __BSD_VISIBLE #define __BSD_VISIBLE 1 #endif Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Fri Jun 8 10:52:50 2007 @@ -26,7 +26,7 @@ switch_input_args_t *ap; public: CoreSession(char *uuid); - CoreSession(switch_core_session_t *session); + CoreSession(switch_core_session_t *new_session); ~CoreSession(); switch_core_session_t *session; switch_channel_t *channel; Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Fri Jun 8 10:52:50 2007 @@ -562,7 +562,7 @@ typedef enum { SWITCH_IVR_MENU_FLAG_FALLTOMAIN = (1 << 0), SWITCH_IVR_MENU_FLAG_FREEPOOL = (1 << 1), - SWITCH_IVR_MENU_FLAG_STACK = (1 << 2), + SWITCH_IVR_MENU_FLAG_STACK = (1 << 2) } switch_ivr_menu_flags; /* Actions are either set in switch_ivr_menu_bind_function or returned by a callback */ typedef enum { @@ -575,7 +575,7 @@ SWITCH_IVR_ACTION_BACK, /* Go back 1 menu. */ SWITCH_IVR_ACTION_TOMAIN, /* Go back to the top level menu. */ SWITCH_IVR_ACTION_TRANSFER, /* Transfer caller to another ext. */ - SWITCH_IVR_ACTION_NOOP, /* No operation */ + SWITCH_IVR_ACTION_NOOP /* No operation */ } switch_ivr_action_t; struct switch_ivr_menu; typedef switch_ivr_action_t switch_ivr_menu_action_function_t(struct switch_ivr_menu *, char *, char *, size_t, void *); Modified: freeswitch/trunk/src/include/switch_stun.h ============================================================================== --- freeswitch/trunk/src/include/switch_stun.h (original) +++ freeswitch/trunk/src/include/switch_stun.h Fri Jun 8 10:52:50 2007 @@ -106,12 +106,12 @@ typedef struct { int16_t type; uint16_t length; - char value[]; + char value[1]; } switch_stun_packet_attribute_t; typedef struct { switch_stun_packet_header_t header; - uint8_t first_attribute[]; + uint8_t first_attribute[1]; } switch_stun_packet_t; typedef struct { Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Jun 8 10:52:50 2007 @@ -161,7 +161,7 @@ SST_POSTAL_ADDRESS, SST_ACCOUNT_NUMBER, SST_NAME_SPELLED, - SST_NAME_PHONETIC, + SST_NAME_PHONETIC } switch_say_type_t; typedef enum { @@ -196,7 +196,7 @@ SWITCH_ABC_TYPE_READ, SWITCH_ABC_TYPE_WRITE, SWITCH_ABC_TYPE_WRITE_REPLACE, - SWITCH_ABC_TYPE_CLOSE, + SWITCH_ABC_TYPE_CLOSE } switch_abc_type_t; typedef struct { @@ -332,7 +332,7 @@ typedef enum { SWITCH_PRIORITY_NORMAL, SWITCH_PRIORITY_LOW, - SWITCH_PRIORITY_HIGH, + SWITCH_PRIORITY_HIGH } switch_priority_t; /*! @@ -702,7 +702,7 @@ </pre> */ typedef enum { - SWITCH_DIRECTORY_FLAG_FREE_POOL = (1 << 0), + SWITCH_DIRECTORY_FLAG_FREE_POOL = (1 << 0) } switch_directory_flag_t; @@ -732,7 +732,7 @@ </pre> */ typedef enum { - SWITCH_TIMER_FLAG_FREE_POOL = (1 << 0), + SWITCH_TIMER_FLAG_FREE_POOL = (1 << 0) } switch_timer_flag_t; @@ -786,7 +786,7 @@ } switch_file_flag_t; typedef enum { - SWITCH_IO_FLAG_NOOP = 0, + SWITCH_IO_FLAG_NOOP = 0 } switch_io_flag_t; /* make sure this is synced with the EVENT_NAMES array in switch_event.c Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri Jun 8 10:52:50 2007 @@ -6,6 +6,7 @@ #endif #define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) +#define sanity_check_noreturn do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0) #define init_vars() do { session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; memset(&args, 0, sizeof(args)); ap = NULL;} while(0) CoreSession::CoreSession(char *nuuid) @@ -17,9 +18,10 @@ } } -CoreSession::CoreSession(switch_core_session_t *session) +CoreSession::CoreSession(switch_core_session_t *new_session) { init_vars(); + session = new_session; channel = switch_core_session_get_channel(session); switch_core_session_read_lock(session); } @@ -55,13 +57,13 @@ void CoreSession::hangup(char *cause) { - sanity_check(); + sanity_check_noreturn; switch_channel_hangup(channel, switch_channel_str2cause(cause)); } void CoreSession::setVariable(char *var, char *val) { - sanity_check(); + sanity_check_noreturn; switch_channel_set_variable(channel, var, val); } @@ -74,7 +76,7 @@ void CoreSession::execute(char *app, char *data) { const switch_application_interface_t *application_interface; - sanity_check(); + sanity_check_noreturn; if ((application_interface = switch_loadable_module_get_application_interface(app))) { begin_allow_threads(); @@ -99,7 +101,7 @@ void CoreSession::setDTMFCallback(switch_input_callback_function_t cb, void *buf, uint32_t buflen) { - sanity_check(); + sanity_check_noreturn; if (cb) { args.buf = buf; args.buflen = buflen; @@ -126,7 +128,7 @@ void CoreSession::set_tts_parms(char *tts_name_p, char *voice_name_p) { - sanity_check(); + sanity_check_noreturn; switch_safe_free(tts_name); switch_safe_free(voice_name); tts_name = strdup(tts_name_p); Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri Jun 8 10:52:50 2007 @@ -60,6 +60,9 @@ #ifdef HAVE_MMAP #include <sys/mman.h> +#ifdef __sun +extern int madvise(caddr_t, size_t, int); +#endif #endif #define SWITCH_XML_WS "\t\r\n " // whitespace

1 0

[commit] r5289 - in freeswitch/trunk: docs src src/mod/languages/mod_spidermonkey src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 08 Jun '07

08 Jun '07

Author: mikej Date: Fri Jun 8 10:39:09 2007 New Revision: 5289 Modified: freeswitch/trunk/docs/AUTHORS freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c freeswitch/trunk/src/switch_odbc.c Log: merge changes from MODLANG-18 fix multiple odbc and spidermonkey odbc issues. Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Fri Jun 8 10:39:09 2007 @@ -32,7 +32,8 @@ Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups. Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements. Matt Klein <mklein(a)nmedia.net> - + Jonas Gauffin <jonas at gauffin dot org> - Bugfixes and additions in mod_spidermonkey_odbc + A big THANK YOU goes to: Justin Cassidy - Build related cleanups and automatic build setup. 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 Fri Jun 8 10:39:09 2007 @@ -2114,7 +2114,9 @@ {"dialplan", PROFILE_DIALPLAN, JSPROP_READONLY | JSPROP_PERMANENT}, {"caller_id_name", PROFILE_CID_NAME, JSPROP_READONLY | JSPROP_PERMANENT}, {"caller_id_num", PROFILE_CID_NUM, JSPROP_READONLY | JSPROP_PERMANENT}, + {"caller_id_number", PROFILE_CID_NUM, JSPROP_READONLY | JSPROP_PERMANENT}, {"network_addr", PROFILE_IP, JSPROP_READONLY | JSPROP_PERMANENT}, + {"network_address", PROFILE_IP, JSPROP_READONLY | JSPROP_PERMANENT}, {"ani", PROFILE_ANI, JSPROP_READONLY | JSPROP_PERMANENT}, {"aniii", PROFILE_ANI_II, JSPROP_READONLY | JSPROP_PERMANENT}, {"destination", PROFILE_DEST, JSPROP_READONLY | JSPROP_PERMANENT}, 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 Fri Jun 8 10:39:09 2007 @@ -52,6 +52,7 @@ goto err; } + memset(new_obj, 0, sizeof(odbc_obj_t)); if (!(new_obj->handle = switch_odbc_handle_new(dsn, username, password))) { goto err; } @@ -79,12 +80,12 @@ { odbc_obj_t *obj = *objp; - if (obj->handle) { - switch_odbc_handle_destroy(&obj->handle); - } if (obj->stmt) { SQLFreeHandle(SQL_HANDLE_STMT, obj->stmt); } + if (obj->handle) { + switch_odbc_handle_destroy(&obj->handle); + } switch_safe_free(obj->colbuf); switch_safe_free(obj->code); switch_safe_free(obj); @@ -180,6 +181,40 @@ return JS_TRUE; } +static JSBool odbc_execute(JSContext * cx, JSObject * obj, uintN argc, jsval *argv, jsval *rval) +{ + odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); + char *sql; + JSBool tf = JS_FALSE; + SQLHSTMT stmt; + + if (argc < 1) { + goto done; + } + + if (switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n"); + goto done; + } + + sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + + if (switch_odbc_handle_exec(odbc_obj->handle, sql, &stmt) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[ODBC] Execute failed for: %s\n", sql); + goto done; + } + + SQLFreeHandle(SQL_HANDLE_STMT, stmt); + + tf = JS_TRUE; + + done: + + *rval = BOOLEAN_TO_JSVAL(tf); + + return JS_TRUE; +} + static JSBool odbc_exec(JSContext * cx, JSObject * obj, uintN argc, jsval *argv, jsval *rval) { odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); @@ -202,8 +237,8 @@ sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - if (switch_odbc_handle_exec(odbc_obj->handle, sql, &odbc_obj->stmt) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[ODBC] query failed: %s\n", sql); goto done; } @@ -265,7 +300,7 @@ return JS_TRUE; } -static char *escape_data(char *in) +static char *escape_data(char *in, char escapeChar) { switch_size_t nlen = strlen(in); uint32_t qc = 0; @@ -275,6 +310,9 @@ if (*p == '"') { qc += 2; } + if (*p == '\'') { + qc += 2; + } } nlen += qc + 1; @@ -287,7 +325,10 @@ qc = 0; for (p = in; p && *p; p++) { if (*p == '"') { - *r++ = '\\'; + *r++ = escapeChar; + } + if (*p == '\'') { + *r++ = escapeChar; } *r++ = *p; if (++qc > nlen) { @@ -338,7 +379,7 @@ SQLGetData(odbc_obj->stmt, x, SQL_C_CHAR, odbc_obj->colbuf, odbc_obj->cblen, NULL); if (strchr((char *) odbc_obj->colbuf, '"')) { /* please don't */ - esc = (SQLCHAR *) escape_data((char *) odbc_obj->colbuf); + esc = (SQLCHAR *) escape_data((char *) odbc_obj->colbuf, '\\'); data = esc; } @@ -373,6 +414,8 @@ static JSFunctionSpec odbc_methods[] = { {"connect", odbc_connect, 1}, {"exec", odbc_exec, 1}, + {"query", odbc_exec, 1}, + {"execute", odbc_execute, 1}, {"numRows", odbc_num_rows, 1}, {"nextRow", odbc_next_row, 1}, {"getData", odbc_get_data, 1}, Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Fri Jun 8 10:39:09 2007 @@ -38,6 +38,8 @@ SQLHENV env; SQLHDBC con; switch_odbc_state_t state; + char odbc_driver[256]; + BOOL is_firebird; }; @@ -110,6 +112,8 @@ SQLINTEGER err; int16_t mlen; unsigned char msg[200], stat[10]; + SQLSMALLINT valueLength = 0; + int i = 0; if (handle->env == SQL_NULL_HANDLE) { result = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &handle->env); @@ -156,13 +160,25 @@ } SQLFreeHandle(SQL_HANDLE_ENV, handle->env); return SWITCH_ODBC_FAIL; - } else { + } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to [%s]\n", handle->dsn); - handle->state = SWITCH_ODBC_STATE_CONNECTED; - return SWITCH_ODBC_SUCCESS; + result = SQLGetInfo(handle->con, SQL_DRIVER_NAME, (SQLCHAR*)handle->odbc_driver, 255, &valueLength); + if ( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO) + { + for (i = 0; i < valueLength; ++i) + handle->odbc_driver[i] = (char)toupper(handle->odbc_driver[i]); } + //Firebird do not support "SELECT 1" + if (strstr(handle->odbc_driver, "FIREBIRD") != 0 || strstr(handle->odbc_driver, "FB32") != 0 || strstr(handle->odbc_driver, "FB64") != 0) + handle->is_firebird = TRUE; + else + handle->is_firebird = FALSE; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to [%s]\n", handle->dsn); + handle->state = SWITCH_ODBC_STATE_CONNECTED; + return SWITCH_ODBC_SUCCESS; + } static int db_is_up(switch_odbc_handle_t *handle) @@ -172,9 +188,16 @@ SQLINTEGER m = 0; int result; switch_event_t *event; - switch_odbc_status_t recon; + switch_odbc_status_t recon = 0; char *err_str = NULL; - SQLCHAR sql[] = "select 1"; + SQLCHAR sql[255]; + + //Firebird do not support "SELECT 1" + sql[0] = 0; + if (handle->is_firebird) + strcpy((char*)sql, "select first 1 * from RDB$RELATIONS"); + else + strcpy((char*)sql, "select 1"); if (!handle) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No DB Handle\n"); @@ -197,10 +220,15 @@ goto done; error: - - recon = switch_odbc_handle_connect(handle); err_str = switch_odbc_handle_get_error(handle, stmt); + // No need to reconnect if we can get the string anyway. + if (err_str == 0) + { + recon = switch_odbc_handle_connect(handle); + err_str = switch_odbc_handle_get_error(handle, stmt); + } + if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Failure-Message", "The sql server is not responding for DSN %s [%s]", switch_str_nil(handle->dsn), switch_str_nil(err_str));

1 0

[commit] r5288 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Jun '07

07 Jun '07

Author: anthm Date: Thu Jun 7 17:58:50 2007 New Revision: 5288 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: doh now they've got me doing it backwards 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 Thu Jun 7 17:58:50 2007 @@ -1152,7 +1152,7 @@ if (map->rm_pt == 9) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Oh sure! You say 8000, but you mean 16000! This is, of course, stupid!\n"); - codec_rate = 16000; + codec_rate = 8000; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u]/[%s:%d:%u]\n", rm_encoding, map->rm_pt, (int)map->rm_rate, imp->iananame, imp->ianacode, codec_rate);

1 0

[commit] r5287 - in freeswitch/trunk/src/mod: codecs/mod_l16 endpoints/mod_sofia
by Freeswitch SVN 07 Jun '07

07 Jun '07

Author: anthm Date: Thu Jun 7 17:46:45 2007 New Revision: 5287 Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: sigh more stupidness Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Thu Jun 7 17:46:45 2007 @@ -88,7 +88,7 @@ static const switch_codec_implementation_t raw_32k_60ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 119, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, @@ -109,7 +109,7 @@ static const switch_codec_implementation_t raw_32k_30ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 119, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, @@ -130,7 +130,7 @@ static const switch_codec_implementation_t raw_32k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 119, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, @@ -151,7 +151,7 @@ static const switch_codec_implementation_t raw_32k_10ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 119, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, @@ -172,7 +172,7 @@ static const switch_codec_implementation_t raw_22k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 118, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 22050, @@ -193,7 +193,7 @@ static const switch_codec_implementation_t raw_16k_120ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 117, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, @@ -214,7 +214,7 @@ static const switch_codec_implementation_t raw_16k_60ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 117, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 16000, @@ -235,7 +235,7 @@ static const switch_codec_implementation_t raw_16k_30ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 117, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 16000, @@ -256,7 +256,7 @@ static const switch_codec_implementation_t raw_16k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 117, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 16000, @@ -277,7 +277,7 @@ static const switch_codec_implementation_t raw_16k_10ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 10, + /*.ianacode */ 117, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 16000, 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 Thu Jun 7 17:46:45 2007 @@ -1145,19 +1145,24 @@ for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; - + uint32_t codec_rate = imp->samples_per_second; if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) { continue; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d]/[%s:%d]\n", - rm_encoding, map->rm_pt, imp->iananame, imp->ianacode); + + if (map->rm_pt == 9) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Oh sure! You say 8000, but you mean 16000! This is, of course, stupid!\n"); + codec_rate = 16000; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u]/[%s:%d:%u]\n", + rm_encoding, map->rm_pt, (int)map->rm_rate, imp->iananame, imp->ianacode, codec_rate); if (map->rm_pt < 96) { match = (map->rm_pt == imp->ianacode) ? 1 : 0; } else { match = strcasecmp(rm_encoding, imp->iananame) ? 0 : 1; } - if (match && (map->rm_rate == imp->samples_per_second)) { + if (match && (map->rm_rate == codec_rate)) { if (ptime && ptime * 1000 != imp->microseconds_per_frame) { near_match = imp; match = 0;

1 0

[commit] r5286 - freeswitch/branches/cparker/conf/radius
by Freeswitch SVN 07 Jun '07

07 Jun '07

Author: cparker Date: Thu Jun 7 17:22:30 2007 New Revision: 5286 Modified: freeswitch/branches/cparker/conf/radius/dictionary Log: Updated dictionary file to contain Freeswitch attributes Modified: freeswitch/branches/cparker/conf/radius/dictionary ============================================================================== --- freeswitch/branches/cparker/conf/radius/dictionary (original) +++ freeswitch/branches/cparker/conf/radius/dictionary Thu Jun 7 17:22:30 2007 @@ -238,3 +238,110 @@ #VALUE Server-Config Password-Expiration 30 #VALUE Server-Config Password-Warning 5 +# -*- text -*- +# +# dictionary.freeswitch +# +# cparker(a)segv.org +# +# Version: $Id: $ +# + +VENDOR Freeswitch 27880 + +# +# Standard attribute +# +BEGIN-VENDOR Freeswitch + +ATTRIBUTE Freeswitch-AVPair 1 string Freeswitch +ATTRIBUTE Freeswitch-CLID 2 string Freeswitch +ATTRIBUTE Freeswitch-Dialplan 3 string Freeswitch +ATTRIBUTE Freeswitch-Src 4 string Freeswitch +ATTRIBUTE Freeswitch-Dst 5 string Freeswitch +ATTRIBUTE Freeswitch-Src-Channel 6 string Freeswitch +ATTRIBUTE Freeswitch-Dst-Channel 7 string Freeswitch +ATTRIBUTE Freeswitch-Ani 8 string Freeswitch +ATTRIBUTE Freeswitch-Aniii 9 string Freeswitch +ATTRIBUTE Freeswitch-Lastapp 10 string Freeswitch +ATTRIBUTE Freeswitch-Lastdata 11 string Freeswitch +ATTRIBUTE Freeswitch-Disposition 12 string Freeswitch +ATTRIBUTE Freeswitch-Hangupcause 13 integer Freeswitch +ATTRIBUTE Freeswitch-Billusec 15 integer Freeswitch +ATTRIBUTE Freeswitch-AMAFlags 16 integer Freeswitch + +ATTRIBUTE Freeswitch-Callstartdate 20 string Freeswitch +ATTRIBUTE Freeswitch-Callanswerdate 21 string Freeswitch +ATTRIBUTE Freeswitch-Calltransferdate 22 string Freeswitch +ATTRIBUTE Freeswitch-Callenddate 23 string Freeswitch + +# +# Freeswitch-Hangupcause +# +VALUE Freeswitch-Hangupcause Unallocated 0 +VALUE Freeswitch-Hangupcause Success 1 +VALUE Freeswitch-Hangupcause No-Route-Transit-Net 2 +VALUE Freeswitch-Hangupcause No-Route-Destination 3 +VALUE Freeswitch-Hangupcause Channel-Unacceptable 6 +VALUE Freeswitch-Hangupcause Call-Awarded-Delivery 7 +VALUE Freeswitch-Hangupcause Normal-Clearing 16 +VALUE Freeswitch-Hangupcause User-Busy 17 +VALUE Freeswitch-Hangupcause No-User-Response 18 +VALUE Freeswitch-Hangupcause No-Answer 19 +VALUE Freeswitch-Hangupcause Subscriber-Absent 20 +VALUE Freeswitch-Hangupcause Call-Rejected 21 +VALUE Freeswitch-Hangupcause Number-Changed 22 +VALUE Freeswitch-Hangupcause Redirecto-To-New-Destination 23 +VALUE Freeswitch-Hangupcause Exchange-Routing-Error 25 +VALUE Freeswitch-Hangupcause Destination-Out-Of-Order 27 +VALUE Freeswitch-Hangupcause Invalid-Number-Format 28 +VALUE Freeswitch-Hangupcause Facility-Rejected 29 +VALUE Freeswitch-Hangupcause Response-To-Status-Enquiry 30 +VALUE Freeswitch-Hangupcause Normal-Unspecified 31 +VALUE Freeswitch-Hangupcause Normal-Circuit-Congestion 34 +VALUE Freeswitch-Hangupcause Network-Out-Of-Order 38 +VALUE Freeswitch-Hangupcause Normal-Temporary-Failure 41 +VALUE Freeswitch-Hangupcause Switch-Congestion 42 +VALUE Freeswitch-Hangupcause Access-Info-Discarded 43 +VALUE Freeswitch-Hangupcause Requested-Chan-Unavail 44 +VALUE Freeswitch-Hangupcause Pre-Empted 45 +VALUE Freeswitch-Hangupcause Facility-Not-Subscribed 50 +VALUE Freeswitch-Hangupcause Outgoing-Call-Barred 52 +VALUE Freeswitch-Hangupcause Incoming-Call-Barred 54 +VALUE Freeswitch-Hangupcause Bearercapability-Notauth 57 +VALUE Freeswitch-Hangupcause Bearercapability-Notavail 58 +VALUE Freeswitch-Hangupcause Service-Unavailable 63 +VALUE Freeswitch-Hangupcause Bearercapability-Notimpl 65 +VALUE Freeswitch-Hangupcause Chan-Not-Implemented 66 +VALUE Freeswitch-Hangupcause Facility-Not-Implemented 69 +VALUE Freeswitch-Hangupcause Service-Not-Implemented 79 +VALUE Freeswitch-Hangupcause Invalid-Call-Reference 81 +VALUE Freeswitch-Hangupcause Incompatible-Destination 88 +VALUE Freeswitch-Hangupcause Invalid-Msg-Unspecified 95 +VALUE Freeswitch-Hangupcause Mandatory-IE-Missing 96 +VALUE Freeswitch-Hangupcause Message-Type-Nonexist 97 +VALUE Freeswitch-Hangupcause Wrong-Message 98 +VALUE Freeswitch-Hangupcause IE-Nonexist 99 +VALUE Freeswitch-Hangupcause Invalid-IE-Contents 100 +VALUE Freeswitch-Hangupcause Wrong-Call-State 101 +VALUE Freeswitch-Hangupcause Recovery-On-Timer-Expire 102 +VALUE Freeswitch-Hangupcause Mandatory-ID-Length-Error 103 +VALUE Freeswitch-Hangupcause Protocol-Error 111 +VALUE Freeswitch-Hangupcause Interworking 127 +VALUE Freeswitch-Hangupcause Originator-Cancel 487 +VALUE Freeswitch-Hangupcause Crash 500 +VALUE Freeswitch-Hangupcause System-Shutdown 501 +VALUE Freeswitch-Hangupcause Lose-Race 502 +VALUE Freeswitch-Hangupcause Manager-Request 503 +VALUE Freeswitch-Hangupcause Blind-Transfer 600 +VALUE Freeswitch-Hangupcause Attended-Transfer 601 +VALUE Freeswitch-Hangupcause Allotted-Timeout 602 + + + +# +# +# + + +END-VENDOR Freeswitch

1 0