summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-11-28 16:18:24 (UTC)
committer Michael Krelin <hacker@klever.net>2007-11-28 16:18:24 (UTC)
commit457eb9e2a218f8007dbb10dfdd624c63dc72cb2b (patch) (side-by-side diff)
tree32c73965e946e311b99eb6a456c944f2bb133a32
parent17aeb70fafc306ba5e06d2321196bc913f3c0fe1 (diff)
downloadlibopkele-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/curl.h6
-rw-r--r--lib/curl.cc25
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
@@ -12,31 +12,37 @@ namespace opkele {
public:
CURL *_c;
curl_t() : _c(0) { }
curl_t(CURL *c) : _c(c) { }
virtual ~curl_t() throw();
curl_t& operator=(CURL *c);
operator const CURL*(void) const { return _c; }
operator CURL*(void) { return _c; }
CURLcode misc_sets();
template<typename PT>
inline CURLcode easy_setopt(CURLoption o,PT p) { assert(_c); return curl_easy_setopt(_c,o,p); }
CURLcode easy_perform() { assert(_c); return curl_easy_perform(_c); }
template<typename IT>
inline CURLcode easy_getinfo(CURLINFO i,IT p) { assert(_c); return curl_easy_getinfo(_c,i,p); }
static inline CURL *easy_init() { return curl_easy_init(); }
virtual size_t write(void *p,size_t s,size_t nm) { return 0; }
CURLcode set_write();
+
+ virtual int progress(double dlt,double dln,double ult,double uln) { return 0; }
+ CURLcode set_progress();
+
+ virtual size_t header(void *p,size_t s,size_t nm) { return s*nm; }
+ CURLcode set_header();
};
}
}
#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
@@ -28,27 +28,52 @@ namespace opkele {
|| (r=easy_setopt(CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION))
|| (r=easy_setopt(CURLOPT_TIMEOUT,20))
#ifdef DISABLE_CURL_SSL_VERIFYHOST
|| (r=easy_setopt(CURLOPT_SSL_VERIFYHOST,0))
#endif
#ifdef DISABLE_CURL_SSL_VERIFYPEER
|| (r=easy_setopt(CURLOPT_SSL_VERIFYPEER,0))
#endif
;
return r;
}
static size_t _write(void *p,size_t s,size_t nm,void *stream) {
return ((curl_t*)stream)->write(p,s,nm);
}
CURLcode curl_t::set_write() {
assert(_c);
CURLcode r;
(r = easy_setopt(CURLOPT_WRITEDATA,this))
|| (r = easy_setopt(CURLOPT_WRITEFUNCTION,_write));
return r;
}
+ static int _progress(void *cp,double dlt,double dln,double ult,double uln) {
+ return ((curl_t*)cp)->progress(dlt,dln,ult,uln);
+ }
+
+ CURLcode curl_t::set_progress() {
+ assert(_c);
+ CURLcode r;
+ (r = easy_setopt(CURLOPT_PROGRESSDATA,this))
+ || (r = easy_setopt(CURLOPT_PROGRESSFUNCTION,_progress))
+ || (r = easy_setopt(CURLOPT_NOPROGRESS,0));
+ return r;
+ }
+
+ static size_t _header(void *p,size_t s,size_t nm,void *stream) {
+ return ((curl_t*)stream)->header(p,s,nm);
+ }
+
+ CURLcode curl_t::set_header() {
+ assert(_c);
+ CURLcode r;
+ (r = easy_setopt(CURLOPT_HEADERDATA,this))
+ || (r=easy_setopt(CURLOPT_HEADERFUNCTION,_header));
+ return r;
+ }
+
}
}