kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #195 in FS/freeswitch from ~ARTURZ/freeswitch:FS-7299-mod_xml_cdr-cookie-file to master 

* commit 'e26605703ff8be1055ffee799722ff488a855995':
  FS-7299: Implement cookie-file option for mod_xml_cdr.
This commit is contained in:
Mike Jerris 2015-02-20 11:52:51 -06:00
parent 1c3f3e2d39 e26605703f
commit cb9f4dad43
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/vanilla/autoload_configs/xml_cdr.conf.xml
View File

@ -66,6 +66,6 @@
<!-- <param name="ssl-version" value="TLSv1"/> -->
<!-- optional: enables cookies and stores them in the specified file. -->
<!-- <param name="cookie-file" value="/$${temp_dir}/cookie-mod_xml_curl.txt"/> -->
<!-- <param name="cookie-file" value="$${run_dir}/mod_xml_cdr-cookie.txt"/> -->
</settings>
</configuration>

8
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
View File

@ -70,6 +70,7 @@ static struct {
int timeout;
switch_memory_pool_t *pool;
switch_event_node_t *node;
char *cookie_file;
} globals;
SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load);
@ -330,6 +331,11 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
switch_curl_easy_setopt(curl_handle, CURLOPT_CAINFO, globals.ssl_cacert_file);
}
if (globals.cookie_file) {
switch_curl_easy_setopt(curl_handle, CURLOPT_COOKIEJAR, globals.cookie_file);
switch_curl_easy_setopt(curl_handle, CURLOPT_COOKIEFILE, globals.cookie_file);
}
switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, globals.timeout);
/* these were used for testing, optionally they may be enabled if someone desires
@ -582,6 +588,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)
} else if (!strcasecmp(val, "any")) {
globals.auth_scheme = (long)CURLAUTH_ANY;
}
} else if (!strcasecmp(var, "cookie-file")) {
globals.cookie_file = switch_core_strdup(globals.pool, val);
}
}