<!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][16570] </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=16570">16570</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-02-04 13:48:41 -0600 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/XML-21">XML-21</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_cdrmod_xml_cdrc">freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodxml_intmod_xml_cdrmod_xml_cdrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (16569 => 16570)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c 2010-02-04 15:57:23 UTC (rev 16569)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c 2010-02-04 19:48:41 UTC (rev 16570)
</span><span class="lines">@@ -35,6 +35,11 @@
</span><span class="cx"> #include <curl/curl.h>
</span><span class="cx"> #define MAX_URLS 20
</span><span class="cx">
</span><ins>+#define ENCODING_NONE 0
+#define ENCODING_DEFAULT 1
+#define ENCODING_BASE64 2
+#define ENCODING_TEXTXML 2
+
</ins><span class="cx"> static struct {
</span><span class="cx"> char *cred;
</span><span class="cx"> char *urls[MAX_URLS+1];
</span><span class="lines">@@ -255,15 +260,18 @@
</span><span class="cx">
</span><span class="cx"> /* try to post it to the web server */
</span><span class="cx"> if (globals.url_count) {
</span><ins>+ char* destUrl = NULL;
</ins><span class="cx"> curl_handle = curl_easy_init();
</span><span class="cx">
</span><del>- if (globals.encode) {
</del><ins>+ if (globals.encode == ENCODING_TEXTXML) {
+ headers = curl_slist_append(headers, "Content-Type: text/xml");
+ } else if (globals.encode) {
</ins><span class="cx"> switch_size_t need_bytes = strlen(xml_text) * 3;
</span><span class="cx">
</span><span class="cx"> xml_text_escaped = malloc(need_bytes);
</span><span class="cx"> switch_assert(xml_text_escaped);
</span><span class="cx"> memset(xml_text_escaped, 0, need_bytes);
</span><del>- if (globals.encode == 1) {
</del><ins>+ if (globals.encode == ENCODING_DEFAULT) {
</ins><span class="cx"> headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded");
</span><span class="cx"> switch_url_encode(xml_text, xml_text_escaped, need_bytes);
</span><span class="cx"> } else {
</span><span class="lines">@@ -276,7 +284,9 @@
</span><span class="cx"> headers = curl_slist_append(headers, "Content-Type: application/x-www-form-plaintext");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text))) {
</del><ins>+ if (globals.encode == ENCODING_TEXTXML) {
+ curl_xml_text = xml_text;
+ } else if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text))) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="lines">@@ -331,9 +341,10 @@
</span><span class="cx"> switch_yield(globals.delay * 1000000);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- curl_easy_setopt(curl_handle, CURLOPT_URL, globals.urls[globals.url_index]);
</del><ins>+ destUrl = switch_mprintf("%s?uuid=%s", globals.urls[globals.url_index], switch_core_session_get_uuid(session));
+ curl_easy_setopt(curl_handle, CURLOPT_URL, destUrl);
</ins><span class="cx">
</span><del>- if (!strncasecmp(globals.urls[globals.url_index], "https", 5)) {
</del><ins>+ if (!strncasecmp(destUrl, "https", 5)) {
</ins><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
</span><span class="cx"> curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0);
</span><span class="cx"> }
</span><span class="lines">@@ -348,6 +359,7 @@
</span><span class="cx">
</span><span class="cx"> curl_easy_perform(curl_handle);
</span><span class="cx"> curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes);
</span><ins>+ switch_safe_free(destUrl);
</ins><span class="cx"> if (httpRes == 200) {
</span><span class="cx"> goto success;
</span><span class="cx"> } else {
</span><span class="lines">@@ -409,7 +421,9 @@
</span><span class="cx"> if (slist) {
</span><span class="cx"> curl_slist_free_all(slist);
</span><span class="cx"> }
</span><del>- switch_safe_free(curl_xml_text);
</del><ins>+ if (curl_xml_text != xml_text) {
+ switch_safe_free(curl_xml_text);
+ }
</ins><span class="cx"> switch_safe_free(xml_text);
</span><span class="cx"> switch_safe_free(path);
</span><span class="cx"> switch_xml_free(cdr);
</span><span class="lines">@@ -495,9 +509,11 @@
</span><span class="cx"> globals.disable100continue = 1;
</span><span class="cx"> } else if (!strcasecmp(var, "encode") && !zstr(val)) {
</span><span class="cx"> if (!strcasecmp(val, "base64")) {
</span><del>- globals.encode = 2;
</del><ins>+ globals.encode = ENCODING_BASE64;
+ } else if (!strcasecmp(val, "textxml")) {
+ globals.encode = ENCODING_TEXTXML;
</ins><span class="cx"> } else {
</span><del>- globals.encode = switch_true(val) ? 1 : 0;
</del><ins>+ globals.encode = switch_true(val) ? ENCODING_DEFAULT : ENCODING_NONE;
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(var, "retries") && !zstr(val)) {
</span><span class="cx"> globals.retries = (uint32_t) atoi(val);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>