1 files changed, 44 insertions, 61 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 20f4174..c155157 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -18,2 +18,3 @@ namespace opkele {
    using namespace std;
+    using util::curl_t;
@@ -63,20 +64,2 @@ namespace opkele {
-    static CURLcode curl_misc_sets(CURL* c) {
-        CURLcode r;
-        (r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1))
-        || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5))
-        || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120))
-        || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1))
-        || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION))
-        || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20))
-        #ifdefDISABLE_CURL_SSL_VERIFYHOST
-        || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0))
-#endif
-        #ifdefDISABLE_CURL_SSL_VERIFYPEER
-        || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0))
-#endif
-        ;
-        return r;
-    }
    static size_t _curl_tostring(void *ptr,size_t size,size_t nmemb,void *stream) {
@@ -103,19 +86,19 @@ namespace opkele {
        request += util::url_encode(util::bignum_to_base64(dh->pub_key));
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
        if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl");
        string response;
        CURLcode r;
-        (r=curl_misc_sets(curl))
+        (r=curl.misc_sets())
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_URL,server.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POST,1))
+        || (r=curl.easy_setopt(CURLOPT_POST,1))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length()))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
+        || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))
+        || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response))
        ;
        if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
-        if( (r=curl_easy_perform(curl)) )
+        if( (r=curl.easy_perform()) )
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
        params_t p; p.parse_keyvalues(response);
@@ -263,19 +246,19 @@ namespace opkele {
        }
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
        if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl");
        string response;
        CURLcode r;
-        (r=curl_misc_sets(curl))
+        (r=curl.misc_sets())
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_URL,server.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POST,1))
+        || (r=curl.easy_setopt(CURLOPT_POST,1))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data()))
-        || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))
+        || (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length()))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
+        || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))
+        || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response))
        ;
        if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
-        if( (r=curl_easy_perform(curl)) )
+        if( (r=curl.easy_perform()) )
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
        params_t pp; pp.parse_keyvalues(response);
@@ -296,17 +279,17 @@ namespace opkele {
        delegate.erase();
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
        if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl");
        string html;
        CURLcode r;
-        (r=curl_misc_sets(curl))
+        (r=curl.misc_sets())
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_URL,url.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
+        || (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
-        || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html))
+        || (r=curl.easy_setopt(CURLOPT_WRITEDATA,&html))
        ;
        if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
-        r = curl_easy_perform(curl);
+        r = curl.easy_perform();
        if(r && r!=CURLE_WRITE_ERROR)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
        static const char *re_bre = "<\\s*body\\b", *re_hdre = "<\\s*head[^>]*>",
@@ -402,20 +385,20 @@ namespace opkele {
        string rv = normalize(url);
-        util::curl_t curl = curl_easy_init();
+        curl_t curl = curl_t::easy_init();
        if(!curl)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");
+            throw exception_curl(OPKELE_CP_ "failed to initialize curl()");
        string html;
        CURLcode r;
-        (r=curl_misc_sets(curl))
+        (r=curl.misc_sets())
-        || (r=curl_easy_setopt(curl,CURLOPT_URL,rv.c_str()))
+        || (r=curl.easy_setopt(CURLOPT_URL,rv.c_str()))
-        || (r=curl_easy_setopt(curl,CURLOPT_NOBODY,1))
+        || (r=curl.easy_setopt(CURLOPT_NOBODY,1))
        ;
        if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
+            throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
-        r = curl_easy_perform(curl);
+        r = curl.easy_perform();
        if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
+            throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
        const char *eu = 0;
-        r = curl_easy_getinfo(curl,CURLINFO_EFFECTIVE_URL,&eu);
+        r = curl.easy_getinfo(CURLINFO_EFFECTIVE_URL,&eu);
        if(r)
-            throw exception_curl(OPKELE_CP_ "failed to curl_easy_getinfo(..CURLINFO_EFFECTIVE_URL..)",r);
+            throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r);
        rv = eu;

diff --git a/lib/consumer.cc b/lib/consumer.cc index 20f4174..c155157 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc
@@ -18,2 +18,3 @@ namespace opkele {
18	using namespace std;	18	using namespace std;
		19	using util::curl_t;
19		20
@@ -63,20 +64,2 @@ namespace opkele {
63		64
64	static CURLcode curl_misc_sets(CURL* c) {
65	CURLcode r;
66	(r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1))
67	\|\| (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5))
68	\|\| (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120))
69	\|\| (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1))
70	\|\| (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION))
71	\|\| (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20))
72	#ifdefDISABLE_CURL_SSL_VERIFYHOST
73	\|\| (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0))
74	#endif
75	#ifdefDISABLE_CURL_SSL_VERIFYPEER
76	\|\| (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0))
77	#endif
78	;
79	return r;
80	}
81
82	static size_t _curl_tostring(void ptr,size_t size,size_t nmemb,void stream) {	65	static size_t _curl_tostring(void ptr,size_t size,size_t nmemb,void stream) {
@@ -103,19 +86,19 @@ namespace opkele {
103	request += util::url_encode(util::bignum_to_base64(dh->pub_key));	86	request += util::url_encode(util::bignum_to_base64(dh->pub_key));
104	util::curl_t curl = curl_easy_init();	87	curl_t curl = curl_t::easy_init();
105	if(!curl)	88	if(!curl)
106	throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");	89	throw exception_curl(OPKELE_CP_ "failed to initialize curl");
107	string response;	90	string response;
108	CURLcode r;	91	CURLcode r;
109	(r=curl_misc_sets(curl))	92	(r=curl.misc_sets())
110	\|\| (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))	93	\|\| (r=curl.easy_setopt(CURLOPT_URL,server.c_str()))
111	\|\| (r=curl_easy_setopt(curl,CURLOPT_POST,1))	94	\|\| (r=curl.easy_setopt(CURLOPT_POST,1))
112	\|\| (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))	95	\|\| (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data()))
113	\|\| (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))	96	\|\| (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length()))
114	\|\| (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))	97	\|\| (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
115	\|\| (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))	98	\|\| (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response))
116	;	99	;
117	if(r)	100	if(r)
118	throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);	101	throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
119	if( (r=curl_easy_perform(curl)) )	102	if( (r=curl.easy_perform()) )
120	throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);	103	throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
121	params_t p; p.parse_keyvalues(response);	104	params_t p; p.parse_keyvalues(response);
@@ -263,19 +246,19 @@ namespace opkele {
263	}	246	}
264	util::curl_t curl = curl_easy_init();	247	curl_t curl = curl_t::easy_init();
265	if(!curl)	248	if(!curl)
266	throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");	249	throw exception_curl(OPKELE_CP_ "failed to initialize curl");
267	string response;	250	string response;
268	CURLcode r;	251	CURLcode r;
269	(r=curl_misc_sets(curl))	252	(r=curl.misc_sets())
270	\|\| (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))	253	\|\| (r=curl.easy_setopt(CURLOPT_URL,server.c_str()))
271	\|\| (r=curl_easy_setopt(curl,CURLOPT_POST,1))	254	\|\| (r=curl.easy_setopt(CURLOPT_POST,1))
272	\|\| (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))	255	\|\| (r=curl.easy_setopt(CURLOPT_POSTFIELDS,request.data()))
273	\|\| (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))	256	\|\| (r=curl.easy_setopt(CURLOPT_POSTFIELDSIZE,request.length()))
274	\|\| (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))	257	\|\| (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
275	\|\| (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))	258	\|\| (r=curl.easy_setopt(CURLOPT_WRITEDATA,&response))
276	;	259	;
277	if(r)	260	if(r)
278	throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);	261	throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
279	if( (r=curl_easy_perform(curl)) )	262	if( (r=curl.easy_perform()) )
280	throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);	263	throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
281	params_t pp; pp.parse_keyvalues(response);	264	params_t pp; pp.parse_keyvalues(response);
@@ -296,17 +279,17 @@ namespace opkele {
296	delegate.erase();	279	delegate.erase();
297	util::curl_t curl = curl_easy_init();	280	curl_t curl = curl_t::easy_init();
298	if(!curl)	281	if(!curl)
299	throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");	282	throw exception_curl(OPKELE_CP_ "failed to initialize curl");
300	string html;	283	string html;
301	CURLcode r;	284	CURLcode r;
302	(r=curl_misc_sets(curl))	285	(r=curl.misc_sets())
303	\|\| (r=curl_easy_setopt(curl,CURLOPT_URL,url.c_str()))	286	\|\| (r=curl.easy_setopt(CURLOPT_URL,url.c_str()))
304	\|\| (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))	287	\|\| (r=curl.easy_setopt(CURLOPT_WRITEFUNCTION,_curl_tostring))
305	\|\| (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&html))	288	\|\| (r=curl.easy_setopt(CURLOPT_WRITEDATA,&html))
306	;	289	;
307	if(r)	290	if(r)
308	throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);	291	throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
309	r = curl_easy_perform(curl);	292	r = curl.easy_perform();
310	if(r && r!=CURLE_WRITE_ERROR)	293	if(r && r!=CURLE_WRITE_ERROR)
311	throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);	294	throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
312	static const char re_bre = "<\\sbody\\b", re_hdre = "<\\shead[^>]*>",	295	static const char re_bre = "<\\sbody\\b", re_hdre = "<\\shead[^>]*>",
@@ -402,20 +385,20 @@ namespace opkele {
402	string rv = normalize(url);	385	string rv = normalize(url);
403	util::curl_t curl = curl_easy_init();	386	curl_t curl = curl_t::easy_init();
404	if(!curl)	387	if(!curl)
405	throw exception_curl(OPKELE_CP_ "failed to curl_easy_init()");	388	throw exception_curl(OPKELE_CP_ "failed to initialize curl()");
406	string html;	389	string html;
407	CURLcode r;	390	CURLcode r;
408	(r=curl_misc_sets(curl))	391	(r=curl.misc_sets())
409	\|\| (r=curl_easy_setopt(curl,CURLOPT_URL,rv.c_str()))	392	\|\| (r=curl.easy_setopt(CURLOPT_URL,rv.c_str()))
410	\|\| (r=curl_easy_setopt(curl,CURLOPT_NOBODY,1))	393	\|\| (r=curl.easy_setopt(CURLOPT_NOBODY,1))
411	;	394	;
412	if(r)	395	if(r)
413	throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);	396	throw exception_curl(OPKELE_CP_ "failed to set curly options",r);
414	r = curl_easy_perform(curl);	397	r = curl.easy_perform();
415	if(r)	398	if(r)
416	throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);	399	throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
417	const char *eu = 0;	400	const char *eu = 0;
418	r = curl_easy_getinfo(curl,CURLINFO_EFFECTIVE_URL,&eu);	401	r = curl.easy_getinfo(CURLINFO_EFFECTIVE_URL,&eu);
419	if(r)	402	if(r)
420	throw exception_curl(OPKELE_CP_ "failed to curl_easy_getinfo(..CURLINFO_EFFECTIVE_URL..)",r);	403	throw exception_curl(OPKELE_CP_ "failed to get CURLINFO_EFFECTIVE_URL",r);
421	rv = eu;	404	rv = eu;