- freeswitch-svn@lists.freeswitch.org - FreeSWITCH Mailing Lists

[Freeswitch-svn] [commit] r14034 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: crienzo Date: Mon Jun 29 15:34:27 2009 New Revision: 14034 Log: MODUNIMRCP-3 Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Mon Jun 29 15:34:27 2009 @@ -142,10 +142,10 @@ static int get_next_speech_channel_number(void); -#define XML_ID "<?xml v" +#define XML_ID "<?xml" #define GSL_ID ";GSL2.0" -#define ABNF_ID "#ABNF 1" -#define JSGF_ID "#JSGF 1.0" +#define ABNF_ID "#ABNF" +#define JSGF_ID "#JSGF" #define BUILTIN_ID "builtin:" #define SESSION_ID "session:" #define HTTP_ID "http://"

1 0

[Freeswitch-svn] [commit] r14033 - freeswitch/trunk/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: mikej Date: Mon Jun 29 14:39:10 2009 New Revision: 14033 Log: fix msvc build errors Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Mon Jun 29 14:39:10 2009 @@ -199,6 +199,7 @@ new_value = switch_event_expand_headers(params, value); if (!strcasecmp(name, "replace_header_value")) { + char *old_header_value = NULL; /* replace a header value when when_name AND/OR when_value matches */ when_name = (char *) switch_xml_attr_soft(xml_in, "when-name"); @@ -209,7 +210,6 @@ goto done; } - char *old_header_value = NULL; if ((old_header_value = switch_event_get_header(params, when_name))) { if (switch_strlen_zero(when_value) || !strcasecmp(when_value, old_header_value)) { switch_event_del_header(params, when_name); @@ -339,20 +339,23 @@ { xml_binding_t *binding = (xml_binding_t *) user_data; switch_event_header_t *hi; - - switch_xml_t xml_out = NULL; - if ((xml_out = switch_xml_new(""))) { - //switch_xml_set_attr_d(xml_out, "type", "freeswitch/xml"); - } - char *template_name; int off = 0, ret = 1; + switch_xml_t xml_out = NULL; + if (!binding) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No bindings... sorry bud returning now\n"); return NULL; } + if (!(xml_out = switch_xml_new(""))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Allocation Error\n"); + return NULL; + } + + //switch_xml_set_attr_d(xml_out, "type", "freeswitch/xml"); + if (!strcmp(section, "configuration")) { template_name = strdup(globals.configuration_template_name); } else if (!strcmp(section, "directory")) { @@ -542,12 +545,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load) { + switch_api_interface_t *xml_odbc_api_interface; switch_core_new_memory_pool(&globals.pool); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_api_interface_t *xml_odbc_api_interface; - if (!switch_odbc_available()) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must have ODBC support in FreeSWITCH to use this module\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\t./configure --enable-core-odbc-support\n");

1 0

[Freeswitch-svn] [commit] r14032 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: . include
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: raulfragoso Date: Mon Jun 29 13:09:32 2009 New Revision: 14032 Log: Disable CM_LISTEN/CM_STOP_LISTEN for now until we have the mixer working properly Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h Mon Jun 29 13:09:32 2009 @@ -55,7 +55,7 @@ \return KhompPvt to be used on the call. */ static KhompPvt * find_channel(char* allocation_string, switch_core_session_t * new_session, switch_call_cause_t * cause); - + static void initialize(void) { switch_mutex_init(&_pvts_mutex, SWITCH_MUTEX_NESTED, Globals::_module_pool); Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Mon Jun 29 13:09:32 2009 @@ -992,7 +992,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not hangup channel: %u on board %u. Releasing board channel anyway. [EV_DISCONNECT]\n", obj, e->DeviceId); try { - Globals::_k3lapi.command(e->DeviceId, obj, CM_STOP_LISTEN, NULL); + //Globals::_k3lapi.command(e->DeviceId, obj, CM_STOP_LISTEN, NULL); KhompPvt::khompPvt(e->DeviceId, obj)->session(NULL); } catch(K3LAPI::invalid_channel & err) @@ -1011,8 +1011,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Call will be answered on board %u, channel %u. [EV_CONNECT]\n", e->DeviceId, obj); switch_channel_mark_answered(channel); /* Start listening for audio */ + /* const size_t buffer_size = 16; Globals::_k3lapi.command(e->DeviceId, obj, CM_LISTEN, (const char *) &buffer_size); + */ } catch (K3LAPI::invalid_session & err) {

1 0

[Freeswitch-svn] [commit] r14031 - freeswitch/trunk/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: ledr Date: Mon Jun 29 13:01:46 2009 New Revision: 14031 Log: Got rid of some memory leaks, main leak left is strdup to switch_xml_t name Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Mon Jun 29 13:01:46 2009 @@ -271,6 +271,11 @@ char *tmp_attr; tmp_attr = switch_event_expand_headers(params, xml_in->attr[i+1]); switch_xml_set_attr(xml_out, xml_in->attr[i], tmp_attr); + + if (tmp_attr != xml_in->attr[i+1]) { + switch_safe_free(tmp_attr); + } + } /* copy all children and render them */ @@ -285,13 +290,11 @@ status = SWITCH_STATUS_SUCCESS; done: -/* what must I free here : */ -// switch_xml_free(xml_in_tmp); -// switch_safe_free(name); -// switch_safe_free(value); -// switch_safe_free(new_value); -// switch_safe_free(empty_result_break_to); -// switch_safe_free(no_template_break_to); + + if (value != new_value) { + switch_safe_free(new_value); + } + return status; } @@ -377,7 +380,9 @@ } if (debug == SWITCH_TRUE) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Debug dump of XML generated:\n%s", switch_xml_toxml(xml_out, SWITCH_FALSE)); + char *tmp_xml = switch_xml_toxml(xml_out, SWITCH_FALSE); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Debug dump of XML generated:\n%s", tmp_xml); + switch_safe_free(tmp_xml); } ret = 0; @@ -573,6 +578,8 @@ switch_odbc_handle_disconnect(globals.master_odbc); switch_odbc_handle_destroy(&globals.master_odbc); + switch_xml_unbind_search_function_ptr(xml_odbc_search); + return SWITCH_STATUS_SUCCESS; }

1 0

[Freeswitch-svn] [commit] r14030 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: brian Date: Mon Jun 29 12:30:55 2009 New Revision: 14030 Log: fix FSCORE-391 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Jun 29 12:30:55 2009 @@ -3075,6 +3075,7 @@ || (switch_xml_locate_domain(p_contact->m_url->url_host, NULL, &root, &domain) == SWITCH_STATUS_SUCCESS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirect: Transfering to %s\n", p_contact->m_url->url_user); switch_ivr_session_transfer(a_session, p_contact->m_url->url_user, NULL, NULL); + switch_xml_free(root); } else { invite_contact = sofia_glue_strip_uri(full_contact); tech_pvt->redirected = switch_core_session_strdup(session, invite_contact);

1 0

[Freeswitch-svn] [commit] r14029 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: brian Date: Mon Jun 29 09:15:00 2009 New Revision: 14029 Log: doh Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Jun 29 09:15:00 2009 @@ -1963,7 +1963,7 @@ char *ip = globals.guess_ip; if (!strcasecmp(val, "auto-nat")) { ip = globals.auto_nat ? switch_core_get_variable("nat_public_addr") : globals.guess_ip; - } else if (strcasecmp(val, "auto")) { + } else if (!strcasecmp(val, "auto")) { globals.auto_nat = 0; ip = globals.guess_ip; } else {

1 0

[Freeswitch-svn] [commit] r14028 - freeswitch/trunk/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: ledr Date: Mon Jun 29 08:51:18 2009 New Revision: 14028 Log: added setting debug so debugging output is possible during startup Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Mon Jun 29 08:51:18 2009 @@ -447,6 +447,10 @@ *odbc_pass++ = '\0'; } } + } else if (!strcasecmp(var, "debug") && !switch_strlen_zero(val)) { + if (!strcasecmp(val, "true") || !strcasecmp(val, "on")) { + debug = SWITCH_TRUE; + } } } Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc.conf.xml Mon Jun 29 08:51:18 2009 @@ -2,6 +2,7 @@ <settings> <param name="odbc-dsn" value="freeswitch:freeswitch:secret"/> + <param name="debug" value="true"/> </settings> <bindings>

1 0

[Freeswitch-svn] [commit] r14027 - in freeswitch/trunk/contrib/ledr/mod_xml_odbc: . xml_odbc_templates
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: ledr Date: Mon Jun 29 07:45:44 2009 New Revision: 14027 Log: added xml-odbc-do name="replace_header_value" to translate for example key=id to key=username when db column name differs Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Mon Jun 29 07:45:44 2009 @@ -50,6 +50,8 @@ static switch_status_t xml_odbc_render_template(char *template, switch_event_t *params, switch_xml_t xml_out, int *off); static switch_status_t xml_odbc_render_tag(switch_xml_t xml_in, switch_event_t *params, switch_xml_t xml_out, int *off); + +/* static char *my_dup(const char *s) { size_t len = strlen(s) + 1; @@ -68,48 +70,11 @@ #ifndef FREE #define FREE(ptr) switch_safe_free(ptr) #endif +*/ #define XML_ODBC_SYNTAX "[debug_on|debug_off|render_template]" -/* replace all headers in event with new_header_name AND/OR new_header_value, where header_name AND/OR header_value match */ -static switch_status_t switch_event_replace_header(switch_event_t *event, const char *header_name, const char *header_value, char *new_header_name, char *new_header_value) -{ - switch_event_header_t *hp; - switch_ssize_t hlen = -1, new_hlen = -1; - unsigned long hash = 0, new_hash = 0; - switch_status_t status = SWITCH_STATUS_FALSE; - - switch_assert(event); - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "INSIDE switch_event_replace_header header_name[%s] header_value[%s] new_header_name[%s] new_header_value[%s]\n", header_name, header_value, new_header_name, new_header_value); - - if (!header_name && !header_value) return status; - if (!new_header_name && !new_header_value) return status; - - hash = switch_ci_hashfunc_default(header_name, &hlen); - - for (hp = event->headers; hp; hp = hp->next) { - if ( (!hp->hash || hash == hp->hash) && !(header_name && strcasecmp(hp->name, header_name)) && !(header_value && strcasecmp(hp->value, header_value)) ) { - - if (new_header_name) { - FREE(hp->name); - hp->name = DUP(new_header_name); - new_hash = switch_ci_hashfunc_default(new_header_name, &new_hlen); - hp->hash = new_hash; - } - - if (new_header_value) { - FREE(hp->value); - hp->value = new_header_value; - } - - status = SWITCH_STATUS_SUCCESS; - } - } - return status; -} - static struct { char *odbc_dsn; @@ -206,8 +171,7 @@ char *name = NULL; char *value = NULL, *new_value = NULL; -// char *when_key = NULL, *when_val = NULL; -// char *to_key = NULL, *to_val = NULL; + char *when_name = NULL, *when_value = NULL; char *empty_result_break_to = NULL; char *no_template_break_to = NULL; @@ -219,6 +183,7 @@ /* special case xml-odbc-do - this tag is not copied, but action is done */ if (!strcasecmp(xml_in->name, "xml-odbc-do")) { name = (char *) switch_xml_attr_soft(xml_in, "name"); + value = (char *) switch_xml_attr_soft(xml_in, "value"); no_template_break_to = (char *) switch_xml_attr_soft(xml_in, "on-no-template-break-to"); // THIS DOESN'T WORK YET !! @@ -227,55 +192,51 @@ goto done; } - if (!strcasecmp(name, "replace_header")) { - char *when_key = (char *) switch_xml_attr(xml_in, "when-key"); - char *when_val = (char *) switch_xml_attr(xml_in, "when-val"); - char *to_key = (char *) switch_xml_attr(xml_in, "to-key"); - char *to_val = (char *) switch_xml_attr(xml_in, "to-val"); + if (switch_strlen_zero(value)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no value attr is given\n", name); + goto done; + } + new_value = switch_event_expand_headers(params, value); - if (!when_key && !when_val) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no when-key AND no when-val are given\n", name); - goto done; - } + if (!strcasecmp(name, "replace_header_value")) { + /* replace a header value when when_name AND/OR when_value matches */ + + when_name = (char *) switch_xml_attr_soft(xml_in, "when-name"); + when_value = (char *) switch_xml_attr_soft(xml_in, "when-value"); - if (!to_key && !to_val) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no to-key AND no to-val are given\n", name); + if (switch_strlen_zero(when_name)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no when-name is given\n", name); goto done; } - switch_event_replace_header(params, when_key, when_val, to_key, to_val); - //switch_event_replace_header(params, NULL, NULL, NULL, NULL); - - } else if (!strcasecmp(name, "break-to")) { - - value = (char *) switch_xml_attr_soft(xml_in, "value"); - if (switch_strlen_zero(value)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no value attr is given\n", name); - goto done; + char *old_header_value = NULL; + if ((old_header_value = switch_event_get_header(params, when_name))) { + if (switch_strlen_zero(when_value) || !strcasecmp(when_value, old_header_value)) { + switch_event_del_header(params, when_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, when_name, new_value); + } } - new_value = switch_event_expand_headers(params, value); + } else if (!strcasecmp(name, "break-to")) { /* set a next_template header so xml_odbc_render_template breaks the loop and starts over with a new template */ + switch_event_del_header(params, "next_template_name"); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", value); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", new_value); goto done; } else if (!strcasecmp(name, "query")) { - - value = (char *) switch_xml_attr_soft(xml_in, "value"); - if (switch_strlen_zero(value)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no value attr is given\n", name); - goto done; - } - new_value = switch_event_expand_headers(params, value); - /* create query_helper that is given to callback function on each returned row */ + query_helper.xml_in = xml_in; query_helper.xml_out = xml_out; query_helper.off = off; query_helper.params = params; query_helper.rowcount = 0; + if (debug == SWITCH_TRUE) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG Performing Query:\n%s\n", new_value); + } + if (switch_odbc_handle_callback_exec(globals.master_odbc, new_value, xml_odbc_query_callback, &query_helper) != SWITCH_ODBC_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", new_value); goto done; Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml Mon Jun 29 07:45:44 2009 @@ -1,6 +1,7 @@ <include> <template name="directory"> <document type="freeswitch/xml"> + <xml-odbc-do name="replace_header_value" when-name="key" when-value="id" value="username"/> <xml-odbc-do name="query" on-empty-result-break-to="not_found" value=" SELECT dir_domains.id AS domain_id, Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml Mon Jun 29 07:45:44 2009 @@ -1,6 +1,7 @@ <include> <template name="directory_swk" description="based on swk's shipment sql"> <document type="freeswitch/xml"> + <xml-odbc-do name="replace_header_value" when-name="key" when-value="id" value="username"/> <xml-odbc-do name="query" on-empty-result-break-to="not_found" value=" SELECT domains.uid AS domains_uid, @@ -11,7 +12,7 @@ domains, users WHERE - users.username = '${user}' AND + users.${key} = '${user}' AND domains.name = '${domain}' AND users.domains_uid = domains.uid AND domains.enabled = '1' AND

1 0

[Freeswitch-svn] [commit] r14026 - freeswitch/trunk/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 29 Jun '09

29 Jun '09

Author: ledr Date: Mon Jun 29 06:53:29 2009 New Revision: 14026 Log: broken, need backup, am fixing replace_header Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Mon Jun 29 06:53:29 2009 @@ -50,8 +50,67 @@ static switch_status_t xml_odbc_render_template(char *template, switch_event_t *params, switch_xml_t xml_out, int *off); static switch_status_t xml_odbc_render_tag(switch_xml_t xml_in, switch_event_t *params, switch_xml_t xml_out, int *off); +static char *my_dup(const char *s) +{ + size_t len = strlen(s) + 1; + void *new = malloc(len); + switch_assert(new); + + return (char *) memcpy(new, s, len); +} + +#ifndef ALLOC +#define ALLOC(size) malloc(size) +#endif +#ifndef DUP +#define DUP(str) my_dup(str) +#endif +#ifndef FREE +#define FREE(ptr) switch_safe_free(ptr) +#endif + + #define XML_ODBC_SYNTAX "[debug_on|debug_off|render_template]" +/* replace all headers in event with new_header_name AND/OR new_header_value, where header_name AND/OR header_value match */ +static switch_status_t switch_event_replace_header(switch_event_t *event, const char *header_name, const char *header_value, char *new_header_name, char *new_header_value) +{ + switch_event_header_t *hp; + switch_ssize_t hlen = -1, new_hlen = -1; + unsigned long hash = 0, new_hash = 0; + switch_status_t status = SWITCH_STATUS_FALSE; + + switch_assert(event); + +switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "INSIDE switch_event_replace_header header_name[%s] header_value[%s] new_header_name[%s] new_header_value[%s]\n", header_name, header_value, new_header_name, new_header_value); + + if (!header_name && !header_value) return status; + if (!new_header_name && !new_header_value) return status; + + hash = switch_ci_hashfunc_default(header_name, &hlen); + + for (hp = event->headers; hp; hp = hp->next) { + if ( (!hp->hash || hash == hp->hash) && !(header_name && strcasecmp(hp->name, header_name)) && !(header_value && strcasecmp(hp->value, header_value)) ) { + + if (new_header_name) { + FREE(hp->name); + hp->name = DUP(new_header_name); + new_hash = switch_ci_hashfunc_default(new_header_name, &new_hlen); + hp->hash = new_hash; + } + + if (new_header_value) { + FREE(hp->value); + hp->value = new_header_value; + } + + status = SWITCH_STATUS_SUCCESS; + } + } + return status; +} + + static struct { char *odbc_dsn; char *configuration_template_name; @@ -146,6 +205,10 @@ char *name = NULL; char *value = NULL, *new_value = NULL; + +// char *when_key = NULL, *when_val = NULL; +// char *to_key = NULL, *to_val = NULL; + char *empty_result_break_to = NULL; char *no_template_break_to = NULL; @@ -156,29 +219,57 @@ /* special case xml-odbc-do - this tag is not copied, but action is done */ if (!strcasecmp(xml_in->name, "xml-odbc-do")) { name = (char *) switch_xml_attr_soft(xml_in, "name"); - value = (char *) switch_xml_attr_soft(xml_in, "value"); - empty_result_break_to = (char *) switch_xml_attr_soft(xml_in, "on-empty-result-break-to"); - no_template_break_to = (char *) switch_xml_attr_soft(xml_in, "on-no-template-break-to"); + + no_template_break_to = (char *) switch_xml_attr_soft(xml_in, "on-no-template-break-to"); // THIS DOESN'T WORK YET !! if (switch_strlen_zero(name)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do because no name attribute is given\n"); goto done; } - if (switch_strlen_zero(value)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no value attr is given\n", name); - goto done; - } + if (!strcasecmp(name, "replace_header")) { + char *when_key = (char *) switch_xml_attr(xml_in, "when-key"); + char *when_val = (char *) switch_xml_attr(xml_in, "when-val"); + char *to_key = (char *) switch_xml_attr(xml_in, "to-key"); + char *to_val = (char *) switch_xml_attr(xml_in, "to-val"); - new_value = switch_event_expand_headers(params, value); + if (!when_key && !when_val) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no when-key AND no when-val are given\n", name); + goto done; + } + + if (!to_key && !to_val) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no to-key AND no to-val are given\n", name); + goto done; + } + + switch_event_replace_header(params, when_key, when_val, to_key, to_val); + //switch_event_replace_header(params, NULL, NULL, NULL, NULL); + + } else if (!strcasecmp(name, "break-to")) { + + value = (char *) switch_xml_attr_soft(xml_in, "value"); + if (switch_strlen_zero(value)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no value attr is given\n", name); + goto done; + } + new_value = switch_event_expand_headers(params, value); - if (!strcasecmp(name, "break-to")) { /* set a next_template header so xml_odbc_render_template breaks the loop and starts over with a new template */ switch_event_del_header(params, "next_template_name"); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", value); goto done; } else if (!strcasecmp(name, "query")) { + + value = (char *) switch_xml_attr_soft(xml_in, "value"); + if (switch_strlen_zero(value)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no value attr is given\n", name); + goto done; + } + new_value = switch_event_expand_headers(params, value); + + /* create query_helper that is given to callback function on each returned row */ query_helper.xml_in = xml_in; query_helper.xml_out = xml_out; query_helper.off = off; @@ -187,13 +278,15 @@ if (switch_odbc_handle_callback_exec(globals.master_odbc, new_value, xml_odbc_query_callback, &query_helper) != SWITCH_ODBC_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error running this query: [%s]\n", new_value); - } else { - if (!switch_strlen_zero(empty_result_break_to) && query_helper.rowcount == 0) { - /* set a next_template header so xml_odbc_render_template breaks the loop and starts over with a new template */ - switch_event_del_header(params, "next_template_name"); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", empty_result_break_to); - goto done; - } + goto done; + } + + empty_result_break_to = (char *) switch_xml_attr_soft(xml_in, "on-empty-result-break-to"); + if (!switch_strlen_zero(empty_result_break_to) && query_helper.rowcount == 0) { + /* set a next_template header so xml_odbc_render_template breaks the loop and starts over with a new template */ + switch_event_del_header(params, "next_template_name"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "next_template_name", empty_result_break_to); + goto done; } } else {

1 0

[Freeswitch-svn] [commit] r14025 - freeswitch/trunk/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 28 Jun '09

28 Jun '09

Author: ledr Date: Sun Jun 28 15:28:11 2009 New Revision: 14025 Log: free template_name in xml_odbc_search Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Sun Jun 28 15:28:11 2009 @@ -330,6 +330,8 @@ cleanup: + switch_safe_free(template_name); + if (ret) { switch_xml_free(xml_out); return NULL;

1 0