- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3519 - freeswitch/branches/knhor/trunk/src/include
by Freeswitch SVN 03 Dec '06

03 Dec '06

Author: knhor Date: Sun Dec 3 17:04:19 2006 New Revision: 3519 Modified: freeswitch/branches/knhor/trunk/src/include/switch_ivr.h Log: dox Modified: freeswitch/branches/knhor/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/branches/knhor/trunk/src/include/switch_ivr.h (original) +++ freeswitch/branches/knhor/trunk/src/include/switch_ivr.h Sun Dec 3 17:04:19 2006 @@ -566,15 +566,15 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_free(switch_ivr_menu_t *stack); - struct switch_ivr_menu_xml_ctx; typedef struct switch_ivr_menu_xml_ctx switch_ivr_menu_xml_ctx_t; /*! *\brief Build a menu stack from an xml source + *\param xml_menu_ctx The XML menu parser context previously created by switch_ivr_menu_stack_xml_init *\param menu_stack The menu stack object that will be created for you *\param xml_menus The xml Menus source *\param xml_menu The xml Menu source of the menu to be created - *\param pool memory pool (NULL to create one) + *\param timer_name The name of a timer that should be used - in almost all cases this should be NULL *\return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_build(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, @@ -583,10 +583,21 @@ switch_xml_t xml_menu, char *timer_name); +/*! + *\param xml_menu_ctx The XML menu parser context previously created by switch_ivr_menu_stack_xml_init + *\param name The xml tag name to add to the parser engine + *\param function The menu function callback that will be executed when menu digits are bound to this name + *\return SWITCH_STATUS_SUCCESS if all is well + */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_add_custom(switch_ivr_menu_xml_ctx_t *xml_menu_ctx, char *name, switch_ivr_menu_action_function_t *function); +/*! + *\param xml_menu_ctx A pointer of a XML menu parser context to be created + *\param pool memory pool (NULL to create one) + *\return SWITCH_STATUS_SUCCESS if all is well + */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_stack_xml_init(switch_ivr_menu_xml_ctx_t **xml_menu_ctx, switch_memory_pool_t *pool); /** @} */

1 0

[commit] r3518 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Dec '06

03 Dec '06

Author: anthm Date: Sat Dec 2 22:19:35 2006 New Revision: 3518 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: put presence tags back Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Dec 2 22:19:35 2006 @@ -4591,8 +4591,8 @@ TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("NOTIFY")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("SUBSCRIBE")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), - //TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence")), - //TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence.winfo")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence.winfo")), SIPTAG_SUPPORTED_STR("100rel, precondition"), SIPTAG_USER_AGENT_STR(SOFIA_USER_AGENT), TAG_END());

1 0

[commit] r3517 - freeswitch/branches/javyer
by Freeswitch SVN 02 Dec '06

02 Dec '06

Author: sphere Date: Sat Dec 2 05:53:26 2006 New Revision: 3517 Added: freeswitch/branches/javyer/ Log: Creating empty folder for javyer

1 0

[commit] r3516 - freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 02 Dec '06

02 Dec '06

Author: mishehu Date: Sat Dec 2 03:08:12 2006 New Revision: 3516 Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Log: Fixed up mod_cdr so at least it compiles. Am getting a segfault because switch_channel_t::caller_extension seems to be coming back null for some reason even on normal bridged calls. Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp Sat Dec 2 03:08:12 2006 @@ -77,16 +77,17 @@ memset(lastapp,0,80); memset(lastdata,0,255); - switch_channel_timetable_t *timetable; + // switch_channel_timetable_t *timetable = switch_channel_get_timetable(newchannel->channel->caller_profile); coresession = newchannel->session; - timetable = switch_channel_get_timetable(newchannel->channel->caller_profile); - callstartdate= timetable->created; - callanswerdate = timetable->answered; - callenddate = timetable->hungup; if (newchannel->callerprofile) { + callstartdate= newchannel->callerprofile->times->created; + callanswerdate = newchannel->callerprofile->times->answered; + calltransferdate = newchannel->callerprofile->times->transferred; + callenddate = newchannel->callerprofile->times->hungup; + if(newchannel->callerprofile->caller_id_name != 0) { strncpy(clid,newchannel->callerprofile->caller_id_name,strlen(newchannel->callerprofile->caller_id_name)); @@ -109,14 +110,14 @@ strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); } - switch_caller_profile_t *originateprofile = switch_channel_get_originator_caller_profile(newchannel->channel->callerprofile); + //switch_caller_profile_t *originateprofile = switch_channel_get_originator_caller_profile(newchannel->channel->callerprofile); // Were we the receiver of the call? - if(originateprofile) + if(newchannel->callerprofile->originator_caller_profile) { originated = 0; - if(newchannel->originateprofile->uuid != 0) - strncpy(destuuid,originateprofile->uuid,strlen(originateprofile->uuid)); + if(newchannel->callerprofile->originator_caller_profile->uuid != 0) + strncpy(destuuid,newchannel->callerprofile->originator_caller_profile->uuid,strlen(newchannel->callerprofile->originator_caller_profile->uuid)); if(newchannel->callerprofile) { if(newchannel->callerprofile->destination_number) @@ -127,9 +128,9 @@ } else { - originateprofile = switch_channel_get_originatee_profile(newchannel->channel->callerprofile); + //originateprofile = switch_channel_get_originatee_profile(newchannel->channel->callerprofile); // Or were we maybe we were the caller? - if(originateprofile) + if(newchannel->callerprofile->originatee_caller_profile) { originated = 1; if (newchannel->callerprofile) { @@ -138,8 +139,8 @@ if(newchannel->callerprofile->destination_number != 0) strncpy(dst,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); } - if(originateprofile->chan_name != 0) - strncpy(dstchannel,newchannel->originateprofile->chan_name,strlen(newchannel->originateprofile->chan_name)); + if(newchannel->callerprofile->originatee_caller_profile->chan_name != 0) + strncpy(dstchannel,newchannel->callerprofile->originatee_caller_profile->chan_name,strlen(newchannel->callerprofile->originatee_caller_profile->chan_name)); } } @@ -149,7 +150,15 @@ if(switch_channel_test_flag(newchannel->channel,CF_ANSWERED)) { disposition=1; - billusec = timetable->hungup - timetable->answered; + if(callstartdate) + billusec = callenddate - callanswerdate; + else + billusec = callenddate - calltransferdate; + } + else if(switch_channel_test_flag(newchannel->channel,CF_TRANSFER)) + { + disposition=1; + billusec = callenddate - calltransferdate; } else { Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h Sat Dec 2 03:08:12 2006 @@ -78,6 +78,7 @@ switch_time_t callstartdate; switch_time_t callanswerdate; switch_time_t callenddate; + switch_time_t calltransferdate; switch_call_cause_t hangupcause; char *hangupcause_text; char clid[80]; Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Sat Dec 2 03:08:12 2006 @@ -45,6 +45,8 @@ static switch_memory_pool_t *module_pool; static switch_status_t my_on_hangup(switch_core_session_t *session); static switch_status_t modcdr_reload(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_pause(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_resume(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); static switch_thread_rwlock_t *cdr_rwlock; /* Now begins the glue that will tie this into the system. @@ -59,28 +61,28 @@ /*.on_transmit */ NULL }; -static switch_api_interface_t modcdr_reload_interface = { - /*.interface_name */ "modcdr_reload", - /*.desc */ "Reload mod_cdr's configuration", - /*.function */ modcdr_reload, - /*.syntax */ "modcdr_reload", - /*.next */ &modcdr_queue_pause +static switch_api_interface_t modcdr_queue_resume_api = { + /*.interface_name */ "modcdr_queue_resume", + /*.desc */ "Manually resumes the popping of objects from the queue.", + /*.function */ modcdr_queue_resume, + /*.syntax */ "modcdr_queue_resume", + /*.next */ 0 }; -static switch_api_interface_t modcdr_queue_pause = { +static switch_api_interface_t modcdr_queue_pause_api = { /*.interface_name */ "modcdr_queue_pause", /*.desc */ "Manually pauses the popping of objects from the queue. (DANGER: Can suck your memory away rather quickly.)", /*.function */ modcdr_queue_pause, /*.syntax */ "modcdr_queue_pause", - /*.next */ &modcdr_queue_resume + /*.next */ &modcdr_queue_resume_api }; -static switch_api_interface_t modcdr_queue_resume = { - /*.interface_name */ "modcdr_queue_pause", - /*.desc */ "Manually resumes the popping of objects from the queue.", - /*.function */ modcdr_queue_resume, - /*.syntax */ "modcdr_queue_resume", - /*.next */ 0 +static switch_api_interface_t modcdr_reload_interface_api = { + /*.interface_name */ "modcdr_reload", + /*.desc */ "Reload mod_cdr's configuration", + /*.function */ modcdr_reload, + /*.syntax */ "modcdr_reload", + /*.next */ &modcdr_queue_pause_api }; static const switch_loadable_module_interface_t cdr_module_interface = { @@ -90,7 +92,7 @@ /*.dialplan_interface */ NULL, /*.codec_interface */ NULL, /*.application_interface */ NULL, - /* api_interface */ &modcdr_reload_interface + /* api_interface */ &modcdr_reload_interface_api }; static switch_status_t my_on_hangup(switch_core_session_t *session)

1 0

[commit] r3515 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 02 Dec '06

02 Dec '06

Author: anthm Date: Sat Dec 2 00:40:58 2006 New Revision: 3515 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: try adding the gc code 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 Sat Dec 2 00:40:58 2006 @@ -94,6 +94,7 @@ jsval ret; JSContext *cx; JSObject *obj; + jsrefcount saveDepth; void *extra; }; @@ -641,7 +642,9 @@ argv[argc++] = cb_state->arg; } + JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret); + cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); return SWITCH_STATUS_SUCCESS; } @@ -877,7 +880,9 @@ cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); + cb_state.saveDepth = JS_SuspendRequest(cx); switch_ivr_record_file(jss->session, &fh, file_name, dtmf_func, bp, len, limit); + JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; @@ -920,7 +925,10 @@ JS_ValueToInt32(jss->cx, argv[2], &to); } + cb_state.saveDepth = JS_SuspendRequest(cx); switch_ivr_collect_digits_callback(jss->session, dtmf_func, bp, len, to); + JS_ResumeRequest(cx, cb_state.saveDepth); + *rval = cb_state.ret; return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; @@ -981,7 +989,9 @@ cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); + cb_state.saveDepth = JS_SuspendRequest(cx); switch_ivr_play_file(jss->session, &fh, file_name, timer_name, dtmf_func, bp, len); + JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; @@ -1090,6 +1100,7 @@ codec = switch_core_session_get_read_codec(jss->session); cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); + cb_state.saveDepth = JS_SuspendRequest(cx); switch_ivr_speak_text(jss->session, tts_name, voice_name && strlen(voice_name) ? voice_name : NULL, @@ -1099,7 +1110,7 @@ text, bp, len); - + JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; @@ -1231,13 +1242,13 @@ char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *app_arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); struct js_session *jss = JS_GetPrivate(cx, obj); - //jsrefcount saveDepth; + jsrefcount saveDepth; if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { - //saveDepth = JS_SuspendRequest(cx); + saveDepth = JS_SuspendRequest(cx); application_interface->application_function(jss->session, app_arg); - //JS_ResumeRequest(cx, saveDepth); + JS_ResumeRequest(cx, saveDepth); retval = JS_TRUE; } } @@ -2102,7 +2113,10 @@ } } + cb_state.saveDepth = JS_SuspendRequest(cx); switch_ivr_multi_threaded_bridge(jss_a->session, jss_b->session, dtmf_func, bp, bp); + JS_ResumeRequest(cx, cb_state.saveDepth); + return JS_TRUE; }

1 0

[commit] r3514 - in freeswitch/trunk: . conf src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 02 Dec '06

02 Dec '06

Author: anthm Date: Fri Dec 1 21:41:24 2006 New Revision: 3514 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/modules.conf.in freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Log: add odbc support to javascript Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Fri Dec 1 21:41:24 2006 @@ -50,7 +50,7 @@  <load module="mod_bridgecall"/> <load module="mod_commands"/> -  + <load module="mod_conference"/> <load module="mod_dptools"/> <load module="mod_echo"/>  @@ -88,6 +88,7 @@ <modules> <load module="mod_spidermonkey_teletone"/> <load module="mod_spidermonkey_core_db"/> +  </modules> </configuration> Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Fri Dec 1 21:41:24 2006 @@ -43,5 +43,6 @@ #languages/mod_spidermonkey #languages/mod_spidermonkey_teletone #languages/mod_spidermonkey_core_db +#languages/mod_spidermonkey_odbc timers/mod_softtimer #xml_int/mod_xml_rpc Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Fri Dec 1 21:41:24 2006 @@ -1,13 +1,13 @@ include ../mod_spidermonkey/sm.mak -OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lunixodbc +OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a LINKER=$(CC) +LDFLAGS=-lodbc - all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install unixODBC-2.2.12.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install unixODBC-2.2.12.tar.gz --prefix=$(PREFIX) --disable-gui --without-x --with-pic $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 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 Dec 1 21:41:24 2006 @@ -31,6 +31,7 @@ */ #include "mod_spidermonkey.h" + #include <sql.h> #ifdef _MSC_VER #pragma warning(push) @@ -42,30 +43,450 @@ #endif #include <sqltypes.h> -static const char modname[] = "odbc"; +static const char modname[] = "ODBC"; +struct odbc_obj { + char *dsn; + char *username; + char *password; + SQLHENV env; + SQLHDBC con; + SQLHSTMT stmt; + uint32_t state; + SQLCHAR *colbuf; + int32 cblen; + SQLCHAR *code; + int32 codelen; +}; + +typedef enum { + ODBC_STATE_INIT, + ODBC_STATE_DOWN, + ODBC_STATE_CONNECTED, + ODBC_STATE_ERROR +} odbc_state_t; +typedef struct odbc_obj odbc_obj_t; + +typedef enum { + ODBC_SUCCESS = 0, + ODBC_FAIL = -1 +} odbc_status_t; + + +static odbc_obj_t *new_odbc_obj(char *dsn, char *username, char *password) +{ + odbc_obj_t *new_obj; + + if (!(new_obj = malloc(sizeof(*new_obj)))) { + goto err; + } + + if (!(new_obj->dsn = strdup(dsn))) { + goto err; + } + + if (!(new_obj->username = strdup(username))) { + goto err; + } + + if (!(new_obj->password = strdup(password))) { + goto err; + } + + new_obj->env = SQL_NULL_HANDLE; + new_obj->state = ODBC_STATE_INIT; + + return new_obj; + +err: + if (new_obj) { + switch_safe_free(new_obj->dsn); + switch_safe_free(new_obj->username); + switch_safe_free(new_obj->password); + switch_safe_free(new_obj); + } + + return NULL; +} + +odbc_status_t odbc_obj_disconnect(odbc_obj_t *obj) +{ + int result; + + if (obj->state == ODBC_STATE_CONNECTED) { + result = SQLDisconnect(obj->con); + if (result == ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Disconnected %d from [%s]\n", result, obj->dsn); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Disconnectiong [%s]\n", obj->dsn); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "[%s] already disconnected\n", obj->dsn); + } + + obj->state = ODBC_STATE_DOWN; + + return ODBC_SUCCESS; +} + +odbc_status_t odbc_obj_connect(odbc_obj_t *obj) +{ + int result; + SQLINTEGER err; + int16_t mlen; + unsigned char msg[200], stat[10]; + + if (obj->env == SQL_NULL_HANDLE) { + result = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &obj->env); + + if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error AllocHandle\n"); + return ODBC_FAIL; + } + + result = SQLSetEnvAttr(obj->env, SQL_ATTR_ODBC_VERSION, (void *) SQL_OV_ODBC3, 0); + + if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error SetEnv\n"); + SQLFreeHandle(SQL_HANDLE_ENV, obj->env); + return ODBC_FAIL; + } + + result = SQLAllocHandle(SQL_HANDLE_DBC, obj->env, &obj->con); + + if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error AllocHDB %d\n", result); + SQLFreeHandle(SQL_HANDLE_ENV, obj->env); + return ODBC_FAIL; + } + SQLSetConnectAttr(obj->con, SQL_LOGIN_TIMEOUT, (SQLPOINTER *) 10, 0); + } + if (obj->state == ODBC_STATE_CONNECTED) { + odbc_obj_disconnect(obj); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-connecting %s\n", obj->dsn); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connecting %s\n", obj->dsn); + + result = SQLConnect(obj->con, + (SQLCHAR *) obj->dsn, SQL_NTS, + (SQLCHAR *) obj->username, SQL_NTS, + (SQLCHAR *) obj->password, SQL_NTS); + + if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) { + SQLGetDiagRec(SQL_HANDLE_DBC, obj->con, 1, stat, &err, msg, 100, &mlen); + SQLFreeHandle(SQL_HANDLE_ENV, obj->env); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error SQLConnect=%d errno=%d %s\n", result, (int)err, msg); + return ODBC_FAIL; + } else { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to [%s]\n", obj->dsn); + obj->state = ODBC_STATE_CONNECTED; + } + + return ODBC_SUCCESS; +} + +static void destroy_odbc_obj(odbc_obj_t **objp) +{ + odbc_obj_t *obj = *objp; + + odbc_obj_disconnect(obj); + + SQLFreeHandle(SQL_HANDLE_STMT, obj->stmt); + SQLFreeHandle(SQL_HANDLE_DBC, obj->con); + SQLFreeHandle(SQL_HANDLE_ENV, obj->env); + + switch_safe_free(obj->dsn); + switch_safe_free(obj->username); + switch_safe_free(obj->password); + switch_safe_free(obj->colbuf); + switch_safe_free(obj->code); + switch_safe_free(obj); +} + + /* ODBC Object */ /*********************************************************************************/ static JSBool odbc_construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { + odbc_obj_t *odbc_obj = NULL; + char *dsn, *username, *password; + int32 blen = 1024; + + if (argc < 3) { + return JS_FALSE; + } + + dsn = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + username = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + password = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + + if (argc > 3) { + int32 len; + JS_ValueToInt32(cx, argv[3], &len); + + if (len > 0) { + blen = len; + } + } + + if (dsn && username && password) { + odbc_obj = new_odbc_obj(dsn, username, password); + } + + if (!odbc_obj) { + return JS_FALSE; + } + + if (!(odbc_obj->colbuf = (SQLCHAR *) malloc(blen))) { + destroy_odbc_obj(&odbc_obj); + return JS_FALSE; + } + + odbc_obj->cblen = blen; + + blen += 1536; + + if (!(odbc_obj->code = (SQLCHAR *) malloc(blen))) { + destroy_odbc_obj(&odbc_obj); + return JS_FALSE; + } + + odbc_obj->codelen = blen; + + JS_SetPrivate(cx, obj, odbc_obj); + return JS_TRUE; } static void odbc_destroy(JSContext *cx, JSObject *obj) { + odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); + + if (odbc_obj) { + destroy_odbc_obj(&odbc_obj); + } } -static JSBool odbc_my_method(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +static JSBool odbc_connect(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { - return JS_FALSE; + odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); + JSBool tf = JS_TRUE; + + if (odbc_obj) { + if (odbc_obj_connect(odbc_obj) == ODBC_SUCCESS) { + tf = JS_TRUE; + } else { + tf = JS_FALSE; + } + } + + *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); + char *sql; + JSBool tf = JS_FALSE; + int result; + + if (argc < 1) { + goto done; + } + + if (odbc_obj->state != ODBC_STATE_CONNECTED) { + goto done; + } + + if (odbc_obj->stmt) { + SQLFreeHandle (SQL_HANDLE_STMT, odbc_obj->stmt); + odbc_obj->stmt = NULL; + } + + sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + + if (SQLAllocHandle(SQL_HANDLE_STMT, odbc_obj->con, &odbc_obj->stmt) != SQL_SUCCESS) { + goto done; + } + + if (SQLPrepare(odbc_obj->stmt, (unsigned char *)sql, SQL_NTS) != SQL_SUCCESS) { + goto done; + } + + result = SQLExecute(odbc_obj->stmt); + + if (result != SQL_SUCCESS && result != SQL_SUCCESS_WITH_INFO) { + goto done; + } + + tf = JS_TRUE; + + done: + + *rval = BOOLEAN_TO_JSVAL( tf ); + + return JS_TRUE; +} + +static JSBool odbc_num_rows(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); + + SQLSMALLINT rows = 0; + + if (odbc_obj->state != ODBC_STATE_CONNECTED) { + goto done; + } + + if (odbc_obj->stmt) { + SQLNumResultCols(odbc_obj->stmt, &rows); + } + + done: + + *rval = INT_TO_JSVAL( rows ); + + return JS_TRUE; + +} + + +static JSBool odbc_next_row(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); + int result = 0; + JSBool tf = JS_FALSE; + + if (odbc_obj->state != ODBC_STATE_CONNECTED) { + goto done; + } + + if (odbc_obj->stmt) { + if ((result = SQLFetch(odbc_obj->stmt) == SQL_SUCCESS)) { + tf = JS_TRUE; + } + } + + done: + + *rval = BOOLEAN_TO_JSVAL( tf ); + + return JS_TRUE; +} + +static char *escape_data(char *in) +{ + switch_size_t nlen = strlen(in); + uint32_t qc = 0; + char *p, *q, *r; + + for(p = in; p && *p; p++) { + if (*p == '"') { + qc += 2; + } + } + + nlen += qc + 1; + + if (!(q = (char *) malloc(nlen))) { + return NULL; + } + + r = q; + qc = 0; + for(p = in; p && *p; p++) { + if (*p == '"') { + *r++ = '\\'; + } + *r++ = *p; + if (++qc > nlen) { + break; + } + } + + *r++ = '\0'; + + return q; + +} + + +static JSBool odbc_get_data(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + + odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); + JSBool tf = JS_FALSE; + + if (odbc_obj->state != ODBC_STATE_CONNECTED) { + goto done; + } + + if (odbc_obj->stmt) { + SQLSMALLINT c = 0, x = 0; + int result; + char code[66560]; + + snprintf(code, sizeof(code), "~var _oDbC_dB_RoW_DaTa_ = {}"); + eval_some_js(code, cx, obj, rval); + if (*rval == JS_FALSE) { + return JS_TRUE; + } + + result = SQLNumResultCols(odbc_obj->stmt, &c); + if (result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO) { + for (x = 1; x <= c; x++) { + SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; + SQLUINTEGER ColumnSize; + SQLCHAR name[1024] = ""; + SQLCHAR *data = odbc_obj->colbuf; + SQLCHAR *esc = NULL; + + SQLDescribeCol(odbc_obj->stmt, x, name, sizeof(name), &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); + 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); + data = esc; + } + + snprintf((char *)odbc_obj->code, odbc_obj->codelen, "~_oDbC_dB_RoW_DaTa_[\"%s\"] = \"%s\"", name, data); + switch_safe_free(esc); + + eval_some_js((char *)odbc_obj->code, cx, obj, rval); + + if (*rval == JS_FALSE) { + return JS_TRUE; + } + } + + JS_GetProperty(cx, obj, "_oDbC_dB_RoW_DaTa_", rval); + return JS_TRUE; + } + + } + + done: + + *rval = BOOLEAN_TO_JSVAL( tf ); + + return JS_TRUE; + +} + enum odbc_tinyid { odbc_NAME }; static JSFunctionSpec odbc_methods[] = { -// {"myMethod", odbc_my_method, 1}, + {"connect", odbc_connect, 1}, + {"exec", odbc_exec, 1}, + {"numRows", odbc_num_rows, 1}, + {"nextRow", odbc_next_row, 1}, + {"getData", odbc_get_data, 1}, {0} }; @@ -79,7 +500,7 @@ static JSBool odbc_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { JSBool res = JS_TRUE; - + return res; } @@ -91,7 +512,7 @@ }; -switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) +switch_status_t odbc_load(JSContext *cx, JSObject *obj) { JS_InitClass(cx, obj, @@ -110,7 +531,7 @@ const sm_module_interface_t odbc_module_interface = { /*.name = */ modname, - /*.spidermonkey_load*/ spidermonkey_load, + /*.spidermonkey_load*/ odbc_load, /*.next*/ NULL };

1 0

[commit] r3513 - in freeswitch/trunk/libs/libdingaling: . src
by Freeswitch SVN 02 Dec '06

02 Dec '06

Author: anthm Date: Fri Dec 1 21:13:15 2006 New Revision: 3513 Modified: freeswitch/trunk/libs/libdingaling/.update freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: sigh Modified: freeswitch/trunk/libs/libdingaling/.update ============================================================================== --- freeswitch/trunk/libs/libdingaling/.update (original) +++ freeswitch/trunk/libs/libdingaling/.update Fri Dec 1 21:13:15 2006 @@ -1 +1 @@ -Thu Nov 30 15:25:59 UTC 2006 +Fri Dec 1 21:13:04 EST 2006 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Fri Dec 1 21:13:15 2006 @@ -825,7 +825,7 @@ return -1; } if ((r = strchr(from, '/'))) { - *r++; + *r++ = '\0'; } msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, id, "Ding A Ling....");

1 0

[commit] r3512 - freeswitch/branches/rbays
by Freeswitch SVN 01 Dec '06

01 Dec '06

Author: sphere Date: Fri Dec 1 17:17:38 2006 New Revision: 3512 Added: freeswitch/branches/rbays/ Log: Creating empty folder for rbays

1 0

[commit] r3511 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 01 Dec '06

01 Dec '06

Author: anthm Date: Fri Dec 1 16:24:54 2006 New Revision: 3511 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: codec_string channel_var sets per-call codecs on outbound calls Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Dec 1 16:24:54 2006 @@ -762,6 +762,8 @@ static void tech_set_codecs(private_object_t *tech_pvt) { + switch_channel_t *channel; + char *codec_string = NULL; if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return; @@ -771,7 +773,16 @@ return; } - if (tech_pvt->profile->codec_string) { + assert(tech_pvt->session != NULL); + + channel = switch_core_session_get_channel(tech_pvt->session); + assert (channel != NULL); + + if (!(codec_string = switch_channel_get_variable(channel, "codec_string"))) { + codec_string = tech_pvt->profile->codec_string; + } + + if (codec_string) { tech_pvt->num_codecs = switch_loadable_module_get_codecs_sorted(tech_pvt->codecs, SWITCH_MAX_CODECS, tech_pvt->profile->codec_order,

1 0

[commit] r3510 - in freeswitch/trunk/src/mod/languages: mod_spidermonkey mod_spidermonkey_etpan mod_spidermonkey_odbc
by Freeswitch SVN 01 Dec '06

01 Dec '06

Author: mikej Date: Fri Dec 1 14:16:46 2006 New Revision: 3510 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Log: move email to etpan, cleanup the new stubs. 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 Dec 1 14:16:46 2006 @@ -1996,20 +1996,6 @@ return JS_FALSE; } -#define B64BUFFLEN 1024 -static const char c64[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -static int write_buf(int fd, char *buf) { - - int len = (int)strlen(buf); - if (fd && write(fd, buf, len) != len) { - close(fd); - return 0; - } - - return 1; -} - static JSBool js_api_use(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { char *mod_name = NULL; @@ -2121,135 +2107,10 @@ return JS_TRUE; } -static JSBool js_email(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -{ - char *to = NULL, *from = NULL, *headers, *body = NULL, *file = NULL; - char *bound = "XXXX_boundary_XXXX"; - char filename[80], buf[B64BUFFLEN]; - int fd = 0, ifd = 0; - int x=0, y=0, bytes=0, ilen=0; - unsigned int b=0, l=0; - unsigned char in[B64BUFFLEN]; - unsigned char out[B64BUFFLEN+512]; - char *path = NULL; - - - if ( - argc > 3 && - (from = JS_GetStringBytes(JS_ValueToString(cx, argv[0]))) && - (to = JS_GetStringBytes(JS_ValueToString(cx, argv[1]))) && - (headers = JS_GetStringBytes(JS_ValueToString(cx, argv[2]))) && - (body = JS_GetStringBytes(JS_ValueToString(cx, argv[3]))) - ) { - if ( argc > 4) { - file = JS_GetStringBytes(JS_ValueToString(cx, argv[4])); - } - snprintf(filename, 80, "%smail.%ld%04x", SWITCH_GLOBAL_dirs.temp_dir, time(NULL), rand() & 0xffff); - - if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { - if (file) { - path = file; - if ((ifd = open(path, O_RDONLY)) < 1) { - return JS_FALSE; - } - - snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); - if (!write_buf(fd, buf)) { - return JS_FALSE; - } - } - - if (!write_buf(fd, headers)) - return JS_FALSE; - - if (!write_buf(fd, "\n\n")) - return JS_FALSE; - - if (file) { - snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); - if (!write_buf(fd, buf)) - return JS_FALSE; - } - - if (!write_buf(fd, body)) - return JS_FALSE; - - 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); - if (!write_buf(fd, buf)) - return JS_FALSE; - - while((ilen=read(ifd, in, B64BUFFLEN))) { - for (x=0;x<ilen;x++) { - b = (b<<8) + in[x]; - l += 8; - while (l >= 6) { - out[bytes++] = c64[(b>>(l-=6))%64]; - if (++y!=72) - continue; - out[bytes++] = '\n'; - y=0; - } - } - if (write(fd, &out, bytes) != bytes) { - return -1; - } else - bytes=0; - - } - - if (l > 0) { - out[bytes++] = c64[((b%16)<<(6-l))%64]; - } - if (l != 0) while (l < 6) { - out[bytes++] = '=', l += 2; - } - if (write(fd, &out, bytes) != bytes) { - return -1; - } - - } - - - - if (file) { - snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound); - if (!write_buf(fd, buf)) - return JS_FALSE; - } - } - - if (fd) { - close(fd); - } - if (ifd) { - close(ifd); - } - snprintf(buf, B64BUFFLEN, "/bin/cat %s | /usr/sbin/sendmail -tf \"%s\" %s", filename, from, to); - system(buf); - unlink(filename); - - - if (file) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Emailed file [%s] to [%s]\n", filename, to); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Emailed data to [%s]\n", to); - } - return JS_TRUE; - } - - - return JS_FALSE; -} - static JSFunctionSpec fs_functions[] = { {"console_log", js_log, 2}, {"exit", js_exit, 0}, {"include", js_include, 1}, - {"email", js_email, 2}, {"bridge", js_bridge, 2}, {"apiExecute", js_api_execute, 2}, {"use", js_api_use, 1}, 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 Dec 1 14:16:46 2006 @@ -34,6 +34,20 @@ static const char modname[] = "etpan"; +#define B64BUFFLEN 1024 +static const char c64[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + +static int write_buf(int fd, char *buf) { + + int len = (int)strlen(buf); + if (fd && write(fd, buf, len) != len) { + close(fd); + return 0; + } + + return 1; +} + /* etpan Object */ /*********************************************************************************/ static JSBool etpan_construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) @@ -54,14 +68,137 @@ etpan_NAME }; +static JSBool js_email(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + char *to = NULL, *from = NULL, *headers, *body = NULL, *file = NULL; + char *bound = "XXXX_boundary_XXXX"; + char filename[80], buf[B64BUFFLEN]; + int fd = 0, ifd = 0; + int x=0, y=0, bytes=0, ilen=0; + unsigned int b=0, l=0; + unsigned char in[B64BUFFLEN]; + unsigned char out[B64BUFFLEN+512]; + char *path = NULL; + + + if ( + argc > 3 && + (from = JS_GetStringBytes(JS_ValueToString(cx, argv[0]))) && + (to = JS_GetStringBytes(JS_ValueToString(cx, argv[1]))) && + (headers = JS_GetStringBytes(JS_ValueToString(cx, argv[2]))) && + (body = JS_GetStringBytes(JS_ValueToString(cx, argv[3]))) + ) { + if ( argc > 4) { + file = JS_GetStringBytes(JS_ValueToString(cx, argv[4])); + } + snprintf(filename, 80, "%smail.%ld%04x", SWITCH_GLOBAL_dirs.temp_dir, time(NULL), rand() & 0xffff); + + if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { + if (file) { + path = file; + if ((ifd = open(path, O_RDONLY)) < 1) { + return JS_FALSE; + } + + snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); + if (!write_buf(fd, buf)) { + return JS_FALSE; + } + } + + if (!write_buf(fd, headers)) + return JS_FALSE; + + if (!write_buf(fd, "\n\n")) + return JS_FALSE; + + if (file) { + snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); + if (!write_buf(fd, buf)) + return JS_FALSE; + } + + if (!write_buf(fd, body)) + return JS_FALSE; + + 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); + if (!write_buf(fd, buf)) + return JS_FALSE; + + while((ilen=read(ifd, in, B64BUFFLEN))) { + for (x=0;x<ilen;x++) { + b = (b<<8) + in[x]; + l += 8; + while (l >= 6) { + out[bytes++] = c64[(b>>(l-=6))%64]; + if (++y!=72) + continue; + out[bytes++] = '\n'; + y=0; + } + } + if (write(fd, &out, bytes) != bytes) { + return -1; + } else + bytes=0; + + } + + if (l > 0) { + out[bytes++] = c64[((b%16)<<(6-l))%64]; + } + if (l != 0) while (l < 6) { + out[bytes++] = '=', l += 2; + } + if (write(fd, &out, bytes) != bytes) { + return -1; + } + + } + + + + if (file) { + snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound); + if (!write_buf(fd, buf)) + return JS_FALSE; + } + } + + if (fd) { + close(fd); + } + if (ifd) { + close(ifd); + } + snprintf(buf, B64BUFFLEN, "/bin/cat %s | /usr/sbin/sendmail -tf \"%s\" %s", filename, from, to); + system(buf); + unlink(filename); + + + if (file) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Emailed file [%s] to [%s]\n", filename, to); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Emailed data to [%s]\n", to); + } + return JS_TRUE; + } + + + return JS_FALSE; +} + static JSFunctionSpec etpan_methods[] = { - {"myMethod", etpan_my_method, 1}, +// {"myMethod", odbc_my_method, 1}, {0} }; - static JSPropertySpec etpan_props[] = { - {"name", etpan_NAME, JSPROP_READONLY|JSPROP_PERMANENT}, +// {"name", etpan_NAME, JSPROP_READONLY|JSPROP_PERMANENT}, {0} }; @@ -81,8 +218,15 @@ }; +static JSFunctionSpec etpan_functions[] = { + {"email", js_email, 2}, + {0} +}; + switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) { + JS_DefineFunctions(cx, obj, etpan_functions); + JS_InitClass(cx, obj, NULL, 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 Dec 1 14:16:46 2006 @@ -30,18 +30,18 @@ * */ #include "mod_spidermonkey.h" - -#include <sql.h> -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4201) -#include <sqlext.h> -#pragma warning(pop) -#else -#include <sqlext.h> -#endif -#include <sqltypes.h> +#include <sql.h> +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4201) +#include <sqlext.h> +#pragma warning(pop) +#else +#include <sqlext.h> +#endif +#include <sqltypes.h> + static const char modname[] = "odbc"; /* ODBC Object */ @@ -65,13 +65,13 @@ }; static JSFunctionSpec odbc_methods[] = { - {"myMethod", odbc_my_method, 1}, +// {"myMethod", odbc_my_method, 1}, {0} }; static JSPropertySpec odbc_props[] = { - {"name", odbc_NAME, JSPROP_READONLY|JSPROP_PERMANENT}, +// {"name", odbc_NAME, JSPROP_READONLY|JSPROP_PERMANENT}, {0} };

1 0