<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17099] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17099">17099</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-25 09:19:52 -0500 (Thu, 25 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>revert <a href="http://jira.freeswitch.org/browse/XML-22">XML-22</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_curlmod_xml_curlc">freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodxml_intmod_xml_curlmod_xml_curlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (17098 => 17099)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c 2010-03-25 13:48:26 UTC (rev 17098)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c 2010-03-25 14:19:52 UTC (rev 17099)
</span><span class="lines">@@ -57,10 +57,6 @@
</span><span class="cx"> int use_dynamic_url;
</span><span class="cx"> int auth_scheme;
</span><span class="cx"> int timeout;
</span><del>- int timeout_ms;
- int weight;
- struct xml_binding* next;
- int chosen;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static int keep_files_around = 0;
</span><span class="lines">@@ -136,6 +132,9 @@
</span><span class="cx"> return x;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+
+
</ins><span class="cx"> static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params,
</span><span class="cx"> void *user_data)
</span><span class="cx"> {
</span><span class="lines">@@ -241,15 +240,6 @@
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (binding->timeout_ms) {
-#ifdef CURLOPT_TIMEOUT_MS
- curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT_MS, binding->timeout_ms);
-#else
- curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, (binding->timeout_ms / 1000) ? (binding->timeout_ms / 1000) : 1);
-#endif
- curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1);
- }
-
</del><span class="cx"> if (binding->disable100continue) {
</span><span class="cx"> slist = curl_slist_append(slist, "Expect:");
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist);
</span><span class="lines">@@ -334,129 +324,12 @@
</span><span class="cx"> return xml;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_xml_t xml_curl_fetch(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params,
- void *user_data)
-{
- xml_binding_t *root = (xml_binding_t*) user_data;
- xml_binding_t *binding = root;
- int running_weight = 0, total_weight = 0, rand_weight = 0, count = 0, pos = 0;
- xml_binding_t *bindings_copy = NULL;
- xml_binding_t *tmp = NULL;
- xml_binding_t **first_order = NULL;
- xml_binding_t **second_order = NULL;
- switch_xml_t result = NULL;
- int i, b;
-
- /* Count how many elements we have */
- for( ; binding != NULL; binding = binding->next) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Found [%s]\n", binding->url);
- count++;
- }
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "XML_CURL Fetch on %d bindings\n", count);
-
- /* Make a local copy of the bindings */
- bindings_copy = malloc(count*sizeof(xml_binding_t));
- tmp = bindings_copy;
- binding = root;
- pos = 0;
- for( ; binding != NULL; binding = binding->next) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Copying [%s] to 0x%0X\n", root->url, (unsigned)(intptr_t)&bindings_copy[pos]);
- memcpy(&bindings_copy[pos], binding, sizeof(xml_binding_t));
- pos++;
- }
-
- /* And two ordering arrays */
- first_order = malloc(count*sizeof(xml_binding_t*));
- memset(first_order, 0, count*sizeof(xml_binding_t*));
- second_order = malloc(count*sizeof(xml_binding_t*));
- memset(second_order, 0, count*sizeof(xml_binding_t*));
-
- /* Update root to point to local copy of binding data */
- root = bindings_copy;
-
- /* Put all weight=0 at beginning of first ordering array */
- binding = root; pos = 0;
- for(i = 0; i < count; i++) {
- binding = &bindings_copy[i];
- if(binding->weight == 0) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Copying [%s] to first_order[%d]\n", binding->url, pos);
- first_order[pos] = binding;
- pos++;
- }
- }
-
- /* Then dump everything else into the first ordering array */
- binding = root;
- for(i = 0; i < count; i++) {
- binding = &bindings_copy[i];
- if(binding->weight != 0) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Copying [%s] to first_order[%d]\n", binding->url, pos);
- first_order[pos] = binding;
- pos++;
- }
- }
-
- srand((unsigned)((unsigned)(intptr_t)switch_thread_self() + switch_micro_time_now()));
-
- /* We need to pick every element in the array, so loop once for every one of them */
- pos = 0;
- for(i = 0; i < count; i++) {
- /* Calculate the total remaining unchosen weight */
- total_weight = 0; running_weight = 0;
- for(b = 0; b < count; b++) {
- binding = &bindings_copy[b];
- if(!binding->chosen) total_weight += binding->weight;
- }
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Remaining total weight [%d]\n", total_weight);
-
- /* Pick a random number between [0, total_weight]
- * Note: Don't use rand() % M as it is not as random as this more complex
- * method which achieves the same intent with more random results */
- rand_weight = (int)( ((double)rand()) / (((double)(RAND_MAX) + (double)(1)) / ((double)total_weight + (double)(1))) );
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Random weight [%d]\n", rand_weight);
-
- /* Then grab the first unchosen element whose running_weight >= rand_weight
- and move it into our 'picked' list */
- binding = root;
- for(b = 0; b < count; b++) {
- binding = &bindings_copy[b];
- if(binding->chosen) continue; /* skip already picked elements */
-
- running_weight += binding->weight;
- if(running_weight >= rand_weight) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Chose binding %d as [%s] with weight [%d] based on running weight [%d]\n", pos, binding->url, binding->weight, running_weight);
- second_order[pos] = binding;
- pos++;
- binding->chosen = 1;
- break;
- }
- }
- }
-
- /* Then call our XML url fetch function for each binding based on our
- * chosen order until we get a valid result or run out of bindings */
- pos = 0;
- for( ; pos < count && result == NULL; pos++) {
- binding = second_order[pos];
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "Querying binding [%s]\n", binding->url);
- result = xml_url_fetch(section, tag_name, key_name, key_value, params, (void*)binding);
- }
-
- free(first_order);
- free(second_order);
- free(bindings_copy);
- return result;
-}
-
-
</del><span class="cx"> #define ENABLE_PARAM_VALUE "enabled"
</span><span class="cx"> static switch_status_t do_config(void)
</span><span class="cx"> {
</span><span class="cx"> char *cf = "xml_curl.conf";
</span><span class="cx"> switch_xml_t cfg, xml, bindings_tag, binding_tag, param;
</span><span class="cx"> xml_binding_t *binding = NULL;
</span><del>- xml_binding_t *prev_binding = NULL;
- xml_binding_t *root = NULL;
</del><span class="cx"> int x = 0;
</span><span class="cx"> int need_vars_map = 0;
</span><span class="cx"> switch_hash_t *vars_map = NULL;
</span><span class="lines">@@ -471,16 +344,14 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* Only 32768 bindings allowed or weight sum could exceed signed int max
- * value breaking load balancing algorithm */
- for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag && x < 32768; binding_tag = binding_tag->next) {
</del><ins>+ for (binding_tag = switch_xml_child(bindings_tag, "binding"); binding_tag; binding_tag = binding_tag->next) {
</ins><span class="cx"> char *bname = (char *) switch_xml_attr_soft(binding_tag, "name");
</span><span class="cx"> char *url = NULL;
</span><span class="cx"> char *bind_cred = NULL;
</span><span class="cx"> char *bind_mask = NULL;
</span><span class="cx"> char *method = NULL;
</span><span class="cx"> int disable100continue = 0;
</span><del>- int use_dynamic_url = 0, timeout = 0, timeout_ms = 0, weight = 0;
</del><ins>+ int use_dynamic_url = 0, timeout = 0;
</ins><span class="cx"> uint32_t enable_cacert_check = 0;
</span><span class="cx"> char *ssl_cert_file = NULL;
</span><span class="cx"> char *ssl_key_file = NULL;
</span><span class="lines">@@ -527,17 +398,6 @@
</span><span class="cx"> disable100continue = 1;
</span><span class="cx"> } else if (!strcasecmp(var, "method")) {
</span><span class="cx"> method = val;
</span><del>- } else if (!strcasecmp(var, "weight")) {
- int tmp = atoi(val);
- if (tmp >= 0) {
- if(tmp > 65535) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't set weight > 65535!\n");
- } else {
- weight = tmp;
- }
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't set a negative weight!\n");
- }
</del><span class="cx"> } else if (!strcasecmp(var, "timeout")) {
</span><span class="cx"> int tmp = atoi(val);
</span><span class="cx"> if (tmp >= 0) {
</span><span class="lines">@@ -545,13 +405,6 @@
</span><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't set a negative timeout!\n");
</span><span class="cx"> }
</span><del>- } else if (!strcasecmp(var, "timeout-ms")) {
- int tmp = atoi(val);
- if (tmp >= 0) {
- timeout_ms = tmp;
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't set a negative timeout!\n");
- }
</del><span class="cx"> } else if (!strcasecmp(var, "enable-cacert-check") && switch_true(val)) {
</span><span class="cx"> enable_cacert_check = 1;
</span><span class="cx"> } else if (!strcasecmp(var, "ssl-cert-path")) {
</span><span class="lines">@@ -602,9 +455,7 @@
</span><span class="cx"> memset(binding, 0, sizeof(*binding));
</span><span class="cx">
</span><span class="cx"> binding->auth_scheme = auth_scheme;
</span><del>- binding->weight = weight;
</del><span class="cx"> binding->timeout = timeout;
</span><del>- binding->timeout_ms = timeout_ms;
</del><span class="cx"> binding->url = strdup(url);
</span><span class="cx"> switch_assert(binding->url);
</span><span class="cx">
</span><span class="lines">@@ -671,24 +522,12 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(root == NULL) {
- root = binding;
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Root binding [%s] [%s] [%s]\n",
- zstr(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all");
- }
- if(prev_binding != NULL) {
- prev_binding->next = binding;
- }
- prev_binding = binding;
-
</del><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n",
</span><span class="cx"> zstr(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all");
</span><ins>+ switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->bindings), binding);
</ins><span class="cx"> x++;
</span><span class="cx"> binding = NULL;
</span><span class="cx"> }
</span><del>- if(root != NULL) {
- switch_xml_bind_search_function(xml_curl_fetch, switch_xml_parse_section_string(root->bindings), root);
- }
</del><span class="cx">
</span><span class="cx"> done:
</span><span class="cx"> switch_xml_free(xml);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>