Fedora 30 packaging fix issu

[src/app-framework-binder.git] / src / afb-proto-ws.c

diff --git a/src/afb-proto-ws.c b/src/afb-proto-ws.c
index 89d4522..f407086 100644 (file)
--- a/src/afb-proto-ws.c
+++ b/src/afb-proto-ws.c
@@ -35,8 +35,8 @@
 #include "afb-ws.h"
 #include "afb-msg-json.h"
 #include "afb-proto-ws.h"
-#include "jobs.h"
 #include "fdev.h"
+#include "verbose.h"
 
 struct afb_proto_ws;
 
@@ -160,7 +160,7 @@ struct afb_proto_ws
        void (*on_hangup)(void *closure);
 
        /* queuing facility for processing messages */
-       int (*queuing)(void (*process)(int s, void *c), void *closure);
+       int (*queuing)(struct afb_proto_ws *proto, void (*process)(int s, void *c), void *closure);
 };
 
 /******************* streaming objects **********************************/
@@ -347,7 +347,7 @@ static void queue_message_processing(struct afb_proto_ws *protows, char *data, s
                        binary->rb.head = data;
                        binary->rb.end = data + size;
                        if (!protows->queuing
-                        || protows->queuing(processing, binary) < 0)
+                        || protows->queuing(protows, processing, binary) < 0)
                                processing(0, binary);
                        return;
                }
@@ -515,6 +515,8 @@ static void client_on_event_create(struct afb_proto_ws *protows, struct readbuf
 
        if (protows->client_itf->on_event_create && client_msg_event_read(rb, &event_id, &event_name))
                protows->client_itf->on_event_create(protows->closure, event_name, (int)event_id);
+       else
+               ERROR("Ignoring creation of event");
 }
 
 /* removes an event */
@@ -525,6 +527,8 @@ static void client_on_event_remove(struct afb_proto_ws *protows, struct readbuf
 
        if (protows->client_itf->on_event_remove && client_msg_event_read(rb, &event_id, &event_name))
                protows->client_itf->on_event_remove(protows->closure, event_name, (int)event_id);
+       else
+               ERROR("Ignoring deletion of event");
 }
 
 /* subscribes an event */
@@ -536,6 +540,8 @@ static void client_on_event_subscribe(struct afb_proto_ws *protows, struct readb
 
        if (protows->client_itf->on_event_subscribe && client_msg_call_get(protows, rb, &call) && client_msg_event_read(rb, &event_id, &event_name))
                protows->client_itf->on_event_subscribe(protows->closure, call->request, event_name, (int)event_id);
+       else
+               ERROR("Ignoring subscription to event");
 }
 
 /* unsubscribes an event */
@@ -547,6 +553,8 @@ static void client_on_event_unsubscribe(struct afb_proto_ws *protows, struct rea
 
        if (protows->client_itf->on_event_unsubscribe && client_msg_call_get(protows, rb, &call) && client_msg_event_read(rb, &event_id, &event_name))
                protows->client_itf->on_event_unsubscribe(protows->closure, call->request, event_name, (int)event_id);
+       else
+               ERROR("Ignoring unsubscription to event");
 }
 
 /* receives broadcasted events */
@@ -557,6 +565,8 @@ static void client_on_event_broadcast(struct afb_proto_ws *protows, struct readb
 
        if (protows->client_itf->on_event_broadcast && readbuf_string(rb, &event_name, NULL) && readbuf_object(rb, &object))
                protows->client_itf->on_event_broadcast(protows->closure, event_name, object);
+       else
+               ERROR("Ignoring broadcast of event");
 }
 
 /* pushs an event */
@@ -568,6 +578,8 @@ static void client_on_event_push(struct afb_proto_ws *protows, struct readbuf *r
 
        if (protows->client_itf->on_event_push && client_msg_event_read(rb, &event_id, &event_name) && readbuf_object(rb, &object))
                protows->client_itf->on_event_push(protows->closure, event_name, (int)event_id, object);
+       else
+               ERROR("Ignoring push of event");
 }
 
 static void client_on_reply(struct afb_proto_ws *protows, struct readbuf *rb)
@@ -1022,7 +1034,7 @@ struct afb_proto_ws *afb_proto_ws_create_server(struct fdev *fdev, const struct
 
 void afb_proto_ws_unref(struct afb_proto_ws *protows)
 {
-       if (!__atomic_sub_fetch(&protows->refcount, 1, __ATOMIC_RELAXED)) {
+       if (protows && !__atomic_sub_fetch(&protows->refcount, 1, __ATOMIC_RELAXED)) {
                afb_proto_ws_hangup(protows);
                afb_ws_destroy(protows->ws);
                pthread_mutex_destroy(&protows->mutex);
@@ -1055,7 +1067,7 @@ void afb_proto_ws_on_hangup(struct afb_proto_ws *protows, void (*on_hangup)(void
        protows->on_hangup = on_hangup;
 }
 
-void afb_proto_ws_set_queuing(struct afb_proto_ws *protows, int (*queuing)(void (*)(int,void*), void*))
+void afb_proto_ws_set_queuing(struct afb_proto_ws *protows, int (*queuing)(struct afb_proto_ws*, void (*)(int,void*), void*))
 {
        protows->queuing = queuing;
 }