X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws.c;h=1db9ad5445dd0417bb520b1fa0c611e9d32a408a;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=ca04c7fed3d7b66b9129cf866bf93b3d3cd1984e;hpb=24d000c2290126abf88204089d132229d63f9a05;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws.c b/src/afb-ws.c
index ca04c7fe..1db9ad54 100644
--- a/src/afb-ws.c
+++ b/src/afb-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -120,6 +120,7 @@ static void aws_disconnect(struct afb_ws *ws, int call_on_hangup)
 	struct websock *wsi = ws->ws;
 	if (wsi != NULL) {
 		ws->ws = NULL;
+		fdev_set_callback(ws->fdev, NULL, 0);
 		fdev_unref(ws->fdev);
 		websock_destroy(wsi);
 		free(ws->buffer.buffer);
@@ -131,10 +132,10 @@ static void aws_disconnect(struct afb_ws *ws, int call_on_hangup)
 
 static void fdevcb(void *ws, uint32_t revents, struct fdev *fdev)
 {
-	if ((revents & EPOLLIN) != 0)
-		aws_on_readable(ws);
 	if ((revents & EPOLLHUP) != 0)
 		afb_ws_hangup(ws);
+	else if ((revents & EPOLLIN) != 0)
+		aws_on_readable(ws);
 }
 
 /*