- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4262 - in freeswitch/trunk/src: include mod/xml_int/mod_xml_rpc
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Wed Feb 14 13:08:11 2007 New Revision: 4262 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: fix typedef for switch_stream_handle_write_function_t to also use const char * fmt and match other uses of that type. Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Feb 14 13:08:11 2007 @@ -928,7 +928,7 @@ typedef switch_status_t (*switch_waitfor_write_hook_t)(switch_core_session_t *, int, int); typedef switch_status_t (*switch_send_dtmf_hook_t)(switch_core_session_t *, char *); typedef struct switch_stream_handle switch_stream_handle_t; -typedef switch_status_t (*switch_stream_handle_write_function_t)(switch_stream_handle_t *handle, char *fmt, ...); +typedef switch_status_t (*switch_stream_handle_write_function_t)(switch_stream_handle_t *handle, const char *fmt, ...); typedef switch_status_t (*switch_api_function_t)(char *in, switch_core_session_t *session, switch_stream_handle_t *stream); typedef switch_status_t (*switch_input_callback_function_t)(switch_core_session_t *session, void *input, Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed Feb 14 13:08:11 2007 @@ -126,7 +126,7 @@ } -static switch_status_t http_stream_write(switch_stream_handle_t *handle, char *fmt, ...) +static switch_status_t http_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) { va_list ap; TSession *r = handle->data;

1 0

[commit] r4261 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Wed Feb 14 12:34:16 2007 New Revision: 4261 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: fix potential xml handle leak from previous committ. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Feb 14 12:34:16 2007 @@ -454,18 +454,18 @@ && switch_ivr_menu_stack_xml_build(xml_ctx,&menu_stack,xml_menus,xml_menu) == SWITCH_STATUS_SUCCESS) { switch_xml_free(cxml); + cxml = NULL; switch_channel_pre_answer(channel); switch_ivr_menu_execute(session,menu_stack,params,NULL); switch_ivr_menu_stack_free(menu_stack); } else { - switch_xml_free(cxml); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to create menu '%s'\n", params); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to find menu '%s'\n", params); } } - + switch_xml_free(cxml); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", ivr_cf_name); }

1 0

[commit] r4260 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Wed Feb 14 12:28:42 2007 New Revision: 4260 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_xml.c Log: fix missing strdup in switch_ivr_menu_bind_function change most char * values in ivr_menu functions to const char * change switch_core_strdup to get passed const char * instead of char * change switch_xml_find_child to get passed const char * instead of char * change the ivr dialplan application to free the xml config as soon as it is done building the xml menu and not hold it until the menu is done being run, so that you can do a reloadxml while someone is in a menu without blocking. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Feb 14 12:28:42 2007 @@ -391,7 +391,7 @@ \param todup the string to duplicate \return a pointer to the newly duplicated string */ -SWITCH_DECLARE(char *) switch_core_strdup(switch_memory_pool_t *pool, char *todup); +SWITCH_DECLARE(char *) switch_core_strdup(switch_memory_pool_t *pool, const char *todup); /*! \brief Retrieve the memory pool from a session Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Feb 14 12:28:42 2007 @@ -540,13 +540,13 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_menu, switch_ivr_menu_t *main, - char *name, - char *greeting_sound, - char *short_greeting_sound, - char *exit_sound, - char *invalid_sound, - char *tts_engine, - char *tts_voice, + const char *name, + const char *greeting_sound, + const char *short_greeting_sound, + const char *exit_sound, + const char *invalid_sound, + const char *tts_engine, + const char *tts_voice, int timeout, int max_failures, switch_memory_pool_t *pool); @@ -559,7 +559,7 @@ *\param bind KeyStrokes to bind the action to. *\return SWUTCH_STATUS_SUCCESS if the action was binded */ -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_action(switch_ivr_menu_t *menu, switch_ivr_action_t ivr_action, char *arg, char *bind); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_action(switch_ivr_menu_t *menu, switch_ivr_action_t ivr_action, const char *arg, const char *bind); /*! @@ -573,7 +573,7 @@ *\note The function returns an switch_ivr_action_t enum of what you want to do. and looks to your buffer for args. *\return SWUTCH_STATUS_SUCCESS if the function was binded */ -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_function(switch_ivr_menu_t *menu, switch_ivr_menu_action_function_t *function, char *arg, char *bind); +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_function(switch_ivr_menu_t *menu, switch_ivr_menu_action_function_t *function, const char *arg, const char *bind); /*! Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Wed Feb 14 12:28:42 2007 @@ -143,7 +143,7 @@ ///\param attrname the attribute name ///\param value the value ///\return an xml node or NULL -SWITCH_DECLARE(switch_xml_t) switch_xml_find_child(switch_xml_t node, char *childname, char *attrname, char *value); +SWITCH_DECLARE(switch_xml_t) switch_xml_find_child(switch_xml_t node, const char *childname, const char *attrname, const char *value); ///\brief returns the next tag of the same name in the same section and depth or NULL ///\ if not found Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Feb 14 12:28:42 2007 @@ -453,17 +453,19 @@ #endif && switch_ivr_menu_stack_xml_build(xml_ctx,&menu_stack,xml_menus,xml_menu) == SWITCH_STATUS_SUCCESS) { + switch_xml_free(cxml); switch_channel_pre_answer(channel); switch_ivr_menu_execute(session,menu_stack,params,NULL); switch_ivr_menu_stack_free(menu_stack); } else { + switch_xml_free(cxml); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to create menu '%s'\n", params); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to find menu '%s'\n", params); } } - switch_xml_free(cxml); + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", ivr_cf_name); } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Feb 14 12:28:42 2007 @@ -1489,7 +1489,7 @@ } -SWITCH_DECLARE(char *) switch_core_strdup(switch_memory_pool_t *pool, char *todup) +SWITCH_DECLARE(char *) switch_core_strdup(switch_memory_pool_t *pool, const char *todup) { char *duped = NULL; switch_size_t len; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Feb 14 12:28:42 2007 @@ -3987,7 +3987,7 @@ struct switch_ivr_menu_action *next; }; -static switch_ivr_menu_t *switch_ivr_menu_find(switch_ivr_menu_t *stack, char *name) { +static switch_ivr_menu_t *switch_ivr_menu_find(switch_ivr_menu_t *stack, const char *name) { switch_ivr_menu_t *ret; for(ret = stack; ret ; ret = ret->next) { if (!name || !strcmp(ret->name, name)) @@ -4012,13 +4012,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_init(switch_ivr_menu_t **new_menu, switch_ivr_menu_t *main, - char *name, - char *greeting_sound, - char *short_greeting_sound, - char *invalid_sound, - char *exit_sound, - char *tts_engine, - char *tts_voice, + const char *name, + const char *greeting_sound, + const char *short_greeting_sound, + const char *invalid_sound, + const char *exit_sound, + const char *tts_engine, + const char *tts_voice, int timeout, int max_failures, switch_memory_pool_t *pool) @@ -4097,7 +4097,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_action(switch_ivr_menu_t *menu, switch_ivr_action_t ivr_action, char *arg, char *bind) +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_action(switch_ivr_menu_t *menu, switch_ivr_action_t ivr_action, const char *arg, const char *bind) { switch_ivr_menu_action_t *action; uint32_t len; @@ -4118,13 +4118,13 @@ return SWITCH_STATUS_MEMERR; } -SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_function(switch_ivr_menu_t *menu, switch_ivr_menu_action_function_t *function, char *arg, char *bind) +SWITCH_DECLARE(switch_status_t) switch_ivr_menu_bind_function(switch_ivr_menu_t *menu, switch_ivr_menu_action_function_t *function, const char *arg, const char *bind) { switch_ivr_menu_action_t *action; uint32_t len; if ((action = switch_core_alloc(menu->pool, sizeof(*action)))) { - action->bind = bind; + action->bind = switch_core_strdup(menu->pool,bind); action->next = menu->actions; action->arg = switch_core_strdup(menu->pool, arg); len = (uint32_t)strlen(action->bind) + 1; @@ -4495,15 +4495,15 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (xml_menu_ctx != NULL && menu_stack != NULL && xml_menu != NULL) { - char *menu_name = (char *)switch_xml_attr_soft(xml_menu,"name"); // if the attr doesn't exist, return "" - char *greet_long = (char *)switch_xml_attr(xml_menu,"greet-long"); // if the attr doesn't exist, return NULL - char *greet_short = (char *)switch_xml_attr(xml_menu,"greet-short"); // if the attr doesn't exist, return NULL - char *invalid_sound = (char *)switch_xml_attr(xml_menu,"invalid-sound"); // if the attr doesn't exist, return NULL - char *exit_sound = (char *)switch_xml_attr(xml_menu,"exit-sound"); // if the attr doesn't exist, return NULL - char *tts_engine = (char *)switch_xml_attr(xml_menu,"tts-engine"); // if the attr doesn't exist, return NULL - char *tts_voice = (char *)switch_xml_attr(xml_menu,"tts-voice"); // if the attr doesn't exist, return NULL - char *timeout = (char *)switch_xml_attr_soft(xml_menu,"timeout"); // if the attr doesn't exist, return "" - char *max_failures = (char *)switch_xml_attr_soft(xml_menu,"max-failures"); // if the attr doesn't exist, return "" + const char *menu_name = switch_xml_attr_soft(xml_menu,"name"); // if the attr doesn't exist, return "" + const char *greet_long = switch_xml_attr(xml_menu,"greet-long"); // if the attr doesn't exist, return NULL + const char *greet_short = switch_xml_attr(xml_menu,"greet-short"); // if the attr doesn't exist, return NULL + const char *invalid_sound = switch_xml_attr(xml_menu,"invalid-sound"); // if the attr doesn't exist, return NULL + const char *exit_sound = switch_xml_attr(xml_menu,"exit-sound"); // if the attr doesn't exist, return NULL + const char *tts_engine = switch_xml_attr(xml_menu,"tts-engine"); // if the attr doesn't exist, return NULL + const char *tts_voice = switch_xml_attr(xml_menu,"tts-voice"); // if the attr doesn't exist, return NULL + const char *timeout = switch_xml_attr_soft(xml_menu,"timeout"); // if the attr doesn't exist, return "" + const char *max_failures = switch_xml_attr_soft(xml_menu,"max-failures"); // if the attr doesn't exist, return "" switch_ivr_menu_t *menu = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "building menu '%s'\n",menu_name); @@ -4530,9 +4530,9 @@ // build menu entries for(xml_kvp = switch_xml_child(xml_menu, "entry"); xml_kvp != NULL && status == SWITCH_STATUS_SUCCESS; xml_kvp = xml_kvp->next) { - char *action = (char *)switch_xml_attr(xml_kvp, "action"); - char *digits = (char *)switch_xml_attr(xml_kvp, "digits"); - char *param = (char *)switch_xml_attr_soft(xml_kvp, "param"); + const char *action = switch_xml_attr(xml_kvp, "action"); + const char *digits = switch_xml_attr(xml_kvp, "digits"); + const char *param = switch_xml_attr_soft(xml_kvp, "param"); if (!switch_strlen_zero(action) && !switch_strlen_zero(digits)) { switch_ivr_menu_xml_map_t *xml_map = xml_menu_ctx->map; Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Wed Feb 14 12:28:42 2007 @@ -169,7 +169,7 @@ } -SWITCH_DECLARE(switch_xml_t) switch_xml_find_child(switch_xml_t node, char *childname, char *attrname, char *value) +SWITCH_DECLARE(switch_xml_t) switch_xml_find_child(switch_xml_t node, const char *childname, const char *attrname, const char *value) { switch_xml_t p = NULL;

1 0

[commit] r4259 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Wed Feb 14 12:22:34 2007 New Revision: 4259 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: remove extra ; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Feb 14 12:22:34 2007 @@ -1528,7 +1528,7 @@ char sess_id[11] = ""; char *dnis = NULL; char workspace[1024] = ""; - char *p, *u, ubuf[512] = "", *user = NULL;; + char *p, *u, ubuf[512] = "", *user = NULL; char *cid_msg = NULL; switch_copy_string(workspace, outbound_profile->destination_number, sizeof(workspace));

1 0

[commit] r4258 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 10:32:02 2007 New Revision: 4258 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: the guy on the mailing list had a good idea, add a message in dingalaing announcing the caller id as a chat message, added, but not testesd...can someone test this? Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Feb 14 10:32:02 2007 @@ -1529,6 +1529,7 @@ char *dnis = NULL; char workspace[1024] = ""; char *p, *u, ubuf[512] = "", *user = NULL;; + char *cid_msg = NULL; switch_copy_string(workspace, outbound_profile->destination_number, sizeof(workspace)); profile_name = workspace; @@ -1630,6 +1631,10 @@ tech_pvt->us = switch_core_session_strdup(*new_session, user); tech_pvt->them = switch_core_session_strdup(*new_session, full_id); ldl_session_create(&dlsession, mdl_profile->handle, sess_id, full_id, user, LDL_FLAG_OUTBOUND); + if ((cid_msg = switch_mprintf("Incoming Call From %s %s\n", outbound_profile->caller_id_name, outbound_profile->caller_id_number))) { + ldl_handle_send_msg(mdl_profile->handle, tech_pvt->them, tech_pvt->us, "", cid_msg); + free(cid_msg); + } tech_pvt->profile = mdl_profile; ldl_session_set_private(dlsession, *new_session); ldl_session_set_value(dlsession, "dnis", dnis);

1 0

[commit] r4257 - in freeswitch/trunk/src: . include mod/languages/mod_spidermonkey
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 10:19:01 2007 New Revision: 4257 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr.c Log: add new xml call detail function to the core and a way to use it from javascript Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Feb 14 10:19:01 2007 @@ -53,6 +53,15 @@ /*! + \brief Generate an XML CDR report. + \param session the session to get the data from. + \param xml_cdr pointer to the xml_record + \return SWITCH_STATUS_SUCCESS if successful + \note on success the xml object must be freed +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_generate_xml_cdr(switch_core_session_t *session, switch_xml_t *xml_cdr); + +/*! \brief Parse command from an event \param session the session to send the message to \param event the event to send Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Feb 14 10:19:01 2007 @@ -1340,6 +1340,27 @@ return JS_TRUE; } + +static JSBool session_cdr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_xml_t cdr; + + /*Always a pessimist... sheesh!*/ + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + + if (switch_ivr_generate_xml_cdr(jss->session, &cdr) == SWITCH_STATUS_SUCCESS) { + char *xml_text; + if ((xml_text = switch_xml_toxml(cdr))) { + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, xml_text)); + } + switch_safe_free(xml_text); + switch_xml_free(cdr); + } + + return JS_TRUE; +} + static JSBool session_ready(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct js_session *jss = JS_GetPrivate(cx, obj); @@ -1716,6 +1737,7 @@ {"getVariable", session_get_variable, 1}, {"getDigits", session_get_digits, 1}, {"answer", session_answer, 0}, + {"generateXmlCdr", session_cdr, 0}, {"ready", session_ready, 0}, {"waitForAnswer", session_wait_for_answer, 0}, {"waitForMedia", session_wait_for_media, 0}, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Feb 14 10:19:01 2007 @@ -4833,6 +4833,217 @@ } +static int set_profile_data(switch_xml_t xml, switch_caller_profile_t *caller_profile, int off) +{ + switch_xml_t param; + + if (!(param = switch_xml_add_child_d(xml, "username", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->username); + + if (!(param = switch_xml_add_child_d(xml, "dialplan", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->dialplan); + + if (!(param = switch_xml_add_child_d(xml, "caller_id_name", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->caller_id_name); + + if (!(param = switch_xml_add_child_d(xml, "ani", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->ani); + + if (!(param = switch_xml_add_child_d(xml, "aniii", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->aniii); + + if (!(param = switch_xml_add_child_d(xml, "caller_id_number", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->caller_id_number); + + if (!(param = switch_xml_add_child_d(xml, "network_addr", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->network_addr); + + if (!(param = switch_xml_add_child_d(xml, "rdnis", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->rdnis); + + if (!(param = switch_xml_add_child_d(xml, "destination_number", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->destination_number); + + if (!(param = switch_xml_add_child_d(xml, "uuid", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->uuid); + + if (!(param = switch_xml_add_child_d(xml, "source", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->source); + + if (!(param = switch_xml_add_child_d(xml, "context", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->context); + + if (!(param = switch_xml_add_child_d(xml, "chan_name", off++))) { + return -1; + } + switch_xml_set_txt(param, caller_profile->chan_name); + + return 0; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_generate_xml_cdr(switch_core_session_t *session, switch_xml_t *xml_cdr) +{ + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + switch_hash_index_t *hi; + void *vval; + const void *vvar; + switch_xml_t variable, + variables, + cdr, + x_caller_profile, + x_caller_extension, + x_times, + x_application, + x_callflow; + char tmp[512]; + int cdr_off = 0, v_off = 0; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!(cdr = switch_xml_new("cdr"))) { + return SWITCH_STATUS_SUCCESS; + } + + if (!(variables = switch_xml_add_child_d(cdr, "variables", cdr_off++))) { + goto error; + } + + for (hi = switch_channel_variable_first(channel, switch_core_session_get_pool(session)); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &vvar, NULL, &vval); + if (vvar && vval) { + if ((variable = switch_xml_add_child_d(variables, (char *) vvar, v_off++))) { + char *data; + char *value = (char *) vval; + switch_size_t dlen = strlen(value) * 3; + + if ((data = switch_core_session_alloc(session, dlen))) { + switch_url_encode(value, data, dlen); + switch_xml_set_txt_d(variable, data); + } + } + } + } + + caller_profile = switch_channel_get_caller_profile(channel); + + while (caller_profile) { + int cf_off = 0; + + if (!(x_callflow = switch_xml_add_child_d(cdr, "callflow", cdr_off++))) { + goto error; + } + + if (caller_profile->caller_extension) { + switch_caller_application_t *ap; + + if (!(x_caller_extension = switch_xml_add_child_d(x_callflow, "extension", cf_off++))) { + goto error; + } + switch_xml_set_attr_d(x_caller_extension, "name", caller_profile->caller_extension->extension_name); + switch_xml_set_attr_d(x_caller_extension, "number", caller_profile->caller_extension->extension_number); + if (caller_profile->caller_extension->current_application) { + switch_xml_set_attr_d(x_caller_extension, "current_app", caller_profile->caller_extension->current_application->application_name); + } + + for(ap = caller_profile->caller_extension->applications; ap; ap = ap->next) { + if (!(x_application = switch_xml_add_child_d(x_callflow, "application", cf_off++))) { + goto error; + } + switch_xml_set_attr_d(x_application, "app_name", ap->application_name); + switch_xml_set_attr_d(x_application, "app_data", ap->application_data); + } + } + + if (!(x_caller_profile = switch_xml_add_child_d(x_callflow, "caller_profile", cf_off++))) { + goto error; + } + set_profile_data(x_caller_profile, caller_profile, 0); + + if (caller_profile->originator_caller_profile) { + if (!(x_caller_profile = switch_xml_add_child_d(x_callflow, "originator_caller_profile", cf_off++))) { + goto error; + } + set_profile_data(x_caller_profile, caller_profile->originator_caller_profile, 0); + } + + if (caller_profile->originatee_caller_profile) { + if (!(x_caller_profile = switch_xml_add_child_d(x_callflow, "originatee_caller_profile", cf_off++))) { + goto error; + } + set_profile_data(x_caller_profile, caller_profile->originatee_caller_profile, 0); + } + + + if (caller_profile->times) { + if (!(x_times = switch_xml_add_child_d(x_callflow, "created_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->created); + switch_xml_set_txt_d(x_times, tmp); + + if (!(x_times = switch_xml_add_child_d(x_callflow, "answered_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->answered); + switch_xml_set_txt_d(x_times, tmp); + + if (!(x_times = switch_xml_add_child_d(x_callflow, "hangup_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->hungup); + switch_xml_set_txt_d(x_times, tmp); + + if (!(x_times = switch_xml_add_child_d(x_callflow, "transfer_time", cf_off++))) { + goto error; + } + snprintf(tmp, sizeof(tmp), "%"APR_TIME_T_FMT, caller_profile->times->transferred); + switch_xml_set_txt_d(x_times, tmp); + } + + caller_profile = caller_profile->next; + } + + *xml_cdr = cdr; + + return SWITCH_STATUS_SUCCESS; + + error: + + if (cdr) { + switch_xml_free(cdr); + } + + return SWITCH_STATUS_FALSE; +} + + + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r4256 - freeswitch/trunk/src/include
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 10:08:49 2007 New Revision: 4256 Modified: freeswitch/trunk/src/include/switch_console.h Log: s.data is void * Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Wed Feb 14 10:08:49 2007 @@ -43,7 +43,7 @@ SWITCH_BEGIN_EXTERN_C #define SWITCH_CMD_CHUNK_LEN 1024 -#define SWITCH_STANDARD_STREAM(s) if ((s.data = (char *)malloc(SWITCH_CMD_CHUNK_LEN))) { \ +#define SWITCH_STANDARD_STREAM(s) if ((s.data = malloc(SWITCH_CMD_CHUNK_LEN))) { \ memset(s.data, 0, SWITCH_CMD_CHUNK_LEN); \ s.end = s.data;\ s.data_size = SWITCH_CMD_CHUNK_LEN;\

1 0

[commit] r4255 - freeswitch/trunk/conf
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 23:30:14 2007 New Revision: 4255 Modified: freeswitch/trunk/conf/modules.conf.xml Log: add mod_say_en to load by default. Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Tue Feb 13 23:30:14 2007 @@ -64,5 +64,8 @@    + +  + <load module="mod_say_en"/> </modules> </configuration>

1 0

[commit] r4254 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/endpoints/mod_dingaling mod/endpoints/mod_sofia mod/event_handlers/mod_event_socket
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 22:45:10 2007 New Revision: 4254 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_ivr.c Log: potential format string exploits (warning: format not a string literal and no format arguments) 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 Tue Feb 13 22:45:10 2007 @@ -2466,7 +2466,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "dtmf-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", dtmf); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", "%s", dtmf); switch_event_fire(&event); } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Feb 13 22:45:10 2007 @@ -628,7 +628,7 @@ va_start(ap, fmt); vsnprintf(data, sizeof(data), fmt, ap); - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, data); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "%s", data); va_end(ap); } @@ -2427,7 +2427,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "%s", subject); if (msg) { - switch_event_add_body(event, msg); + switch_event_add_body(event, "%s", msg); } if (switch_core_session_queue_event(tech_pvt->session, &event) != SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); 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 Tue Feb 13 22:45:10 2007 @@ -2659,7 +2659,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to_addr); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE"); if (msg) { - switch_event_add_body(event, msg); + switch_event_add_body(event, "%s", msg); } if (switch_core_session_queue_event(tech_pvt->session, &event) != SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); 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 Tue Feb 13 22:45:10 2007 @@ -550,7 +550,7 @@ if (switch_event_create(&event, SWITCH_EVENT_BACKGROUND_JOB) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Job-UUID", "%s", acs->uuid_str); - switch_event_add_body(event, reply); + switch_event_add_body(event, "%s", reply); switch_event_fire(&event); } } else { @@ -650,7 +650,7 @@ } } - snprintf(reply, reply_len, val); + snprintf(reply, reply_len, "%s", val); goto done; } else if (!strncasecmp(cmd, "myevents", 8)) { listener->event_list[SWITCH_EVENT_CHANNEL_CREATE] = 1; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Feb 13 22:45:10 2007 @@ -807,7 +807,7 @@ if (switch_event_create(&event, SWITCH_EVENT_DETECTED_SPEECH) == SWITCH_STATUS_SUCCESS) { if (status == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Speech-Type", "detected-speech"); - switch_event_add_body(event, xmlstr); + switch_event_add_body(event, "%s", xmlstr); } else { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Speech-Type", "begin-speaking"); } @@ -2518,7 +2518,7 @@ for (hi = switch_channel_variable_first(caller_channel, switch_core_session_get_pool(session)); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &vvar, NULL, &vval); if (vvar && vval) { - switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (void *)vvar, vval); + switch_event_add_header(var_event, SWITCH_STACK_BOTTOM, (void *)vvar, "%s", (char *)vval); } }

1 0

[commit] r4253 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 22:32:13 2007 New Revision: 4253 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: potential format string exploit 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 Tue Feb 13 22:32:13 2007 @@ -225,7 +225,7 @@ if (argc > 0) { char *body = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - switch_event_add_body(eo->event, body); + switch_event_add_body(eo->event, "%s", body); *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); return JS_TRUE; }

1 0