- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[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

[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

[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

[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

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

28 Jun '09

Author: ledr Date: Sun Jun 28 15:13:11 2009 New Revision: 14024 Log: tried freeing memory at certain places but it doesn't work, added comments, hopefully someone can help ? 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:13:11 2009 @@ -144,15 +144,17 @@ switch_xml_t xml_in_tmp = NULL; int i; + char *name = NULL; + char *value = NULL, *new_value = NULL; + char *empty_result_break_to = NULL; + char *no_template_break_to = NULL; + xml_odbc_query_helper_t query_helper; + switch_status_t status = SWITCH_STATUS_FALSE; + /* special case xml-odbc-do - this tag is not copied, but action is done */ if (!strcasecmp(xml_in->name, "xml-odbc-do")) { - char *name = NULL; - char *value = NULL, *new_value = NULL; - char *empty_result_break_to = NULL; - char *no_template_break_to = NULL; - 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"); @@ -171,10 +173,11 @@ new_value = switch_event_expand_headers(params, value); if (!strcasecmp(name, "break-to")) { -/* have a look at this again, not too happy about this next_template_name thing.. */ + /* 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); - return SWITCH_STATUS_FALSE; + goto done; + } else if (!strcasecmp(name, "query")) { query_helper.xml_in = xml_in; query_helper.xml_out = xml_out; @@ -186,10 +189,10 @@ 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) { -/* have a look at this again, not too happy about this next_template_name thing.. */ + /* 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); - return SWITCH_STATUS_FALSE; + goto done; } } @@ -197,8 +200,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring unknown xml-odbc-do name=[%s]\n", name); } - switch_safe_free(new_value); - /* just copy current tag xml_in to xml_out and recurse for all children */ } else { @@ -208,7 +209,7 @@ /* or create a child */ } else if (!(xml_out = switch_xml_add_child_d(xml_out, xml_in->name, *off++))) { - return SWITCH_STATUS_FALSE; + goto done; } /* copy all attrs */ @@ -221,14 +222,23 @@ /* copy all children and render them */ for (xml_in_tmp = xml_in->child; xml_in_tmp; xml_in_tmp = xml_in_tmp->ordered) { if (xml_odbc_render_tag(xml_in_tmp, params, xml_out, off) != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; + goto done; } } } + status = SWITCH_STATUS_SUCCESS; + done: - return SWITCH_STATUS_SUCCESS; +/* 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); + return status; } @@ -253,9 +263,14 @@ next_template_name = "not_found"; rewind: -/* have a look at this again, not too happy about this next_template_name thing.. */ + /* remove next_template_name header from event so xml_odbc_render_template won't go into an infinite loop */ switch_event_del_header(params, "next_template_name"); + + /* reset xml_out */ xml_out->name = ""; +// switch_xml_free(xml_out); // THIS DOESN'T WORK EITHER +// xml_out = switch_xml_new(""); + xml_odbc_render_template(next_template_name, params, xml_out, off); done:

1 0

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

28 Jun '09

Author: ledr Date: Sun Jun 28 14:19:08 2009 New Revision: 14023 Log: cleaned up a bit, added comments, moved odbc-dsn to settings tag instead of per binding - perhaps re-add this later when memory leaks are fixed 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 Sun Jun 28 14:19:08 2009 @@ -35,10 +35,10 @@ #include <switch.h> typedef enum { - XML_ODBC_CONFIG = 0, + XML_ODBC_CONFIGURATION = 0, XML_ODBC_DIRECTORY = 0, XML_ODBC_DIALPLAN = 0, - XML_ODBC_PHRASE = 0 + XML_ODBC_PHRASES = 0 } xml_odbc_query_type_t; SWITCH_MODULE_LOAD_FUNCTION(mod_xml_odbc_load); @@ -52,16 +52,12 @@ #define XML_ODBC_SYNTAX "[debug_on|debug_off|render_template]" -static int logi = 0; -static void logger(char *str) -{ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG[%i] [%s]\n", ++logi, str); -} - static struct { - char *dbname; char *odbc_dsn; - char *template; + char *configuration_template_name; + char *directory_template_name; + char *dialplan_template_name; + char *phrases_template_name; switch_xml_t templates_tag; switch_mutex_t *mutex; switch_memory_pool_t *pool; @@ -150,6 +146,7 @@ xml_odbc_query_helper_t query_helper; + /* special case xml-odbc-do - this tag is not copied, but action is done */ if (!strcasecmp(xml_in->name, "xml-odbc-do")) { char *name = NULL; char *value = NULL, *new_value = NULL; @@ -200,6 +197,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring unknown xml-odbc-do name=[%s]\n", name); } + switch_safe_free(new_value); + + /* just copy current tag xml_in to xml_out and recurse for all children */ } else { /* set name if current root node */ @@ -273,22 +273,22 @@ //switch_xml_set_attr_d(xml_out, "type", "freeswitch/xml"); } - xml_odbc_query_type_t query_type; - + char *template_name; int off = 0, ret = 1; if (!binding) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No bindings... sorry bud returning now\n"); return NULL; } + if (!strcmp(section, "configuration")) { - query_type = XML_ODBC_CONFIG; + template_name = strdup(globals.configuration_template_name); } else if (!strcmp(section, "directory")) { - query_type = XML_ODBC_DIRECTORY; + template_name = strdup(globals.directory_template_name); } else if (!strcmp(section, "dialplan")) { - query_type = XML_ODBC_DIALPLAN; + template_name = strdup(globals.dialplan_template_name); } else if (!strcmp(section, "phrases")) { - query_type = XML_ODBC_PHRASE; + template_name = strdup(globals.phrases_template_name); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid section\n"); return NULL; @@ -301,7 +301,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG in xml_odbc_search, header [%s]=[%s]\n", hi->name, hi->value); } } - xml_odbc_render_template(globals.template, params, xml_out, &off); // TODO globals.template should be replace with something specific for this section + xml_odbc_render_template(template_name, params, xml_out, &off); } } else { goto cleanup; @@ -327,22 +327,25 @@ static switch_status_t do_config() { char *cf = "xml_odbc.conf"; - switch_xml_t cfg, xml, bindings_tag, binding_tag, templates_tag, param; + switch_xml_t cfg, xml, settings_tag, bindings_tag, binding_tag, templates_tag, param; xml_binding_t *binding = NULL; - switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_status_t status = SWITCH_STATUS_FALSE; char *odbc_user = NULL; char *odbc_pass = NULL; - char *sql = NULL; - -logger("X"); + int binding_count = 0; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); return SWITCH_STATUS_TERM; } + if (!(settings_tag = switch_xml_child(cfg, "settings"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing <settings> tag!\n"); + goto done; + } + if (!(bindings_tag = switch_xml_child(cfg, "bindings"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing <bindings> tag!\n"); goto done; @@ -353,8 +356,36 @@ goto done; } +// is this allowed ? or should I copy the entire tree ? globals.templates_tag = templates_tag; + /* get all the settings */ + for (param = switch_xml_child(settings_tag, "param"); param; param = param->next) { + char *var = NULL; + char *val = NULL; + + var = (char *) switch_xml_attr_soft(param, "name"); + val = (char *) switch_xml_attr_soft(param, "value"); + + /* set globals.odbc_dsn */ + if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { + globals.odbc_dsn = switch_core_strdup(globals.pool, val); + if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { + *odbc_user++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } + } + } + } + + /* check if odbc_dsn is set */ + if (!globals.odbc_dsn) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No odbc-dsn setting is set!\n"); + goto done; + } + + /* get all bindings */ for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag; binding_tag = binding_tag->next) { char *bname = (char*) switch_xml_attr_soft(binding_tag, "name"); @@ -365,22 +396,23 @@ var = (char *) switch_xml_attr_soft(param, "name"); val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { - globals.odbc_dsn = switch_core_strdup(globals.pool, val); - if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { - *odbc_user++ = '\0'; - if ((odbc_pass = strchr(odbc_user, ':'))) { - *odbc_pass++ = '\0'; - } + if (!strcasecmp(var, "template") && !switch_strlen_zero(val)) { + if (!strcmp(bname, "configuration")) { + globals.configuration_template_name = strdup(val); + } else if (!strcmp(bname, "directory")) { + globals.directory_template_name = strdup(val); + } else if (!strcmp(bname, "dialplan")) { + globals.dialplan_template_name = strdup(val); + } else if (!strcmp(bname, "phrases")) { + globals.phrases_template_name = strdup(val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid binding name [%s]\n", bname); + goto done; } - } else if (!strcasecmp(var, "template") && !switch_strlen_zero(val)) { - globals.template = strdup(val); } } - if (switch_strlen_zero(globals.odbc_dsn) || switch_strlen_zero(odbc_user) || switch_strlen_zero(odbc_pass)) { - globals.dbname = "xml_odbc"; - } + binding_count++; if (!(binding = malloc(sizeof(*binding)))) { goto done; @@ -390,11 +422,19 @@ binding->bindings = strdup(bname); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML ODBC Fetch Function [%s]\n", - switch_strlen_zero(bname) ? "N/A" : bname, binding->bindings ? binding->bindings : "all"); + switch_strlen_zero(bname) ? "N/A" : bname, binding->bindings); + switch_xml_bind_search_function(xml_odbc_search, switch_xml_parse_section_string(bname), binding); + binding = NULL; } + /* check if a binding is set */ + if (binding_count == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No binding is set, is this really what you want?\n"); + } + + /* make odbc connection */ if (switch_odbc_available() && globals.odbc_dsn) { if (!(globals.master_odbc = switch_odbc_handle_new(globals.odbc_dsn, odbc_user, odbc_pass))) { @@ -412,10 +452,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.odbc_dsn); } - done: - - switch_safe_free(sql); + /* all went fine */ + status = SWITCH_STATUS_SUCCESS; + done: return status; } @@ -438,16 +478,16 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_API(xml_odbc_api_interface, "xml_odbc", "XML ODBC", xml_odbc_function, XML_ODBC_SYNTAX); - switch_console_set_complete("add xml_odbc debug_on"); - switch_console_set_complete("add xml_odbc debug_off"); - switch_console_set_complete("add xml_odbc render_template"); - if (do_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load xml_odbc config file\n"); return SWITCH_STATUS_FALSE; } + SWITCH_ADD_API(xml_odbc_api_interface, "xml_odbc", "XML ODBC", xml_odbc_function, XML_ODBC_SYNTAX); + switch_console_set_complete("add xml_odbc debug_on"); + switch_console_set_complete("add xml_odbc debug_off"); + switch_console_set_complete("add xml_odbc render_template"); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -455,6 +495,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_odbc_shutdown) { + switch_odbc_handle_disconnect(globals.master_odbc); + switch_odbc_handle_destroy(&globals.master_odbc); + return SWITCH_STATUS_SUCCESS; } 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 Sun Jun 28 14:19:08 2009 @@ -1,25 +1,25 @@ <configuration name="xml_odbc.conf" description="XML ODBC Configuration"> + <settings> + <param name="odbc-dsn" value="freeswitch:freeswitch:secret"/> + </settings> + <bindings>  <binding name="directory"> - <param name="odbc-dsn" value="freeswitch:freeswitch:secret"/>  <param name="template" value="directory"/> </binding>

1 0

[commit] r14022 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: . include
by FreeSWITCH SVN 28 Jun '09

28 Jun '09

Author: raulfragoso Date: Sun Jun 28 00:38:45 2009 New Revision: 14022 Log: Reverted back to call CM_CONNECT; Add (empty for now) channel_on_destroy callback; Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h Sun Jun 28 00:38:45 2009 @@ -123,6 +123,7 @@ static switch_status_t channel_on_exchange_media( switch_core_session_t *session); static switch_status_t channel_on_soft_execute(switch_core_session_t *session); +static switch_status_t channel_on_destroy(switch_core_session_t *session); switch_state_handler_table_t khomp_state_handlers = { /*.on_init */ channel_on_init, @@ -130,7 +131,13 @@ /*.on_execute */ channel_on_execute, /*.on_hangup */ channel_on_hangup, /*.on_exchange_media */ channel_on_exchange_media, - /*.on_soft_execute */ channel_on_soft_execute + /*.on_soft_execute */ channel_on_soft_execute, + /*.on_consume_media */ NULL, + /*.on_hibernate */ NULL, + /*.on_reset */ NULL, + /*.on_park*/ NULL, + /*.on_reporting*/ NULL, + /*.on_destroy*/ channel_on_destroy }; /* Callbacks for FreeSWITCH */ 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 Sun Jun 28 00:38:45 2009 @@ -205,6 +205,13 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t channel_on_destroy(switch_core_session_t *session) +{ + /* Doesn't do anything for now */ + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL KILL, kill = %d\n", sig); @@ -952,6 +959,9 @@ static int32 Kstdcall khomp_event_callback(int32 obj, K3L_EVENT * e) { /* TODO: How do we make sure channels inside FreeSWITCH only change to valid states on K3L? */ + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Khomp Event: on %u/%u: %x\n", e->DeviceId, obj, e->Code); + switch(e->Code) { case EV_NEW_CALL: @@ -963,7 +973,8 @@ } try { - Globals::_k3lapi.command(e->DeviceId, obj, CM_RINGBACK, NULL); + Globals::_k3lapi.command(e->DeviceId, obj, CM_RINGBACK, NULL); + Globals::_k3lapi.command(e->DeviceId, obj, CM_CONNECT, NULL); } catch (K3LAPI::failed_command & err) {

1 0

[commit] r14021 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: include src
by FreeSWITCH SVN 28 Jun '09

28 Jun '09

Author: jmesquita Date: Sun Jun 28 00:29:29 2009 New Revision: 14021 Log: More elegant channel/board lookup and some documentation. Thanks Raul... Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.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 Sun Jun 28 00:29:29 2009 @@ -47,6 +47,13 @@ } + /*! + \brief Lookup channels and boards when dialed. + \param allocation_string The dialstring as put on Dialplan. [Khomp/[a|A|0-board_high]/[a|A|0-channel_high]/dest]. + \param new_session Session allocated for this call. + \param[out] Cause returned. Returns NULL if suceeded if not, the proper cause. + \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) Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Sun Jun 28 00:29:29 2009 @@ -40,6 +40,7 @@ if(*argv[0] == 'a') { reverse_first_board_available = true; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing reverse board lookup!\n"); } } else @@ -55,6 +56,7 @@ if(*argv[1] == 'a') { reverse_first_channel_available = true; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing reverse channel lookup!\n"); } } else @@ -75,202 +77,65 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel selection: board (%d-%d), channel (%d-%d)!\n", board_low, board_high, channel_low, channel_high); - // TODO: Stop this nonsense of having duplicate code? - if(reverse_first_board_available) + int board = board_low; + for ((reverse_first_board_available == false ? board = board_low : board = board_high-1); + (reverse_first_board_available == false ? board <= board_high : board >= board_low); + (reverse_first_board_available == false ? board++ : board--)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing reverse board lookup.\n"); - for (int board = board_high-1 ; board >= board_low; board--) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking board %d\n", board); + + if(pvt != NULL) + break; + + if(first_channel_available) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking board %d\n", board); - - if(pvt != NULL) - break; - - if(first_channel_available) - { - channel_low = 0; - channel_high = Globals::_k3lapi.channel_count(board); - } - else - { - if(channel_low < 0 || channel_high > Globals::_k3lapi.channel_count(board)) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid channel selection (%d-%d) !\n", channel_low, channel_high); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - } - if (reverse_first_channel_available) + channel_low = 0; + channel_high = Globals::_k3lapi.channel_count(board); + } + else + { + if(channel_low < 0 || channel_high > Globals::_k3lapi.channel_count(board)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing a reverse free channel lookup\n", board_low, board_high, channel_low, channel_high); - for (int channel = channel_high-1 ; channel >= channel_low ; channel--) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); - try - { - K3L_CHANNEL_CONFIG channelConfig; - channelConfig = Globals::_k3lapi.channel_config( board, channel ); - } - catch (...) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - K3L_CHANNEL_STATUS status; - if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - if(status.CallStatus == kcsFree) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); - pvt = KhompPvt::khompPvt(board, channel); - if(pvt != NULL && pvt->session() == NULL) - { - pvt->session(new_session); - break; - } - pvt = NULL; - } - } - } - else - { - for (int channel = channel_low ; channel <= channel_high ; channel++) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); - try - { - K3L_CHANNEL_CONFIG channelConfig; - channelConfig = Globals::_k3lapi.channel_config( board, channel ); - } - catch (...) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - K3L_CHANNEL_STATUS status; - if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - if(status.CallStatus == kcsFree) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); - pvt = KhompPvt::khompPvt(board, channel); - if(pvt != NULL && pvt->session() == NULL) - { - pvt->session(new_session); - break; - } - pvt = NULL; - } - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid channel selection (%d-%d) !\n", channel_low, channel_high); + switch_mutex_unlock(_pvts_mutex); + return NULL; } } - } - else - { - - for (int board = board_low ; board <= board_high; board++) + + int channel = channel_low; + for ((reverse_first_channel_available == true ? channel = channel_high-1 : channel = channel_low); + (reverse_first_channel_available == true ? channel >= channel_low : channel <= channel_high); + (reverse_first_channel_available == true ? channel-- : channel++)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking board %d\n", board); - - if(pvt != NULL) - break; - - if(first_channel_available) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); + try { - channel_low = 0; - channel_high = Globals::_k3lapi.channel_count(board); + K3L_CHANNEL_CONFIG channelConfig; + channelConfig = Globals::_k3lapi.channel_config( board, channel ); } - else + catch (...) { - if(channel_low < 0 || channel_high > Globals::_k3lapi.channel_count(board)) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid channel selection (%d-%d) !\n", channel_low, channel_high); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; } - if (reverse_first_channel_available) + K3L_CHANNEL_STATUS status; + if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing a reverse free channel lookup\n", board_low, board_high, channel_low, channel_high); - for (int channel = channel_high-1 ; channel >= channel_low ; channel--) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); - try - { - K3L_CHANNEL_CONFIG channelConfig; - channelConfig = Globals::_k3lapi.channel_config( board, channel ); - } - catch (...) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - K3L_CHANNEL_STATUS status; - if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - if(status.CallStatus == kcsFree) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); - pvt = KhompPvt::khompPvt(board, channel); - if(pvt != NULL && pvt->session() == NULL) - { - pvt->session(new_session); - break; - } - pvt = NULL; - } - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; } - else - { - for (int channel = channel_low ; channel <= channel_high ; channel++) + if(status.CallStatus == kcsFree) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); + pvt = KhompPvt::khompPvt(board, channel); + if(pvt != NULL && pvt->session() == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); - try - { - K3L_CHANNEL_CONFIG channelConfig; - channelConfig = Globals::_k3lapi.channel_config( board, channel ); - } - catch (...) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - K3L_CHANNEL_STATUS status; - if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; - } - if(status.CallStatus == kcsFree) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); - pvt = KhompPvt::khompPvt(board, channel); - if(pvt != NULL && pvt->session() == NULL) - { - pvt->session(new_session); - break; - } - pvt = NULL; - } + pvt->session(new_session); + break; } + pvt = NULL; } } }

1 0

[commit] r14020 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: include src
by FreeSWITCH SVN 28 Jun '09

28 Jun '09

Author: jmesquita Date: Sat Jun 27 23:58:26 2009 New Revision: 14020 Log: Reverse board lookup and channel lookup using a. Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.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 Sat Jun 27 23:58:26 2009 @@ -46,6 +46,7 @@ return _pvts[target.device][target.object]; } + static KhompPvt * find_channel(char* allocation_string, switch_core_session_t * new_session, switch_call_cause_t * cause); static void initialize(void) Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Sat Jun 27 23:58:26 2009 @@ -5,7 +5,6 @@ KhompPvt * KhompPvt::find_channel(char* allocation_string, switch_core_session_t * new_session, switch_call_cause_t * cause) { - /* For now we support only the 'first-free' mode */ char *argv[3] = { 0 }; int argc = 0; @@ -17,6 +16,8 @@ int channel_high = 0; bool first_channel_available = true; + bool reverse_first_board_available = false; + bool reverse_first_channel_available = false; *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; @@ -35,6 +36,11 @@ { board_low = 0; board_high = Globals::_k3lapi.device_count(); + // Lets make it reverse... + if(*argv[0] == 'a') + { + reverse_first_board_available = true; + } } else { @@ -45,6 +51,11 @@ if(*argv[1] == 'A' || *argv[1] == 'a') { first_channel_available = true; + // Lets make it reverse... + if(*argv[1] == 'a') + { + reverse_first_channel_available = true; + } } else { @@ -64,60 +75,202 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel selection: board (%d-%d), channel (%d-%d)!\n", board_low, board_high, channel_low, channel_high); - for (int board = board_low ; board <= board_high; board++) + // TODO: Stop this nonsense of having duplicate code? + if(reverse_first_board_available) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking board %d\n", board); - - if(pvt != NULL) - break; - - if(first_channel_available) - { - channel_low = 0; - channel_high = Globals::_k3lapi.channel_count(board); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Just to check we are getting on the first_channel\n", board_low, board_high, channel_low, channel_high); - } - else + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing reverse board lookup.\n"); + for (int board = board_high-1 ; board >= board_low; board--) { - if(channel_low < 0 || channel_high > Globals::_k3lapi.channel_count(board)) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking board %d\n", board); + + if(pvt != NULL) + break; + + if(first_channel_available) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid channel selection (%d-%d) !\n", channel_low, channel_high); - switch_mutex_unlock(_pvts_mutex); - return NULL; + channel_low = 0; + channel_high = Globals::_k3lapi.channel_count(board); + } + else + { + if(channel_low < 0 || channel_high > Globals::_k3lapi.channel_count(board)) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid channel selection (%d-%d) !\n", channel_low, channel_high); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + } + if (reverse_first_channel_available) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing a reverse free channel lookup\n", board_low, board_high, channel_low, channel_high); + for (int channel = channel_high-1 ; channel >= channel_low ; channel--) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); + try + { + K3L_CHANNEL_CONFIG channelConfig; + channelConfig = Globals::_k3lapi.channel_config( board, channel ); + } + catch (...) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + K3L_CHANNEL_STATUS status; + if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + if(status.CallStatus == kcsFree) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); + pvt = KhompPvt::khompPvt(board, channel); + if(pvt != NULL && pvt->session() == NULL) + { + pvt->session(new_session); + break; + } + pvt = NULL; + } + } + } + else + { + for (int channel = channel_low ; channel <= channel_high ; channel++) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); + try + { + K3L_CHANNEL_CONFIG channelConfig; + channelConfig = Globals::_k3lapi.channel_config( board, channel ); + } + catch (...) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + K3L_CHANNEL_STATUS status; + if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + if(status.CallStatus == kcsFree) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); + pvt = KhompPvt::khompPvt(board, channel); + if(pvt != NULL && pvt->session() == NULL) + { + pvt->session(new_session); + break; + } + pvt = NULL; + } + } } } + } + else + { - for (int channel = channel_low ; channel <= channel_high ; channel++) + for (int board = board_low ; board <= board_high; board++) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); - try + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking board %d\n", board); + + if(pvt != NULL) + break; + + if(first_channel_available) { - K3L_CHANNEL_CONFIG channelConfig; - channelConfig = Globals::_k3lapi.channel_config( board, channel ); + channel_low = 0; + channel_high = Globals::_k3lapi.channel_count(board); } - catch (...) + else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; + if(channel_low < 0 || channel_high > Globals::_k3lapi.channel_count(board)) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid channel selection (%d-%d) !\n", channel_low, channel_high); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } } - K3L_CHANNEL_STATUS status; - if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) + if (reverse_first_channel_available) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); - switch_mutex_unlock(_pvts_mutex); - return NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Doing a reverse free channel lookup\n", board_low, board_high, channel_low, channel_high); + for (int channel = channel_high-1 ; channel >= channel_low ; channel--) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); + try + { + K3L_CHANNEL_CONFIG channelConfig; + channelConfig = Globals::_k3lapi.channel_config( board, channel ); + } + catch (...) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + K3L_CHANNEL_STATUS status; + if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + if(status.CallStatus == kcsFree) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); + pvt = KhompPvt::khompPvt(board, channel); + if(pvt != NULL && pvt->session() == NULL) + { + pvt->session(new_session); + break; + } + pvt = NULL; + } + } } - if(status.CallStatus == kcsFree) - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); - pvt = KhompPvt::khompPvt(board, channel); - if(pvt != NULL && pvt->session() == NULL) + else + { + for (int channel = channel_low ; channel <= channel_high ; channel++) { - pvt->session(new_session); - break; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking if (%d-%d) is free\n", board, channel); + try + { + K3L_CHANNEL_CONFIG channelConfig; + channelConfig = Globals::_k3lapi.channel_config( board, channel ); + } + catch (...) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception while retrieving channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + K3L_CHANNEL_STATUS status; + if (k3lGetDeviceStatus( board, channel + ksoChannel, &status, sizeof(status) ) != ksSuccess) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "k3lGetDeviceStatus failed to retrieve channel config for board %d, channel%d!\n", board, channel); + switch_mutex_unlock(_pvts_mutex); + return NULL; + } + if(status.CallStatus == kcsFree) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel (%d-%d) is free, let's check if the session is available ...\n", board, channel); + pvt = KhompPvt::khompPvt(board, channel); + if(pvt != NULL && pvt->session() == NULL) + { + pvt->session(new_session); + break; + } + pvt = NULL; + } } - pvt = NULL; } } }

1 0