X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fhttp.c;h=0689a84eacf6a46eb50911b96cecb6acd2e8223a;hp=12f8b72a64c25c32c1e5668c5918de4e13f50b0d;hb=5bb795e97e53ef92cb7b28ee3598ad2aa4ec65d3;hpb=40d30b549ad41af63da74a3c7cb36db7f5e089e7

diff --git a/src/http.c b/src/http.c
index 12f8b72..0689a84 100644
--- a/src/http.c
+++ b/src/http.c
@@ -30,14 +30,16 @@
 #include "http.h"
 #include "log.h"
 
+struct http_session {
+	CURL *curl;
+	pthread_mutex_t lock;
+};
+
 struct ucontent {
 	char *data;
 	size_t len;
 };
 
-static CURL *curl;
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-
 static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
 {
 	size_t realsize;
@@ -55,18 +57,26 @@ static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
 	return realsize;
 }
 
-void http_init()
+struct http_session *http_session_new()
 {
-	if (!curl)
-		curl = curl_easy_init();
+	struct http_session *sess;
+
+	sess = malloc(sizeof(struct http_session));
+	sess->curl = curl_easy_init();
+	pthread_mutex_init(&sess->lock, NULL);
+
+	return sess;
 }
 
-void http_cleanup()
+void http_session_free(struct http_session *sess)
 {
-	curl_easy_cleanup(curl);
+	curl_easy_cleanup(sess->curl);
+	pthread_mutex_destroy(&sess->lock);
+	free(sess);
 }
 
-static char *http_get(const char *url, const char *content)
+static char *
+http_get(struct http_session *sess, const char *url, const char *content)
 {
 	struct ucontent chunk;
 	int result;
@@ -74,22 +84,22 @@ static char *http_get(const char *url, const char *content)
 	chunk.data = malloc(1);
 	chunk.len = 0;
 
-	pthread_mutex_lock(&lock);
+	pthread_mutex_lock(&sess->lock);
 
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_VERBOSE, 0);
+	curl_easy_setopt(sess->curl, CURLOPT_URL, url);
+	curl_easy_setopt(sess->curl, CURLOPT_VERBOSE, 1);
 	if (content) {
-		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, content);
-		curl_easy_setopt(curl,
+		curl_easy_setopt(sess->curl, CURLOPT_POSTFIELDS, content);
+		curl_easy_setopt(sess->curl,
 				 CURLOPT_POSTFIELDSIZE,
 				 (long)strlen(content));
 	}
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cbk_curl);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
+	curl_easy_setopt(sess->curl, CURLOPT_WRITEFUNCTION, cbk_curl);
+	curl_easy_setopt(sess->curl, CURLOPT_WRITEDATA, (void *)&chunk);
 
-	result = curl_easy_perform(curl);
+	result = curl_easy_perform(sess->curl);
 
-	pthread_mutex_unlock(&lock);
+	pthread_mutex_unlock(&sess->lock);
 
 	if (result == CURLE_OK)
 		return chunk.data;
@@ -100,7 +110,8 @@ static char *http_get(const char *url, const char *content)
 	return NULL;
 }
 
-json_object *http_json_get(const char *url, struct json_object *j)
+json_object *
+http_json_get(struct http_session *sess, const char *url, struct json_object *j)
 {
 	const char *in;
 	char *out;
@@ -111,7 +122,7 @@ json_object *http_json_get(const char *url, struct json_object *j)
 		       json_object_to_json_string(j));
 
 	in = json_object_to_json_string(j);
-	out = http_get(url, in);
+	out = http_get(sess, url, in);
 
 	if (out) {
 		result = json_tokener_parse(out);