From 82807998d54416e6ea4278d24d56bcfe5c5b3c3e Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 29 Nov 2011 14:32:11 -0600 Subject: [PATCH 01/11] FS-3718 --- src/mod/endpoints/mod_sofia/sofia.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index abc6f950a4..3804d69942 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -475,7 +475,7 @@ void sofia_handle_sip_i_notify(switch_core_session_t *session, int status, /* dispatch freeswitch event */ if (switch_event_create(&s_event, SWITCH_EVENT_NOTIFY_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "event", sip->sip_event->o_type); - switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "pl_data", sip->sip_payload->pl_data); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "pl_data", sip->sip_payload ? sip->sip_payload->pl_data : ""); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "sip_content_type", sip->sip_content_type->c_type); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", sofia_private->gateway->profile->sip_port); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "module_name", "mod_sofia"); From eef4bb03d35566b8528625de10a489017ac0cf95 Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 29 Nov 2011 14:33:47 -0600 Subject: [PATCH 02/11] swigall --- src/mod/languages/mod_managed/managed/swig.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index 6bb40abc02..5cd7a466d2 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -1797,8 +1797,8 @@ public class freeswitch { return ret; } - public static SWIGTYPE_p_HashElem switch_hash_first(string depricate_me, SWIGTYPE_p_switch_hash hash) { - IntPtr cPtr = freeswitchPINVOKE.switch_hash_first(depricate_me, SWIGTYPE_p_switch_hash.getCPtr(hash)); + public static SWIGTYPE_p_HashElem switch_hash_first(string deprecate_me, SWIGTYPE_p_switch_hash hash) { + IntPtr cPtr = freeswitchPINVOKE.switch_hash_first(deprecate_me, SWIGTYPE_p_switch_hash.getCPtr(hash)); SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); return ret; } @@ -24680,6 +24680,7 @@ public enum switch_core_session_message_types_t { SWITCH_MESSAGE_INDICATE_JITTER_BUFFER, SWITCH_MESSAGE_INDICATE_RECOVERY_REFRESH, SWITCH_MESSAGE_INDICATE_SIGNAL_DATA, + SWITCH_MESSAGE_INDICATE_INFO, SWITCH_MESSAGE_INVALID } From f41020a625ab2feac7a75e3a9a2df88ae7868777 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 29 Nov 2011 08:28:10 -0600 Subject: [PATCH 03/11] FS-3727 --resolve --- src/switch_ivr_bridge.c | 4 ++-- src/switch_ivr_originate.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c index c2ad565cdb..3c85c4b421 100644 --- a/src/switch_ivr_bridge.c +++ b/src/switch_ivr_bridge.c @@ -1180,8 +1180,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses const char *app, *data; if (switch_channel_get_state(peer_channel) == CS_CONSUME_MEDIA) { - switch_channel_set_state(peer_channel, CS_RESET); - switch_channel_wait_for_state(peer_channel, caller_channel, CS_RESET); + switch_channel_set_state(peer_channel, CS_HIBERNATE); + switch_channel_wait_for_state(peer_channel, caller_channel, CS_HIBERNATE); } if (!switch_channel_ready(caller_channel)) { diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c index aeb41e5e43..50c829f379 100644 --- a/src/switch_ivr_originate.c +++ b/src/switch_ivr_originate.c @@ -3511,8 +3511,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess switch_channel_t *bchan = switch_core_session_get_channel(*bleg); if (switch_channel_get_state(bchan) == CS_CONSUME_MEDIA) { - switch_channel_set_state(bchan, CS_RESET); - switch_channel_wait_for_state(bchan, caller_channel, CS_RESET); + switch_channel_set_state(bchan, CS_HIBERNATE); + switch_channel_wait_for_state(bchan, caller_channel, CS_HIBERNATE); } if (session && caller_channel) { From e58ed35d179067ba9d8a81cc4e176438f2f12f4f Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 29 Nov 2011 11:13:11 -0600 Subject: [PATCH 04/11] FS-2936 stage 1 --- src/mod/applications/mod_cidlookup/mod_cidlookup.c | 6 ++++-- src/mod/applications/mod_curl/mod_curl.c | 6 ++++-- src/mod/applications/mod_http_cache/mod_http_cache.c | 6 ++++-- src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c | 5 ++++- src/mod/languages/mod_spidermonkey/mod_spidermonkey.c | 1 + src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c | 1 + src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c | 1 + src/switch_core.c | 4 +++- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/mod/applications/mod_cidlookup/mod_cidlookup.c b/src/mod/applications/mod_cidlookup/mod_cidlookup.c index ba69f6fb6b..19364429ba 100755 --- a/src/mod/applications/mod_cidlookup/mod_cidlookup.c +++ b/src/mod/applications/mod_cidlookup/mod_cidlookup.c @@ -30,7 +30,7 @@ */ #include -#include +#include #define SWITCH_REWIND_STREAM(s) s.end = s.data @@ -839,6 +839,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_cidlookup_load) return SWITCH_STATUS_TERM; } + switch_curl_init(); + SWITCH_ADD_API(api_interface, "cidlookup", "cidlookup API", cidlookup_function, SYNTAX); SWITCH_ADD_APP(app_interface, "cidlookup", "Perform a CID lookup", "Perform a CID lookup", cidlookup_app_function, "[number [skipurl]]", SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC); @@ -852,7 +854,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_cidlookup_load) Macro expands to: switch_status_t mod_cidlookup_shutdown() */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown) { - + switch_curl_destroy(); switch_event_unbind(&reload_xml_event); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/applications/mod_curl/mod_curl.c b/src/mod/applications/mod_curl/mod_curl.c index adcfe453de..e8e5e6f400 100644 --- a/src/mod/applications/mod_curl/mod_curl.c +++ b/src/mod/applications/mod_curl/mod_curl.c @@ -30,7 +30,7 @@ */ #include -#include +#include #include /* Prototypes */ @@ -412,6 +412,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load) globals.pool = pool; + switch_curl_init(); + SWITCH_ADD_API(api_interface, "curl", "curl API", curl_function, SYNTAX); SWITCH_ADD_APP(app_interface, "curl", "Perform a http request", "Perform a http request", curl_app_function, SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC); @@ -426,7 +428,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_curl_shutdown) { /* Cleanup dynamically allocated config settings */ - + switch_curl_destroy(); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/applications/mod_http_cache/mod_http_cache.c b/src/mod/applications/mod_http_cache/mod_http_cache.c index 99bd9ca6e8..5ac7251023 100644 --- a/src/mod/applications/mod_http_cache/mod_http_cache.c +++ b/src/mod/applications/mod_http_cache/mod_http_cache.c @@ -30,7 +30,7 @@ * */ #include -#include +#include /* Defines module interface to FreeSWITCH */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_http_cache_shutdown); @@ -205,6 +205,7 @@ static switch_status_t http_put(switch_core_session_t *session, const char *url, } curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1); curl_easy_setopt(curl_handle, CURLOPT_PUT, 1); + curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl_handle, CURLOPT_URL, url); curl_easy_setopt(curl_handle, CURLOPT_READDATA, file_to_put); curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file_info.st_size); @@ -1011,7 +1012,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load) setup_dir(&gcache); /* init CURL */ - curl_global_init(CURL_GLOBAL_ALL); + switch_curl_init(); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; @@ -1022,6 +1023,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load) */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_http_cache_shutdown) { + switch_curl_destroy(); url_cache_clear(&gcache, NULL); switch_core_hash_destroy(&gcache.map); switch_mutex_destroy(gcache.mutex); diff --git a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c index 0600607e3a..9cdecfca1b 100644 --- a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c +++ b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c @@ -32,7 +32,7 @@ */ #include #include -#include +#include #include #define MAX_URLS 20 @@ -724,6 +724,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_json_text); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-json/1.0"); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); @@ -1040,6 +1041,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_json_cdr_load) globals.retries++; + switch_curl_init(); set_json_cdr_log_dirs(); switch_xml_free(xml); @@ -1052,6 +1054,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_json_cdr_shutdown) globals.shutdown = 1; + switch_curl_destroy(); switch_safe_free(globals.log_dir); for (;err_dir_index < globals.err_dir_count; err_dir_index++) { diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index a09cfdf02a..825273c1aa 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -2520,6 +2520,7 @@ static JSBool js_fetchurl_hash(JSContext * cx, JSObject * obj, uintN argc, jsval } curl_easy_setopt(curl_handle, CURLOPT_URL, url); curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, hash_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c index c2e64ee0aa..42402e1368 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c @@ -183,6 +183,7 @@ static JSBool curl_run(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, method, url_p, data, switch_str_nil(cred), co->function ? "yes" : "no"); curl_easy_setopt(co->curl_handle, CURLOPT_URL, url_p); + curl_easy_setopt(co->curl_handle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(co->curl_handle, CURLOPT_WRITEFUNCTION, file_callback); curl_easy_setopt(co->curl_handle, CURLOPT_WRITEDATA, (void *) co); diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c index 7cfd3592bb..59e8ec6427 100644 --- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c +++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c @@ -297,6 +297,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); diff --git a/src/switch_core.c b/src/switch_core.c index 8a97de13a9..0f3bc36455 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -1377,6 +1377,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc memset(&runtime, 0, sizeof(runtime)); gethostname(runtime.hostname, sizeof(runtime.hostname)); + switch_ssl_init_ssl_locks(); + runtime.max_db_handles = 50; runtime.db_handle_timeout = 5000000;; @@ -1512,7 +1514,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc switch_uuid_get(&uuid); switch_uuid_format(runtime.uuid_str, &uuid); - switch_ssl_init_ssl_locks(); + return SWITCH_STATUS_SUCCESS; } From 74ed2cef0194936f74ef02b1867dd57441ad5bd6 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 29 Nov 2011 14:35:16 -0500 Subject: [PATCH 05/11] step 1 of curl linked in core --- Makefile.am | 16 +++++++++++++++- configure.in | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 2780bd800e..2f9f9bf111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,9 +103,11 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include CORE_CFLAGS += -I$(switch_srcdir)/libs/spandsp/src -I$(switch_srcdir)/libs/tiff-3.8.2/libtiff +CORE_CFLAGS += $(LIBCURL_CPPFLAGS) CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la + if ENABLE_SRTP CORE_CFLAGS += -DENABLE_SRTP CORE_LIBS += libs/srtp/libsrtp.la @@ -128,12 +130,20 @@ if ENABLE_TIMERFD_WRAPPER CORE_CFLAGS += -DTIMERFD_WRAP endif +CORE_LDFLAGS= + +if CURL_BUILTIN +CORE_LIBS += libs/curl/lib/libcurl.la +else +CORE_LDFLAGS += $(LIBCURL) +endif + ## ## libfreeswitch ## lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) -libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) +libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) $(CORE_LDFLAGS) libfreeswitch_la_LIBADD = $(CORE_LIBS) $(PLATFORM_CORE_LIBS) libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES) @@ -430,6 +440,10 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree libs/libedit/src/.libs/libedit.a: cd libs/libedit && $(MAKE) +libs/curl/lib/libcurl.la: libs/curl + @cd libs/curl && $(MAKE) + @$(TOUCH_TARGET) + libs/apr/libapr-1.la: libs/apr libs/apr/.update @cd libs/apr && $(MAKE) @$(TOUCH_TARGET) diff --git a/configure.in b/configure.in index 81d91de5ad..ed6547c626 100644 --- a/configure.in +++ b/configure.in @@ -809,6 +809,8 @@ if test "$ac_cv_use_system_curl" != "yes" ; then LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include' fi +AM_CONDITIONAL([CURL_BUILTIN],[test "${ac_cv_use_system_curl}" != "yes"]) + AC_SUBST(LIBCURL_DEPS) From e794a6db2182c1f6ab9af5bae69a1d1e171f4791 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 29 Nov 2011 15:35:36 -0600 Subject: [PATCH 06/11] FS-2936 stage 2 please test ASAP --- src/include/switch.h | 1 + src/include/switch_curl.h | 41 ++++----- src/mod/applications/mod_cidlookup/Makefile | 1 - .../mod_cidlookup/mod_cidlookup.c | 47 +++++------ src/mod/applications/mod_curl/Makefile | 1 - src/mod/applications/mod_curl/mod_curl.c | 19 ++--- src/mod/applications/mod_http_cache/Makefile | 1 - .../mod_http_cache/mod_http_cache.c | 58 ++++++------- src/mod/applications/mod_memcache/Makefile | 2 - src/mod/event_handlers/mod_json_cdr/Makefile | 2 +- .../mod_json_cdr/mod_json_cdr.c | 76 ++++++++--------- src/mod/formats/mod_shout/Makefile | 2 - src/mod/formats/mod_shout/mod_shout.c | 37 ++++---- src/mod/xml_int/mod_xml_cdr/Makefile | 1 - src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c | 84 +++++++++---------- src/mod/xml_int/mod_xml_curl/Makefile | 1 - src/mod/xml_int/mod_xml_curl/mod_xml_curl.c | 82 +++++++++--------- src/switch_core.c | 5 +- 18 files changed, 212 insertions(+), 249 deletions(-) diff --git a/src/include/switch.h b/src/include/switch.h index de099f1b94..98a46890e6 100644 --- a/src/include/switch.h +++ b/src/include/switch.h @@ -109,6 +109,7 @@ #include "switch_platform.h" #include "switch_types.h" #include "switch_apr.h" +#include "switch_curl.h" #include "switch_mprintf.h" #include "switch_core_db.h" #include "switch_dso.h" diff --git a/src/include/switch_curl.h b/src/include/switch_curl.h index 4d44595e0d..17c4bd6ce1 100644 --- a/src/include/switch_curl.h +++ b/src/include/switch_curl.h @@ -30,34 +30,27 @@ #ifndef __SWITCH_CURL_H #define __SWITCH_CURL_H +#include "curl/curl.h" -#include -#include -static inline void switch_curl_init(void) -{ - int curl_count = switch_core_curl_count(NULL); +typedef void switch_CURL; +typedef struct curl_slist switch_curl_slist_t; +typedef int switch_CURLINFO; +typedef int switch_CURLcode; +typedef int switch_CURLoption; - if (curl_count == 0) { - curl_global_init(CURL_GLOBAL_ALL); - } - - curl_count++; - switch_core_curl_count(&curl_count); -} - -static inline void switch_curl_destroy() -{ - int curl_count = switch_core_curl_count(NULL); - - curl_count--; - - if (curl_count == 0) { - curl_global_cleanup(); - } - switch_core_curl_count(&curl_count); -} +SWITCH_DECLARE(switch_CURL *) switch_curl_easy_init(void); +SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_perform(switch_CURL *handle); +SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_getinfo(switch_CURL *curl, switch_CURLINFO info, ... ); +SWITCH_DECLARE(void) switch_curl_easy_cleanup(switch_CURL *handle); +SWITCH_DECLARE(switch_curl_slist_t *) switch_curl_slist_append(switch_curl_slist_t * list, const char * string ); +SWITCH_DECLARE(void) switch_curl_slist_free_all(switch_curl_slist_t * list); +SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt(CURL *handle, switch_CURLoption option, ...); +SWITCH_DECLARE(const char *) switch_curl_easy_strerror(switch_CURLcode errornum ); +SWITCH_DECLARE(void) switch_curl_init(void); +SWITCH_DECLARE(void) switch_curl_destroy(void); + #endif diff --git a/src/mod/applications/mod_cidlookup/Makefile b/src/mod/applications/mod_cidlookup/Makefile index 5ffe1d8476..24790d0d39 100644 --- a/src/mod/applications/mod_cidlookup/Makefile +++ b/src/mod/applications/mod_cidlookup/Makefile @@ -1,4 +1,3 @@ -WANT_CURL=yes BASE=../../../.. include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_cidlookup/mod_cidlookup.c b/src/mod/applications/mod_cidlookup/mod_cidlookup.c index 19364429ba..fc32e6fe21 100755 --- a/src/mod/applications/mod_cidlookup/mod_cidlookup.c +++ b/src/mod/applications/mod_cidlookup/mod_cidlookup.c @@ -360,7 +360,7 @@ static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) } static long do_lookup_url(switch_memory_pool_t *pool, switch_event_t *event, char **response, const char *query, struct curl_httppost *post, - struct curl_slist *headers, int timeout) + switch_curl_slist_t *headers, int timeout) { switch_time_t start_time = switch_micro_time_now(); switch_time_t time_diff = 0; @@ -375,49 +375,49 @@ static long do_lookup_url(switch_memory_pool_t *pool, switch_event_t *event, cha SWITCH_STANDARD_STREAM(http_data.stream); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG10, "url: %s\n", query); - curl_handle = curl_easy_init(); + curl_handle = switch_curl_easy_init(); - curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 0); - curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); if (!strncasecmp(query, "https", 5)) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } if (post) { - curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, post); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, post); } else { - curl_easy_setopt(curl_handle, CURLOPT_HTTPGET, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPGET, 1); } if (headers) { - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); } - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); + switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); /* TIMEOUT_MS is introduced in 7.16.2, we have 7.16.0 in tree */ #ifdef CURLOPT_TIMEOUT_MS if (timeout > 0) { - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT_MS, timeout); + switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT_MS, timeout); } else { - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT_MS, globals.curl_timeout); + switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT_MS, globals.curl_timeout); } #else if (timeout > 0) { - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, timeout); + switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, timeout); } else { - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, globals.curl_timeout / 1000); + switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, globals.curl_timeout / 1000); } #endif - curl_easy_setopt(curl_handle, CURLOPT_URL, query); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); - curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &http_data); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-cidlookup/1.0"); + switch_curl_easy_setopt(curl_handle, CURLOPT_URL, query); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &http_data); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-cidlookup/1.0"); - curl_easy_perform(curl_handle); - curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); - curl_easy_cleanup(curl_handle); + switch_curl_easy_perform(curl_handle); + switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + switch_curl_easy_cleanup(curl_handle); if (http_data.stream.data && !zstr((char *) http_data.stream.data) && strcmp(" ", http_data.stream.data)) { @@ -839,8 +839,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_cidlookup_load) return SWITCH_STATUS_TERM; } - switch_curl_init(); - SWITCH_ADD_API(api_interface, "cidlookup", "cidlookup API", cidlookup_function, SYNTAX); SWITCH_ADD_APP(app_interface, "cidlookup", "Perform a CID lookup", "Perform a CID lookup", cidlookup_app_function, "[number [skipurl]]", SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC); @@ -854,7 +852,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_cidlookup_load) Macro expands to: switch_status_t mod_cidlookup_shutdown() */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown) { - switch_curl_destroy(); switch_event_unbind(&reload_xml_event); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/applications/mod_curl/Makefile b/src/mod/applications/mod_curl/Makefile index b276633355..6cae5a8595 100644 --- a/src/mod/applications/mod_curl/Makefile +++ b/src/mod/applications/mod_curl/Makefile @@ -1,6 +1,5 @@ json-c=json-c-0.9 BASE=../../../.. -WANT_CURL=yes JSON_DIR=$(switch_srcdir)/libs/$(json-c) JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c) diff --git a/src/mod/applications/mod_curl/mod_curl.c b/src/mod/applications/mod_curl/mod_curl.c index e8e5e6f400..513e40fcd6 100644 --- a/src/mod/applications/mod_curl/mod_curl.c +++ b/src/mod/applications/mod_curl/mod_curl.c @@ -57,7 +57,7 @@ struct http_data_obj { int err; long http_response_code; char *http_response; - struct curl_slist *headers; + switch_curl_slist_t *headers; }; typedef struct http_data_obj http_data_t; @@ -94,7 +94,7 @@ static size_t header_callback(void *ptr, size_t size, size_t nmemb, void *data) switch_copy_string(header, ptr, realsize); header[realsize] = '\0'; - http_data->headers = curl_slist_append(http_data->headers, header); + http_data->headers = switch_curl_slist_append(http_data->headers, header); return realsize; } @@ -102,7 +102,7 @@ static size_t header_callback(void *ptr, size_t size, size_t nmemb, void *data) static http_data_t *do_lookup_url(switch_memory_pool_t *pool, const char *url, const char *method, const char *data) { - CURL *curl_handle = NULL; + switch_CURL *curl_handle = NULL; long httpRes = 0; http_data_t *http_data = NULL; @@ -165,7 +165,7 @@ static char *print_json(switch_memory_pool_t *pool, http_data_t *http_data) struct json_object *top = NULL; struct json_object *headers = NULL; char *data = NULL; - struct curl_slist *header = http_data->headers; + switch_curl_slist_t *header = http_data->headers; top = json_object_new_object(); headers = json_object_new_array(); @@ -240,7 +240,7 @@ SWITCH_STANDARD_APP(curl_app_function) switch_bool_t do_headers = SWITCH_FALSE; switch_bool_t do_json = SWITCH_FALSE; http_data_t *http_data = NULL; - struct curl_slist *slist = NULL; + switch_curl_slist_t *slist = NULL; switch_stream_handle_t stream = { 0 }; int i = 0; @@ -308,7 +308,7 @@ SWITCH_STANDARD_APP(curl_app_function) done: switch_safe_free(stream.data); if (http_data && http_data->headers) { - curl_slist_free_all(http_data->headers); + switch_curl_slist_free_all(http_data->headers); } if (!session && pool) { switch_core_destroy_memory_pool(&pool); @@ -326,7 +326,7 @@ SWITCH_STANDARD_API(curl_function) char *postdata = NULL; switch_bool_t do_headers = SWITCH_FALSE; switch_bool_t do_json = SWITCH_FALSE; - struct curl_slist *slist = NULL; + switch_curl_slist_t *slist = NULL; http_data_t *http_data = NULL; int i = 0; @@ -391,7 +391,7 @@ SWITCH_STANDARD_API(curl_function) done: if (http_data && http_data->headers) { - curl_slist_free_all(http_data->headers); + switch_curl_slist_free_all(http_data->headers); } switch_safe_free(mydata); if (!session && pool) { @@ -412,8 +412,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load) globals.pool = pool; - switch_curl_init(); - SWITCH_ADD_API(api_interface, "curl", "curl API", curl_function, SYNTAX); SWITCH_ADD_APP(app_interface, "curl", "Perform a http request", "Perform a http request", curl_app_function, SYNTAX, SAF_SUPPORT_NOMEDIA | SAF_ROUTING_EXEC); @@ -428,7 +426,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_curl_shutdown) { /* Cleanup dynamically allocated config settings */ - switch_curl_destroy(); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/applications/mod_http_cache/Makefile b/src/mod/applications/mod_http_cache/Makefile index 264f030dd4..c9dfa5399e 100644 --- a/src/mod/applications/mod_http_cache/Makefile +++ b/src/mod/applications/mod_http_cache/Makefile @@ -1,5 +1,4 @@ BASE=../../../.. -WANT_CURL=yes include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_http_cache/mod_http_cache.c b/src/mod/applications/mod_http_cache/mod_http_cache.c index 5ac7251023..b2004b5456 100644 --- a/src/mod/applications/mod_http_cache/mod_http_cache.c +++ b/src/mod/applications/mod_http_cache/mod_http_cache.c @@ -197,24 +197,24 @@ static switch_status_t http_put(switch_core_session_t *session, const char *url, goto done; } - curl_handle = curl_easy_init(); + curl_handle = switch_curl_easy_init(); if (!curl_handle) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "curl_easy_init() failure\n"); + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "switch_curl_easy_init() failure\n"); status = SWITCH_STATUS_FALSE; goto done; } - curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1); - curl_easy_setopt(curl_handle, CURLOPT_PUT, 1); - curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl_handle, CURLOPT_URL, url); - curl_easy_setopt(curl_handle, CURLOPT_READDATA, file_to_put); - curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file_info.st_size); - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-http-cache/1.0"); - curl_easy_perform(curl_handle); - curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); - curl_easy_cleanup(curl_handle); + switch_curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_PUT, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_URL, url); + switch_curl_easy_setopt(curl_handle, CURLOPT_READDATA, file_to_put); + switch_curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file_info.st_size); + switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-http-cache/1.0"); + switch_curl_easy_perform(curl_handle); + switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + switch_curl_easy_cleanup(curl_handle); if (httpRes == 200 || httpRes == 201 || httpRes == 204) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s saved to %s\n", filename, url); @@ -704,7 +704,7 @@ static void cached_url_destroy(cached_url_t *url, switch_memory_pool_t *pool) static switch_status_t http_get(cached_url_t *url, switch_core_session_t *session) { switch_status_t status = SWITCH_STATUS_SUCCESS; - CURL *curl_handle = NULL; + switch_CURL *curl_handle = NULL; http_get_data_t get_data = {0}; long httpRes = 0; int start_time_ms = switch_time_now() / 1000; @@ -713,20 +713,20 @@ static switch_status_t http_get(cached_url_t *url, switch_core_session_t *sessio get_data.fd = 0; get_data.url = url; - curl_handle = curl_easy_init(); + curl_handle = switch_curl_easy_init(); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "opening %s for URL cache\n", get_data.url->filename); if ((get_data.fd = open(get_data.url->filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); - curl_easy_setopt(curl_handle, CURLOPT_URL, get_data.url->url); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, get_file_callback); - curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &get_data); - curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, get_header_callback); - curl_easy_setopt(curl_handle, CURLOPT_WRITEHEADER, (void *) url); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-http-cache/1.0"); - curl_easy_perform(curl_handle); - curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); - curl_easy_cleanup(curl_handle); + switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); + switch_curl_easy_setopt(curl_handle, CURLOPT_URL, get_data.url->url); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, get_file_callback); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &get_data); + switch_curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, get_header_callback); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEHEADER, (void *) url); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-http-cache/1.0"); + switch_curl_easy_perform(curl_handle); + switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + switch_curl_easy_cleanup(curl_handle); close(get_data.fd); } else { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "open() error: %s\n", strerror(errno)); @@ -1011,9 +1011,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load) setup_dir(&gcache); - /* init CURL */ - switch_curl_init(); - /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -1023,7 +1020,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load) */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_http_cache_shutdown) { - switch_curl_destroy(); url_cache_clear(&gcache, NULL); switch_core_hash_destroy(&gcache.map); switch_mutex_destroy(gcache.mutex); diff --git a/src/mod/applications/mod_memcache/Makefile b/src/mod/applications/mod_memcache/Makefile index 80c1d2b936..0f469ff9e2 100644 --- a/src/mod/applications/mod_memcache/Makefile +++ b/src/mod/applications/mod_memcache/Makefile @@ -1,8 +1,6 @@ MEMCACHED=libmemcached-0.32 BASE=../../../.. -WANT_CURL=yes - MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED) MEMCACHED_BUILDDIR=$(switch_builddir)/libs/$(MEMCACHED) diff --git a/src/mod/event_handlers/mod_json_cdr/Makefile b/src/mod/event_handlers/mod_json_cdr/Makefile index d5043e017d..0620c7df63 100644 --- a/src/mod/event_handlers/mod_json_cdr/Makefile +++ b/src/mod/event_handlers/mod_json_cdr/Makefile @@ -1,6 +1,6 @@ json-c=json-c-0.9 BASE=../../../.. -WANT_CURL=yes + JSON_DIR=$(switch_srcdir)/libs/$(json-c) JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c) diff --git a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c index 9cdecfca1b..fa125da972 100644 --- a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c +++ b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c @@ -614,8 +614,8 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) uint32_t cur_try; long httpRes; CURL *curl_handle = NULL; - struct curl_slist *headers = NULL; - struct curl_slist *slist = NULL; + switch_curl_slist_t *headers = NULL; + switch_curl_slist_t *slist = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; int is_b; @@ -688,7 +688,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) /* try to post it to the web server */ if (globals.url_count) { char *destUrl = NULL; - curl_handle = curl_easy_init(); + curl_handle = switch_curl_easy_init(); if (globals.encode) { switch_size_t need_bytes = strlen(json_text) * 3; @@ -697,10 +697,10 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) switch_assert(json_text_escaped); memset(json_text_escaped, 0, need_bytes); if (globals.encode == ENCODING_DEFAULT) { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); + headers = switch_curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); switch_url_encode(json_text, json_text_escaped, need_bytes); } else { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded"); + headers = switch_curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded"); switch_b64_encode((unsigned char *) json_text, need_bytes / 3, (unsigned char *) json_text_escaped, need_bytes); } @@ -712,55 +712,55 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) } } else { - headers = curl_slist_append(headers, "Content-Type: application/json"); + headers = switch_curl_slist_append(headers, "Content-Type: application/json"); curl_json_text = (char *)json_text; } if (!zstr(globals.cred)) { - curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, globals.auth_scheme); - curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, globals.auth_scheme); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); } - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl_handle, CURLOPT_POST, 1); - curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_json_text); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-json/1.0"); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); + switch_curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_json_text); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-json/1.0"); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); if (globals.disable100continue) { - slist = curl_slist_append(slist, "Expect:"); - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); + slist = switch_curl_slist_append(slist, "Expect:"); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); } if (globals.ssl_cert_file) { - curl_easy_setopt(curl_handle, CURLOPT_SSLCERT, globals.ssl_cert_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLCERT, globals.ssl_cert_file); } if (globals.ssl_key_file) { - curl_easy_setopt(curl_handle, CURLOPT_SSLKEY, globals.ssl_key_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEY, globals.ssl_key_file); } if (globals.ssl_key_password) { - curl_easy_setopt(curl_handle, CURLOPT_SSLKEYPASSWD, globals.ssl_key_password); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEYPASSWD, globals.ssl_key_password); } if (globals.ssl_version) { if (!strcasecmp(globals.ssl_version, "SSLv3")) { - curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3); } else if (!strcasecmp(globals.ssl_version, "TLSv1")) { - curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); } } if (globals.ssl_cacert_file) { - curl_easy_setopt(curl_handle, CURLOPT_CAINFO, globals.ssl_cacert_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_CAINFO, globals.ssl_cacert_file); } /* these were used for testing, optionally they may be enabled if someone desires - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 120); // tcp timeout - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level + switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 120); // tcp timeout + switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level */ for (cur_try = 0; cur_try < globals.retries; cur_try++) { @@ -769,23 +769,23 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) } 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); + switch_curl_easy_setopt(curl_handle, CURLOPT_URL, destUrl); if (!strncasecmp(destUrl, "https", 5)) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } if (globals.enable_cacert_check) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, TRUE); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, TRUE); } if (globals.enable_ssl_verifyhost) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2); } - curl_easy_perform(curl_handle); - curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + switch_curl_easy_perform(curl_handle); + switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); switch_safe_free(destUrl); if (httpRes == 200) { goto success; @@ -800,9 +800,9 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Retry will be with url [%s]\n", globals.urls[globals.url_index]); } } - curl_easy_cleanup(curl_handle); - curl_slist_free_all(headers); - curl_slist_free_all(slist); + switch_curl_easy_cleanup(curl_handle); + switch_curl_slist_free_all(headers); + switch_curl_slist_free_all(slist); slist = NULL; headers = NULL; curl_handle = NULL; @@ -848,13 +848,13 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) error: if (curl_handle) { - curl_easy_cleanup(curl_handle); + switch_curl_easy_cleanup(curl_handle); } if (headers) { - curl_slist_free_all(headers); + switch_curl_slist_free_all(headers); } if (slist) { - curl_slist_free_all(slist); + switch_curl_slist_free_all(slist); } if (curl_json_text != json_text) { switch_safe_free(curl_json_text); @@ -1041,7 +1041,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_json_cdr_load) globals.retries++; - switch_curl_init(); set_json_cdr_log_dirs(); switch_xml_free(xml); @@ -1054,7 +1053,6 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_json_cdr_shutdown) globals.shutdown = 1; - switch_curl_destroy(); switch_safe_free(globals.log_dir); for (;err_dir_index < globals.err_dir_count; err_dir_index++) { diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile index 801a509c31..d35d75a630 100644 --- a/src/mod/formats/mod_shout/Makefile +++ b/src/mod/formats/mod_shout/Makefile @@ -3,8 +3,6 @@ SHOUT=libshout-2.2.2 MPG123=mpg123-1.13.2 BASE=../../../.. -WANT_CURL=yes - LAME_DIR=$(switch_srcdir)/libs/$(LAME) SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT) MPG123_DIR=$(switch_srcdir)/libs/$(MPG123) diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c index 81894c7299..e3c3764429 100644 --- a/src/mod/formats/mod_shout/mod_shout.c +++ b/src/mod/formats/mod_shout/mod_shout.c @@ -445,30 +445,30 @@ static size_t stream_callback(void *ptr, size_t size, size_t nmemb, void *data) #define MY_BLOCK_SIZE MY_BUF_LEN static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj) { - CURL *curl_handle = NULL; - CURLcode cc; + switch_CURL *curl_handle = NULL; + switch_CURLcode cc; shout_context_t *context = (shout_context_t *) obj; switch_thread_rwlock_rdlock(context->rwlock); - curl_handle = curl_easy_init(); - curl_easy_setopt(curl_handle, CURLOPT_URL, context->stream_url); - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, stream_callback); - curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) context); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "FreeSWITCH(mod_shout)/1.0"); - curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, 30); /* eventually timeout connect */ - curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_LIMIT, 100); /* handle trickle connections */ - curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_TIME, 30); - curl_easy_setopt(curl_handle, CURLOPT_ERRORBUFFER, context->curl_error_buff); - cc = curl_easy_perform(curl_handle); + curl_handle = switch_curl_easy_init(); + switch_curl_easy_setopt(curl_handle, CURLOPT_URL, context->stream_url); + switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, stream_callback); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) context); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "FreeSWITCH(mod_shout)/1.0"); + switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_CONNECTTIMEOUT, 30); /* eventually timeout connect */ + switch_curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_LIMIT, 100); /* handle trickle connections */ + switch_curl_easy_setopt(curl_handle, CURLOPT_LOW_SPEED_TIME, 30); + switch_curl_easy_setopt(curl_handle, CURLOPT_ERRORBUFFER, context->curl_error_buff); + cc = switch_curl_easy_perform(curl_handle); if (cc && cc != CURLE_WRITE_ERROR) { /* write error is ok, we just exited from callback early */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "CURL returned error:[%d] %s : %s [%s]\n", cc, curl_easy_strerror(cc), + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "CURL returned error:[%d] %s : %s [%s]\n", cc, switch_curl_easy_strerror(cc), context->curl_error_buff, context->stream_url); } - curl_easy_cleanup(curl_handle); + switch_curl_easy_cleanup(curl_handle); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Read Thread Done\n"); context->eof++; @@ -1550,8 +1550,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load) supported_formats[0] = "shout"; supported_formats[1] = "mp3"; - switch_curl_init(); - /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); @@ -1577,7 +1575,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown) { - switch_curl_destroy(); mpg123_exit(); return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/xml_int/mod_xml_cdr/Makefile b/src/mod/xml_int/mod_xml_cdr/Makefile index c762c5353d..c2baec83cd 100644 --- a/src/mod/xml_int/mod_xml_cdr/Makefile +++ b/src/mod/xml_int/mod_xml_cdr/Makefile @@ -1,2 +1 @@ -WANT_CURL=yes include ../../../../build/modmake.rules diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c index 59e8ec6427..980598c167 100644 --- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c +++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c @@ -188,9 +188,9 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) int fd = -1; uint32_t cur_try; long httpRes; - CURL *curl_handle = NULL; - struct curl_slist *headers = NULL; - struct curl_slist *slist = NULL; + switch_CURL *curl_handle = NULL; + switch_curl_slist_t *headers = NULL; + switch_curl_slist_t *slist = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; int is_b; @@ -260,10 +260,10 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) /* try to post it to the web server */ if (globals.url_count) { char *destUrl = NULL; - curl_handle = curl_easy_init(); + curl_handle = switch_curl_easy_init(); if (globals.encode == ENCODING_TEXTXML) { - headers = curl_slist_append(headers, "Content-Type: text/xml"); + headers = switch_curl_slist_append(headers, "Content-Type: text/xml"); } else if (globals.encode) { switch_size_t need_bytes = strlen(xml_text) * 3 + 1; @@ -271,16 +271,16 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) switch_assert(xml_text_escaped); memset(xml_text_escaped, 0, need_bytes); if (globals.encode == ENCODING_DEFAULT) { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); + headers = switch_curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); switch_url_encode(xml_text, xml_text_escaped, need_bytes); } else { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded"); + headers = switch_curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded"); switch_b64_encode((unsigned char *) xml_text, need_bytes / 3, (unsigned char *) xml_text_escaped, need_bytes); } switch_safe_free(xml_text); xml_text = xml_text_escaped; } else { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-plaintext"); + headers = switch_curl_slist_append(headers, "Content-Type: application/x-www-form-plaintext"); } if (globals.encode == ENCODING_TEXTXML) { @@ -291,50 +291,50 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) } if (!zstr(globals.cred)) { - curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, globals.auth_scheme); - curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, globals.auth_scheme); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); } - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl_handle, CURLOPT_POST, 1); - curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); - curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); + switch_curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); if (globals.disable100continue) { - slist = curl_slist_append(slist, "Expect:"); - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); + slist = switch_curl_slist_append(slist, "Expect:"); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); } if (globals.ssl_cert_file) { - curl_easy_setopt(curl_handle, CURLOPT_SSLCERT, globals.ssl_cert_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLCERT, globals.ssl_cert_file); } if (globals.ssl_key_file) { - curl_easy_setopt(curl_handle, CURLOPT_SSLKEY, globals.ssl_key_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEY, globals.ssl_key_file); } if (globals.ssl_key_password) { - curl_easy_setopt(curl_handle, CURLOPT_SSLKEYPASSWD, globals.ssl_key_password); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEYPASSWD, globals.ssl_key_password); } if (globals.ssl_version) { if (!strcasecmp(globals.ssl_version, "SSLv3")) { - curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3); } else if (!strcasecmp(globals.ssl_version, "TLSv1")) { - curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); } } if (globals.ssl_cacert_file) { - curl_easy_setopt(curl_handle, CURLOPT_CAINFO, globals.ssl_cacert_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_CAINFO, globals.ssl_cacert_file); } - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, globals.timeout); + switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, globals.timeout); /* these were used for testing, optionally they may be enabled if someone desires - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level + switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level */ for (cur_try = 0; cur_try < globals.retries; cur_try++) { @@ -343,23 +343,23 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) } destUrl = switch_mprintf("%s?uuid=%s%s", globals.urls[globals.url_index], a_prefix, switch_core_session_get_uuid(session)); - curl_easy_setopt(curl_handle, CURLOPT_URL, destUrl); + switch_curl_easy_setopt(curl_handle, CURLOPT_URL, destUrl); if (!strncasecmp(destUrl, "https", 5)) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } if (globals.enable_cacert_check) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, TRUE); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, TRUE); } if (globals.enable_ssl_verifyhost) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2); } - curl_easy_perform(curl_handle); - curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + switch_curl_easy_perform(curl_handle); + switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); switch_safe_free(destUrl); if (httpRes >= 200 && httpRes <= 299) { goto success; @@ -374,9 +374,9 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Retry will be with url [%s]\n", globals.urls[globals.url_index]); } } - curl_easy_cleanup(curl_handle); - curl_slist_free_all(headers); - curl_slist_free_all(slist); + switch_curl_easy_cleanup(curl_handle); + switch_curl_slist_free_all(headers); + switch_curl_slist_free_all(slist); slist = NULL; headers = NULL; curl_handle = NULL; @@ -415,13 +415,13 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) error: if (curl_handle) { - curl_easy_cleanup(curl_handle); + switch_curl_easy_cleanup(curl_handle); } if (headers) { - curl_slist_free_all(headers); + switch_curl_slist_free_all(headers); } if (slist) { - curl_slist_free_all(slist); + switch_curl_slist_free_all(slist); } if (curl_xml_text != xml_text) { switch_safe_free(curl_xml_text); @@ -612,10 +612,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load) switch_xml_free(xml); - if (status == SWITCH_STATUS_SUCCESS) { - switch_curl_init(); - } - return status; } @@ -632,8 +628,6 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown) switch_thread_rwlock_destroy(globals.log_path_lock); - switch_curl_destroy(); - return SWITCH_STATUS_SUCCESS; } diff --git a/src/mod/xml_int/mod_xml_curl/Makefile b/src/mod/xml_int/mod_xml_curl/Makefile index c762c5353d..c2baec83cd 100644 --- a/src/mod/xml_int/mod_xml_curl/Makefile +++ b/src/mod/xml_int/mod_xml_curl/Makefile @@ -1,2 +1 @@ -WANT_CURL=yes include ../../../../build/modmake.rules diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c index b718c51fe0..0ba450b726 100644 --- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c +++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c @@ -140,7 +140,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con void *user_data) { char filename[512] = ""; - CURL *curl_handle = NULL; + switch_CURL *curl_handle = NULL; struct config_data config_data; switch_xml_t xml = NULL; char *data = NULL; @@ -148,9 +148,9 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; xml_binding_t *binding = (xml_binding_t *) user_data; char *file_url; - struct curl_slist *slist = NULL; + switch_curl_slist_t *slist = NULL; long httpRes = 0; - struct curl_slist *headers = NULL; + switch_curl_slist_t *headers = NULL; char hostname[256] = ""; char basic_data[512]; char *uri = NULL; @@ -205,12 +205,12 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con switch_uuid_format(uuid_str, &uuid); switch_snprintf(filename, sizeof(filename), "%s%s.tmp.xml", SWITCH_GLOBAL_dirs.temp_dir, uuid_str); - curl_handle = curl_easy_init(); - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); + curl_handle = switch_curl_easy_init(); + headers = switch_curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); if (!strncasecmp(binding->url, "https", 5)) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } memset(&config_data, 0, sizeof(config_data)); @@ -220,74 +220,74 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { if (!zstr(binding->cred)) { - curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, binding->auth_scheme); - curl_easy_setopt(curl_handle, CURLOPT_USERPWD, binding->cred); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, binding->auth_scheme); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERPWD, binding->cred); } - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); if (binding->method != NULL) - curl_easy_setopt(curl_handle, CURLOPT_CUSTOMREQUEST, binding->method); - curl_easy_setopt(curl_handle, CURLOPT_POST, !binding->use_get_style); - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); + switch_curl_easy_setopt(curl_handle, CURLOPT_CUSTOMREQUEST, binding->method); + switch_curl_easy_setopt(curl_handle, CURLOPT_POST, !binding->use_get_style); + switch_curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); if (!binding->use_get_style) - curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); - curl_easy_setopt(curl_handle, CURLOPT_URL, binding->use_get_style ? uri : dynamic_url); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); - curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + switch_curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data); + switch_curl_easy_setopt(curl_handle, CURLOPT_URL, binding->use_get_style ? uri : dynamic_url); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); + switch_curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); + switch_curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); if (binding->timeout) { - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, binding->timeout); - curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); + switch_curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, binding->timeout); + switch_curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1); } if (binding->disable100continue) { - slist = curl_slist_append(slist, "Expect:"); - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); + slist = switch_curl_slist_append(slist, "Expect:"); + switch_curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); } if (binding->enable_cacert_check) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, TRUE); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, TRUE); } if (binding->ssl_cert_file) { - curl_easy_setopt(curl_handle, CURLOPT_SSLCERT, binding->ssl_cert_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLCERT, binding->ssl_cert_file); } if (binding->ssl_key_file) { - curl_easy_setopt(curl_handle, CURLOPT_SSLKEY, binding->ssl_key_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEY, binding->ssl_key_file); } if (binding->ssl_key_password) { - curl_easy_setopt(curl_handle, CURLOPT_SSLKEYPASSWD, binding->ssl_key_password); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLKEYPASSWD, binding->ssl_key_password); } if (binding->ssl_version) { if (!strcasecmp(binding->ssl_version, "SSLv3")) { - curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_SSLv3); } else if (!strcasecmp(binding->ssl_version, "TLSv1")) { - curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); } } if (binding->ssl_cacert_file) { - curl_easy_setopt(curl_handle, CURLOPT_CAINFO, binding->ssl_cacert_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_CAINFO, binding->ssl_cacert_file); } if (binding->enable_ssl_verifyhost) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2); + switch_curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 2); } if (binding->cookie_file) { - curl_easy_setopt(curl_handle, CURLOPT_COOKIEJAR, binding->cookie_file); - curl_easy_setopt(curl_handle, CURLOPT_COOKIEFILE, binding->cookie_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_COOKIEJAR, binding->cookie_file); + switch_curl_easy_setopt(curl_handle, CURLOPT_COOKIEFILE, binding->cookie_file); } - curl_easy_perform(curl_handle); - curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); - curl_easy_cleanup(curl_handle); - curl_slist_free_all(headers); - curl_slist_free_all(slist); + switch_curl_easy_perform(curl_handle); + switch_curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + switch_curl_easy_cleanup(curl_handle); + switch_curl_slist_free_all(headers); + switch_curl_slist_free_all(slist); close(config_data.fd); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n"); @@ -548,9 +548,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_curl_load) globals.hash_root = NULL; globals.hash_tail = NULL; - if (do_config() == SWITCH_STATUS_SUCCESS) { - switch_curl_init(); - } else { + if (do_config() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } @@ -574,7 +572,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_curl_shutdown) } switch_xml_unbind_search_function_ptr(xml_url_fetch); - switch_curl_destroy(); + return SWITCH_STATUS_SUCCESS; } diff --git a/src/switch_core.c b/src/switch_core.c index 0f3bc36455..346f3c853c 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -1377,8 +1377,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc memset(&runtime, 0, sizeof(runtime)); gethostname(runtime.hostname, sizeof(runtime.hostname)); - switch_ssl_init_ssl_locks(); - runtime.max_db_handles = 50; runtime.db_handle_timeout = 5000000;; @@ -1455,6 +1453,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc runtime.console = stdout; } + switch_ssl_init_ssl_locks(); + switch_curl_init(); + switch_core_set_variable("hostname", runtime.hostname); switch_find_local_ip(guess_ip, sizeof(guess_ip), &mask, AF_INET); switch_core_set_variable("local_ip_v4", guess_ip); From 17e9c50ee55d11ecf45ffb818b3baf669faa28c4 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 29 Nov 2011 15:37:36 -0600 Subject: [PATCH 07/11] FS-2936 stage 3 probably need this file --- src/switch_curl.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 src/switch_curl.c diff --git a/src/switch_curl.c b/src/switch_curl.c new file mode 100644 index 0000000000..1a3035a6d6 --- /dev/null +++ b/src/switch_curl.c @@ -0,0 +1,74 @@ +#include +#include + + +SWITCH_DECLARE(switch_CURL *) switch_curl_easy_init(void) +{ + return curl_easy_init(); +} + +SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_perform(switch_CURL *handle) +{ + return curl_easy_perform((CURL *)handle); +} + + +SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_getinfo(switch_CURL *curl, switch_CURLINFO info, ... ) +{ + va_list ap; + switch_CURLcode code; + + va_start(ap, info); + code = curl_easy_getinfo(curl, info, ap); + va_end(ap); + + return code; +} + + + +SWITCH_DECLARE(void) switch_curl_easy_cleanup(switch_CURL *handle) +{ + curl_easy_cleanup((CURL *)handle); +} + + + +SWITCH_DECLARE(switch_curl_slist_t *) switch_curl_slist_append(switch_curl_slist_t * list, const char * string ) +{ + return (switch_curl_slist_t *) curl_slist_append((struct curl_slist *)list, string); +} + + +SWITCH_DECLARE(void) switch_curl_slist_free_all(switch_curl_slist_t * list) +{ + curl_slist_free_all((struct curl_slist *) list); +} + +SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt(CURL *handle, switch_CURLoption option, ...) +{ + va_list ap; + switch_CURLcode code; + + va_start(ap, option); + code = curl_easy_setopt(handle, option, ap); + va_end(ap); + + return code; +} + +SWITCH_DECLARE(const char *) switch_curl_easy_strerror(switch_CURLcode errornum ) +{ + return curl_easy_strerror(errornum); +} + +SWITCH_DECLARE(void) switch_curl_init(void) +{ + curl_global_init(CURL_GLOBAL_ALL); +} + +SWITCH_DECLARE(void) switch_curl_destroy(void) +{ + curl_global_cleanup(); +} + From a7238d0b9d53495e1b1b344026770fd1ab3f61f8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 29 Nov 2011 15:38:52 -0600 Subject: [PATCH 08/11] FS-2936 stage 4 these too --- Makefile.am | 8 ++------ build/modmake.rules.in | 10 ++++------ configure.in | 5 +++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2f9f9bf111..6ed29cbc67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,6 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include CORE_CFLAGS += -I$(switch_srcdir)/libs/spandsp/src -I$(switch_srcdir)/libs/tiff-3.8.2/libtiff -CORE_CFLAGS += $(LIBCURL_CPPFLAGS) CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la @@ -130,12 +129,8 @@ if ENABLE_TIMERFD_WRAPPER CORE_CFLAGS += -DTIMERFD_WRAP endif -CORE_LDFLAGS= - if CURL_BUILTIN CORE_LIBS += libs/curl/lib/libcurl.la -else -CORE_LDFLAGS += $(LIBCURL) endif ## @@ -143,7 +138,7 @@ endif ## lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) -libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) $(CORE_LDFLAGS) +libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) libfreeswitch_la_LIBADD = $(CORE_LIBS) $(PLATFORM_CORE_LIBS) libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES) @@ -254,6 +249,7 @@ libfreeswitch_la_SOURCES = \ src/switch_pcm.c \ src/switch_profile.c \ src/switch_json.c \ + src/switch_curl.c \ libs/stfu/stfu.c \ libs/libteletone/src/libteletone_detect.c \ libs/libteletone/src/libteletone_generate.c \ diff --git a/build/modmake.rules.in b/build/modmake.rules.in index 51923ec3dd..00d72f050c 100644 --- a/build/modmake.rules.in +++ b/build/modmake.rules.in @@ -80,20 +80,18 @@ TOUCH_TARGET=@TOUCH_TARGET@ MAKE_OPTS = `test -n "$(VERBOSE)" || echo -s` RECURSE_MODNAME=`pwd | sed -e 's|^.*/||'` RECURSE_SOURCEFILE=`if test -f "$$modname.cpp" -o -f "$(MODDIR)/$$modname.cpp"; then echo "$$modname.cpp"; else echo "$$modname.c"; fi` -RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi ` -RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS) ; $(LOCAL_INSERT_CFLAGS) ` -RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL) ; $(LOCAL_INSERT_LDFLAGS) ` +RECURSE_OUR_CFLAGS=` $(LOCAL_INSERT_CFLAGS) ` +RECURSE_OUR_LDFLAGS=` $(LOCAL_INSERT_LDFLAGS) ` RECURSE_MODDIR=`if test -z $(MODDIR); then pwd | sed -e 's|$(switch_builddir)|$(switch_srcdir)|'; else echo $(MODDIR); fi` RECURSE_MAKE=+modname="$(RECURSE_MODNAME)" ; \ sourcefile="$(RECURSE_SOURCEFILE)" ; \ osarch=`uname -s` ; \ - ourdefs="$(RECURSE_OUR_DEPS)" ; \ ourcflags="$(RECURSE_OUR_CFLAGS)" ; \ ourldflags="$(RECURSE_OUR_LDFLAGS)" ; \ insertobjs="`$(LOCAL_INSERT_OBJS)`" ; \ moddir="$(RECURSE_MODDIR)" ; \ $(MAKE) $(MAKE_OPTS) MODNAME="$$modname" SOURCEFILE="$$sourcefile" MODDIR="$$moddir" \ - OUR_DEPS="$$ourdefs" OUR_CFLAGS="$$ourcflags" OUR_LDFLAGS="$$ourldflags" OUR_OBJS="$$insertobjs" + OUR_CFLAGS="$$ourcflags" OUR_LDFLAGS="$$ourldflags" OUR_OBJS="$$insertobjs" all: Makefile @$(RECURSE_MAKE) all-modules || exit 1 @@ -136,7 +134,7 @@ LINK_OUTPUT_REDIR=> .libs/$(MODNAME).log || error="yes" ; \ exit 1 ;\ fi -$(MODNAME).$(LIBTOOL_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(MODDIR)/$(SOURCEFILE) $(MODNAME).lo +$(MODNAME).$(LIBTOOL_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(LOCAL_OBJS) $(OUR_OBJS) $(MODDIR)/$(SOURCEFILE) $(MODNAME).lo @echo Creating $@... @test -d .libs || mkdir .libs @error="";\ diff --git a/configure.in b/configure.in index ed6547c626..e703bbc8b2 100644 --- a/configure.in +++ b/configure.in @@ -807,8 +807,13 @@ if test "$ac_cv_use_system_curl" != "yes" ; then LIBCURL_DEPS='${switch_builddir}/libs/curl/lib/libcurl.la' LIBCURL='${switch_builddir}/libs/curl/lib/libcurl.la' LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include' +else + SWITCH_AM_LDFLAGS="$LIBCURL $SWITCH_AM_LDFLAGS" fi +SWITCH_AM_CFLAGS="$LIBCURL_CPPFLAGS $SWITCH_AM_CFLAGS" +SWITCH_AM_CXXFLAGS="$LIBCURL_CPPFLAGS $SWITCH_AM_CXXFLAGS" + AM_CONDITIONAL([CURL_BUILTIN],[test "${ac_cv_use_system_curl}" != "yes"]) AC_SUBST(LIBCURL_DEPS) From d9089edf895ac0a21f0f15ff1d1abcaaff4fffd0 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 29 Nov 2011 16:23:49 -0600 Subject: [PATCH 09/11] finishing touches for commit: b9e28f85cb35db7dd72b6760310fa3ad18e5aa2d --- src/mod/endpoints/mod_sofia/mod_sofia.c | 35 ++++++++++++++------ src/mod/endpoints/mod_sofia/mod_sofia.h | 2 +- src/mod/endpoints/mod_sofia/sofia.c | 44 ++++++++++++++----------- 3 files changed, 51 insertions(+), 30 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 52c2b3cb54..31ef7884d9 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -1932,24 +1932,39 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi } case SWITCH_MESSAGE_INDICATE_INFO: { - char *headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_INFO_HEADER_PREFIX); char *ct = "freeswitch/data"; - const char *pl = NULL; + int ok = 0; if (!zstr(msg->string_array_arg[0]) && !zstr(msg->string_array_arg[1])) { ct = switch_core_session_sprintf(session, "%s/%s", msg->string_array_arg[0], msg->string_array_arg[1]); + ok = 1; } - if (!zstr(msg->string_array_arg[2])) { - pl = msg->string_array_arg[2]; + if (switch_stristr("send_info", tech_pvt->x_freeswitch_support_remote)) { + ok = 1; } - nua_info(tech_pvt->nh, - SIPTAG_CONTENT_TYPE_STR(ct), - TAG_IF(!zstr(headers), SIPTAG_HEADER_STR(headers)), - TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), - TAG_IF(pl, SIPTAG_PAYLOAD_STR(pl)), - TAG_END()); + if (switch_true(switch_channel_get_variable(channel, "fs_send_unspported_info"))) { + ok = 1; + } + + if (ok) { + char *headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_INFO_HEADER_PREFIX); + const char *pl = NULL; + + if (!zstr(msg->string_array_arg[2])) { + pl = msg->string_array_arg[2]; + } + + nua_info(tech_pvt->nh, + SIPTAG_CONTENT_TYPE_STR(ct), + TAG_IF(!zstr(headers), SIPTAG_HEADER_STR(headers)), + TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), + TAG_IF(pl, SIPTAG_PAYLOAD_STR(pl)), + TAG_END()); + } else { + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s send_info is not supported.\n", switch_channel_get_name(channel)); + } } break; case SWITCH_MESSAGE_INDICATE_SIMPLIFY: diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h index 6b4d938c11..a95aa9d1cb 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.h +++ b/src/mod/endpoints/mod_sofia/mod_sofia.h @@ -111,7 +111,7 @@ typedef struct private_object private_object_t; #define SOFIA_SECURE_MEDIA_CONFIRMED_VARIABLE "sip_secure_media_confirmed" #define SOFIA_HAS_CRYPTO_VARIABLE "sip_has_crypto" #define SOFIA_CRYPTO_MANDATORY_VARIABLE "sip_crypto_mandatory" -#define FREESWITCH_SUPPORT "update_display" +#define FREESWITCH_SUPPORT "update_display,send_info" #include #include diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index 3804d69942..20b48f77b4 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -6967,31 +6967,37 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t sofia_glue_set_extra_headers(session, sip, SOFIA_SIP_INFO_HEADER_PREFIX); - if (!(vval = switch_channel_get_variable(channel, "sip_copy_custom_headers")) || switch_true(vval)) { - switch_core_session_t *nsession = NULL; - switch_core_session_get_partner(session, &nsession); + + if (sip && sip->sip_content_type && sip->sip_content_type->c_type && !strcasecmp(sip->sip_content_type->c_type, "freeswitch/data")) { + char *data = NULL; - if (nsession) { - switch_core_session_message_t *msg; + if (sip->sip_payload && sip->sip_payload->pl_data) { + data = sip->sip_payload->pl_data; + } + + if ((vval = switch_channel_get_variable(channel, "sip_copy_custom_headers")) && switch_true(vval)) { + switch_core_session_t *nsession = NULL; - switch_ivr_transfer_variable(session, nsession, SOFIA_SIP_INFO_HEADER_PREFIX_T); - msg = switch_core_session_alloc(nsession, sizeof(*msg)); - MESSAGE_STAMP_FFL(msg); - msg->message_id = SWITCH_MESSAGE_INDICATE_INFO; + switch_core_session_get_partner(session, &nsession); + + if (nsession) { + switch_core_session_message_t *msg; - if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype && - sip->sip_payload && sip->sip_payload->pl_data) { - msg->string_array_arg[0] = switch_core_session_strdup(nsession, sip->sip_content_type->c_type); - msg->string_array_arg[1] = switch_core_session_strdup(nsession, sip->sip_content_type->c_subtype); - msg->string_array_arg[0] = switch_core_session_strdup(nsession, sip->sip_payload->pl_data); - } - msg->from = __FILE__; - switch_core_session_queue_message(nsession, msg); + switch_ivr_transfer_variable(session, nsession, SOFIA_SIP_INFO_HEADER_PREFIX_T); + msg = switch_core_session_alloc(nsession, sizeof(*msg)); + MESSAGE_STAMP_FFL(msg); + msg->message_id = SWITCH_MESSAGE_INDICATE_INFO; + + msg->string_array_arg[2] = switch_core_session_strdup(nsession, data); + + msg->from = __FILE__; + switch_core_session_queue_message(nsession, msg); - switch_core_session_rwunlock(nsession); + switch_core_session_rwunlock(nsession); + } } - } + } if (sip && sip->sip_content_type && sip->sip_content_type->c_subtype && sip->sip_content_type->c_type && !strncasecmp(sip->sip_content_type->c_type, "message", 7) && From 13dc2f9e3102d6615ba6cf38fdbc235507ed5d24 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 29 Nov 2011 18:17:42 -0600 Subject: [PATCH 10/11] FS-2936 stage 5 handle varargs right --- src/switch_curl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/switch_curl.c b/src/switch_curl.c index 1a3035a6d6..243f966ce2 100644 --- a/src/switch_curl.c +++ b/src/switch_curl.c @@ -1,6 +1,8 @@ #include #include +CURLcode Curl_setopt(switch_CURL *curl, CURLoption option, va_list arg); + SWITCH_DECLARE(switch_CURL *) switch_curl_easy_init(void) { @@ -19,7 +21,7 @@ SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_getinfo(switch_CURL *curl, swit switch_CURLcode code; va_start(ap, info); - code = curl_easy_getinfo(curl, info, ap); + code = curl_easy_getinfo(curl, info, va_arg(ap, void *)); va_end(ap); return code; @@ -51,7 +53,7 @@ SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt(CURL *handle, switch_CUR switch_CURLcode code; va_start(ap, option); - code = curl_easy_setopt(handle, option, ap); + code = Curl_setopt(handle, option, ap); va_end(ap); return code; From 674619b395bf1a7ff70e0cb984758ade51936e81 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 29 Nov 2011 22:28:50 -0600 Subject: [PATCH 11/11] FS-2936 changes for vs2010 build - vs2008 coming later --- w32/Library/FreeSwitchCore.2010.vcxproj | 4 ++++ w32/Library/FreeSwitchCore.2010.vcxproj.filters | 3 +++ w32/winlibs.props | 3 +++ 3 files changed, 10 insertions(+) diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj index 0c676d04de..aa03a0b49a 100644 --- a/w32/Library/FreeSwitchCore.2010.vcxproj +++ b/w32/Library/FreeSwitchCore.2010.vcxproj @@ -374,6 +374,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs + @@ -788,6 +789,9 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs true false + + {87ee9da4-de1e-4448-8324-183c98dca588} + {8d04b550-d240-4a44-8a18-35da3f7038d9} false diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters index 25fc9a136d..79369a8bb3 100644 --- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters +++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters @@ -199,6 +199,9 @@ Source Files + + Source Files + diff --git a/w32/winlibs.props b/w32/winlibs.props index 05674c70c5..be0cfef212 100644 --- a/w32/winlibs.props +++ b/w32/winlibs.props @@ -1,5 +1,8 @@  + + + <_ProjectFileVersion>10.0.30319.1 <_PropertySheetDisplayName>Freeswitch Core Windows Libraries