author | Michael Krelin <hacker@klever.net> | 2007-11-28 16:18:24 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-11-28 16:18:24 (UTC) |
commit | 457eb9e2a218f8007dbb10dfdd624c63dc72cb2b (patch) (unidiff) | |
tree | 32c73965e946e311b99eb6a456c944f2bb133a32 | |
parent | 17aeb70fafc306ba5e06d2321196bc913f3c0fe1 (diff) | |
download | libopkele-457eb9e2a218f8007dbb10dfdd624c63dc72cb2b.zip libopkele-457eb9e2a218f8007dbb10dfdd624c63dc72cb2b.tar.gz libopkele-457eb9e2a218f8007dbb10dfdd624c63dc72cb2b.tar.bz2 |
added header and progress callbacks to curl wrapper
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/opkele/curl.h | 6 | ||||
-rw-r--r-- | lib/curl.cc | 25 |
2 files changed, 31 insertions, 0 deletions
diff --git a/include/opkele/curl.h b/include/opkele/curl.h index 1029b34..298f095 100644 --- a/include/opkele/curl.h +++ b/include/opkele/curl.h | |||
@@ -1,42 +1,48 @@ | |||
1 | #ifndef __OPKELE_CURL_H | 1 | #ifndef __OPKELE_CURL_H |
2 | #define __OPKELE_CURL_H | 2 | #define __OPKELE_CURL_H |
3 | 3 | ||
4 | #include <cassert> | 4 | #include <cassert> |
5 | #include <curl/curl.h> | 5 | #include <curl/curl.h> |
6 | 6 | ||
7 | namespace opkele { | 7 | namespace opkele { |
8 | 8 | ||
9 | namespace util { | 9 | namespace util { |
10 | 10 | ||
11 | class curl_t { | 11 | class curl_t { |
12 | public: | 12 | public: |
13 | CURL *_c; | 13 | CURL *_c; |
14 | 14 | ||
15 | curl_t() : _c(0) { } | 15 | curl_t() : _c(0) { } |
16 | curl_t(CURL *c) : _c(c) { } | 16 | curl_t(CURL *c) : _c(c) { } |
17 | virtual ~curl_t() throw(); | 17 | virtual ~curl_t() throw(); |
18 | 18 | ||
19 | curl_t& operator=(CURL *c); | 19 | curl_t& operator=(CURL *c); |
20 | 20 | ||
21 | operator const CURL*(void) const { return _c; } | 21 | operator const CURL*(void) const { return _c; } |
22 | operator CURL*(void) { return _c; } | 22 | operator CURL*(void) { return _c; } |
23 | 23 | ||
24 | CURLcode misc_sets(); | 24 | CURLcode misc_sets(); |
25 | 25 | ||
26 | template<typename PT> | 26 | template<typename PT> |
27 | inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); } | 27 | inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); } |
28 | CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); } | 28 | CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); } |
29 | template<typename IT> | 29 | template<typename IT> |
30 | inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); } | 30 | inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); } |
31 | 31 | ||
32 | static inline CURL *easy_init() { return curl_easy_init(); } | 32 | static inline CURL *easy_init() { return curl_easy_init(); } |
33 | 33 | ||
34 | virtual size_t write(void *p,size_t s,size_t nm) { return 0; } | 34 | virtual size_t write(void *p,size_t s,size_t nm) { return 0; } |
35 | CURLcode set_write(); | 35 | CURLcode set_write(); |
36 | |||
37 | virtual int progress(double dlt,double dln,double ult,double uln) { return 0; } | ||
38 | CURLcode set_progress(); | ||
39 | |||
40 | virtual size_t header(void *p,size_t s,size_t nm) { return s*nm; } | ||
41 | CURLcode set_header(); | ||
36 | }; | 42 | }; |
37 | 43 | ||
38 | } | 44 | } |
39 | 45 | ||
40 | } | 46 | } |
41 | 47 | ||
42 | #endif /* __OPKELE_CURL_H */ | 48 | #endif /* __OPKELE_CURL_H */ |
diff --git a/lib/curl.cc b/lib/curl.cc index 3e69b47..6172828 100644 --- a/lib/curl.cc +++ b/lib/curl.cc | |||
@@ -4,51 +4,76 @@ | |||
4 | 4 | ||
5 | namespace opkele { | 5 | namespace opkele { |
6 | 6 | ||
7 | namespace util { | 7 | namespace util { |
8 | 8 | ||
9 | curl_t::~curl_t() throw() { | 9 | curl_t::~curl_t() throw() { |
10 | if(_c) | 10 | if(_c) |
11 | curl_easy_cleanup(_c); | 11 | curl_easy_cleanup(_c); |
12 | } | 12 | } |
13 | 13 | ||
14 | curl_t& curl_t::operator=(CURL *c) { | 14 | curl_t& curl_t::operator=(CURL *c) { |
15 | if(_c) | 15 | if(_c) |
16 | curl_easy_cleanup(_c); | 16 | curl_easy_cleanup(_c); |
17 | _c = c; | 17 | _c = c; |
18 | return *this; | 18 | return *this; |
19 | } | 19 | } |
20 | 20 | ||
21 | CURLcode curl_t::misc_sets() { | 21 | CURLcode curl_t::misc_sets() { |
22 | assert(_c); | 22 | assert(_c); |
23 | CURLcode r; | 23 | CURLcode r; |
24 | (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1)) | 24 | (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1)) |
25 | || (r=easy_setopt(CURLOPT_MAXREDIRS,5)) | 25 | || (r=easy_setopt(CURLOPT_MAXREDIRS,5)) |
26 | || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120)) | 26 | || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120)) |
27 | || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1)) | 27 | || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1)) |
28 | || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION)) | 28 | || (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION)) |
29 | || (r=easy_setopt(CURLOPT_TIMEOUT,20)) | 29 | || (r=easy_setopt(CURLOPT_TIMEOUT,20)) |
30 | #ifdefDISABLE_CURL_SSL_VERIFYHOST | 30 | #ifdefDISABLE_CURL_SSL_VERIFYHOST |
31 | || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0)) | 31 | || (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0)) |
32 | #endif | 32 | #endif |
33 | #ifdefDISABLE_CURL_SSL_VERIFYPEER | 33 | #ifdefDISABLE_CURL_SSL_VERIFYPEER |
34 | || (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0)) | 34 | || (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0)) |
35 | #endif | 35 | #endif |
36 | ; | 36 | ; |
37 | return r; | 37 | return r; |
38 | } | 38 | } |
39 | 39 | ||
40 | static size_t _write(void *p,size_t s,size_t nm,void *stream) { | 40 | static size_t _write(void *p,size_t s,size_t nm,void *stream) { |
41 | return ((curl_t*)stream)->write(p,s,nm); | 41 | return ((curl_t*)stream)->write(p,s,nm); |
42 | } | 42 | } |
43 | 43 | ||
44 | CURLcode curl_t::set_write() { | 44 | CURLcode curl_t::set_write() { |
45 | assert(_c); | 45 | assert(_c); |
46 | CURLcode r; | 46 | CURLcode r; |
47 | (r = easy_setopt(CURLOPT_WRITEDATA,this)) | 47 | (r = easy_setopt(CURLOPT_WRITEDATA,this)) |
48 | || (r = easy_setopt(CURLOPT_WRITEFUNCTION,_write)); | 48 | || (r = easy_setopt(CURLOPT_WRITEFUNCTION,_write)); |
49 | return r; | 49 | return r; |
50 | } | 50 | } |
51 | 51 | ||
52 | static int _progress(void *cp,double dlt,double dln,double ult,double uln) { | ||
53 | return ((curl_t*)cp)->progress(dlt,dln,ult,uln); | ||
54 | } | ||
55 | |||
56 | CURLcode curl_t::set_progress() { | ||
57 | assert(_c); | ||
58 | CURLcode r; | ||
59 | (r = easy_setopt(CURLOPT_PROGRESSDATA,this)) | ||
60 | || (r = easy_setopt(CURLOPT_PROGRESSFUNCTION,_progress)) | ||
61 | || (r = easy_setopt(CURLOPT_NOPROGRESS,0)); | ||
62 | return r; | ||
63 | } | ||
64 | |||
65 | static size_t _header(void *p,size_t s,size_t nm,void *stream) { | ||
66 | return ((curl_t*)stream)->header(p,s,nm); | ||
67 | } | ||
68 | |||
69 | CURLcode curl_t::set_header() { | ||
70 | assert(_c); | ||
71 | CURLcode r; | ||
72 | (r = easy_setopt(CURLOPT_HEADERDATA,this)) | ||
73 | || (r=easy_setopt(CURLOPT_HEADERFUNCTION,_header)); | ||
74 | return r; | ||
75 | } | ||
76 | |||
52 | } | 77 | } |
53 | 78 | ||
54 | } | 79 | } |