(no commit message)

diff --git a/src/http.c b/src/http.c
index 4438423..12f8b72 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -66,7 +66,7 @@ void http_cleanup()
        curl_easy_cleanup(curl);
 }
 
        curl_easy_cleanup(curl);
 }
 

-char *http_get(const char *url, const char *content)
+static char *http_get(const char *url, const char *content)

 {
        struct ucontent chunk;
        int result;
 {
        struct ucontent chunk;
        int result;

diff --git a/src/main.c b/src/main.c
index d649842..3957c8d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -465,6 +465,7 @@ int main(int argc, char **argv)
        log_init();
 
        http_init();
        log_init();
 
        http_init();

+       ws_init();

 
        gtk_init(NULL, NULL);
        settings = g_settings_new("prss");
 
        gtk_init(NULL, NULL);
        settings = g_settings_new("prss");

diff --git a/src/ttrss.c b/src/ttrss.c
index d01aac4..9833040 100644 (file)
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -113,7 +113,7 @@ void ttrss_set_config(const char *url, const char *user, const char *pwd)
 {
        feeds_free(data);
        data = NULL;
 {
        feeds_free(data);
        data = NULL;

-       ws_init(url, user, pwd);
+       ws_set_config(url, user, pwd);

 }
 
 struct feed *ttrss_get_feed(int id)
 }
 
 struct feed *ttrss_get_feed(int id)

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 267b129..3aa4959 100644 (file)
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -17,9 +17,11 @@
  * 02110-1301 USA
  */
 
  * 02110-1301 USA
  */
 

+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

-#include <stdio.h>
+
+#include <pthread.h>

 
 #include <json/json.h>
 
 
 #include <json/json.h>
 


@@ -28,6 +30,8 @@
 #include "ttrss_ws.h"
 #include "url.h"
 
 #include "ttrss_ws.h"
 #include "url.h"
 

+static pthread_mutex_t *lock;
+

 static char *session_id;
 static char *session_url;
 static char *session_user;
 static char *session_id;
 static char *session_url;
 static char *session_user;


@@ -57,7 +61,7 @@ struct json_object *ws_request_new(const char *op)
        return rq;
 }
 
        return rq;
 }
 

-void ws_init(const char *url, const char *user, const char *pwd)
+void ws_set_config(const char *url, const char *user, const char *pwd)

 {
        char *tmp;
 
 {
        char *tmp;
 


@@ -125,6 +129,8 @@ struct json_object *ws_execute(struct json_object *rq)
        struct json_object *result;
 
        log_debug("ws_execute()");
        struct json_object *result;
 
        log_debug("ws_execute()");

+       pthread_mutex_lock(lock);
+       log_debug("ws_execute() lock");

 
        err = NULL;
        result = execute(rq, &err);
 
        err = NULL;
        result = execute(rq, &err);


@@ -140,6 +146,11 @@ struct json_object *ws_execute(struct json_object *rq)
                free(err);
        }
 
                free(err);
        }
 

+       log_debug("ws_execute() unlock");
+       pthread_mutex_unlock(lock);
+
+       log_debug("ws_execute()");
+

        return result;
 }
 
        return result;
 }
 


@@ -192,7 +203,7 @@ char *ws_login()
 
 int ws_open_session()
 {
 
 int ws_open_session()
 {

-       int version, result;
+       int /*version, */result;

 
        log_debug("ws_open_session()");
 
 
        log_debug("ws_open_session()");
 


@@ -203,7 +214,7 @@ int ws_open_session()
        session_id = ws_login();
 
        if (session_id) {
        session_id = ws_login();
 
        if (session_id) {

-               version = ws_get_api_version();
+               /*version = ws_get_api_version();

                log_debug("API version= %d", version);
 
                if (version > 0) {
                log_debug("API version= %d", version);
 
                if (version > 0) {


@@ -212,7 +223,8 @@ int ws_open_session()
                        free(session_id);
                        session_id = NULL;
                        result = 0;
                        free(session_id);
                        session_id = NULL;
                        result = 0;

-               }
+                       }*/
+               result = 1;

        } else {
                result =  0;
        }
        } else {
                result =  0;
        }


@@ -378,3 +390,12 @@ void ws_set_article_unread(int id, int unread)
 
        log_debug("ws_set_article_unread(%d,%d) done", id, unread);
 }
 
        log_debug("ws_set_article_unread(%d,%d) done", id, unread);
 }

+
+void ws_init()
+{
+       pthread_mutexattr_t    attr;
+
+       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+       lock = malloc(sizeof(pthread_mutex_t));
+       pthread_mutex_init(lock, &attr);
+}

diff --git a/src/ttrss_ws.h b/src/ttrss_ws.h
index 2902434..cd09241 100644 (file)
--- a/src/ttrss_ws.h
+++ b/src/ttrss_ws.h
@@ -22,7 +22,8 @@
 
 #include "ttrss.h"
 
 
 #include "ttrss.h"
 

-void ws_init(const char *url, const char *user, const char *pwd);
+void ws_init();
+void ws_set_config(const char *url, const char *user, const char *pwd);

 int ws_open_session();
 
 struct json_object *ws_request_new(const char *op);
 int ws_open_session();
 
 struct json_object *ws_request_new(const char *op);