summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/consumer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 76b6ea7..f9212ea 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -121,25 +121,25 @@ namespace opkele {
121 string response; 121 string response;
122 CURLcode r; 122 CURLcode r;
123 (r=curl_misc_sets(curl)) 123 (r=curl_misc_sets(curl))
124 || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) 124 || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))
125 || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) 125 || (r=curl_easy_setopt(curl,CURLOPT_POST,1))
126 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) 126 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))
127 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) 127 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))
128 || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) 128 || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
129 || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) 129 || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))
130 ; 130 ;
131 if(r) 131 if(r)
132 throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); 132 throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
133 if(r=curl_easy_perform(curl)) 133 if( (r=curl_easy_perform(curl)) )
134 throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); 134 throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
135 params_t p; p.parse_keyvalues(response); 135 params_t p; p.parse_keyvalues(response);
136 if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1") 136 if(p.has_param("assoc_type") && p.get_param("assoc_type")!="HMAC-SHA1")
137 throw bad_input(OPKELE_CP_ "unsupported assoc_type"); 137 throw bad_input(OPKELE_CP_ "unsupported assoc_type");
138 string st; 138 string st;
139 if(p.has_param("session_type")) st = p.get_param("session_type"); 139 if(p.has_param("session_type")) st = p.get_param("session_type");
140 if((!st.empty()) && st!="DH-SHA1") 140 if((!st.empty()) && st!="DH-SHA1")
141 throw bad_input(OPKELE_CP_ "unsupported session_type"); 141 throw bad_input(OPKELE_CP_ "unsupported session_type");
142 secret_t secret; 142 secret_t secret;
143 if(st.empty()) { 143 if(st.empty()) {
144 secret.from_base64(p.get_param("mac_key")); 144 secret.from_base64(p.get_param("mac_key"));
145 }else{ 145 }else{
@@ -281,25 +281,25 @@ namespace opkele {
281 string response; 281 string response;
282 CURLcode r; 282 CURLcode r;
283 (r=curl_misc_sets(curl)) 283 (r=curl_misc_sets(curl))
284 || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str())) 284 || (r=curl_easy_setopt(curl,CURLOPT_URL,server.c_str()))
285 || (r=curl_easy_setopt(curl,CURLOPT_POST,1)) 285 || (r=curl_easy_setopt(curl,CURLOPT_POST,1))
286 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data())) 286 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDS,request.data()))
287 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length())) 287 || (r=curl_easy_setopt(curl,CURLOPT_POSTFIELDSIZE,request.length()))
288 || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring)) 288 || (r=curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,_curl_tostring))
289 || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response)) 289 || (r=curl_easy_setopt(curl,CURLOPT_WRITEDATA,&response))
290 ; 290 ;
291 if(r) 291 if(r)
292 throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r); 292 throw exception_curl(OPKELE_CP_ "failed to curl_easy_setopt()",r);
293 if(r=curl_easy_perform(curl)) 293 if( (r=curl_easy_perform(curl)) )
294 throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); 294 throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
295 params_t pp; pp.parse_keyvalues(response); 295 params_t pp; pp.parse_keyvalues(response);
296 if(pp.has_param("invalidate_handle")) 296 if(pp.has_param("invalidate_handle"))
297 invalidate_assoc(server,pp.get_param("invalidate_handle")); 297 invalidate_assoc(server,pp.get_param("invalidate_handle"));
298 if(pp.has_param("is_valid")) { 298 if(pp.has_param("is_valid")) {
299 if(pp.get_param("is_valid")=="true") 299 if(pp.get_param("is_valid")=="true")
300 return; 300 return;
301 }else if(pp.has_param("lifetime")) { 301 }else if(pp.has_param("lifetime")) {
302 if(util::string_to_long(pp.get_param("lifetime"))) 302 if(util::string_to_long(pp.get_param("lifetime")))
303 return; 303 return;
304 } 304 }
305 throw failed_check_authentication(OPKELE_CP_ "failed to verify response"); 305 throw failed_check_authentication(OPKELE_CP_ "failed to verify response");