added header and progress callbacks to curl wrapper

Signed-off-by: Michael Krelin <hacker@klever.net>

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 @@
 #ifndef __OPKELE_CURL_H
 #define __OPKELE_CURL_H
 
 #include <cassert>
 #include <curl/curl.h>
 
 namespace opkele {
 
     namespace util {
 
 	class curl_t {
 	    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
@@ -1,54 +1,79 @@
 #include <opkele/curl.h>
 
 #include "config.h"
 
 namespace opkele {
 
     namespace util {
 
 	curl_t::~curl_t() throw() {
 	    if(_c)
 		curl_easy_cleanup(_c);
 	}
 
 	curl_t& curl_t::operator=(CURL *c) {
 	    if(_c)
 		curl_easy_cleanup(_c);
 	    _c = c;
 	    return *this;
 	}
 
 	CURLcode curl_t::misc_sets() {
 	    assert(_c);
 	    CURLcode r;
 	    (r=easy_setopt(CURLOPT_FOLLOWLOCATION,1))
 	    || (r=easy_setopt(CURLOPT_MAXREDIRS,5))
 	    || (r=easy_setopt(CURLOPT_DNS_CACHE_TIMEOUT,120))
 	    || (r=easy_setopt(CURLOPT_DNS_USE_GLOBAL_CACHE,1))
 	    || (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;
+	}
+
     }
 
 }