| -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 @@ -30,12 +30,18 @@ namespace opkele { 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(); }; } } diff --git a/lib/curl.cc b/lib/curl.cc index 3e69b47..6172828 100644 --- a/lib/curl.cc +++ b/lib/curl.cc @@ -46,9 +46,34 @@ namespace opkele { 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; + } + } } |