X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-client.c;h=e9c1a90619379f6ab3862b534c164e2c44aed8e5;hb=779f425daa66d2b0cd431fdc6f7f4ed976cbae15;hp=2569d1350fba05f0b64ea914aaccc49fe42872be;hpb=c7e9786d408f13d8f8f43c6b68da916bbb1ed5f3;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws-client.c b/src/afb-ws-client.c
index 2569d135..e9c1a906 100644
--- a/src/afb-ws-client.c
+++ b/src/afb-ws-client.c
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <fcntl.h>
 
 #include "afb-wsj1.h"
 
@@ -200,15 +201,15 @@ static int receive_response(int fd, const char **protocols, const char *ack)
 		goto error;
 	len = strcspn(line, " ");
 	if (len != 8 || 0 != strncmp(line, "HTTP/1.1", 8))
-		goto error;
+		goto abort;
 	it = line + len;
 	len = strspn(it, " ");
 	if (len == 0)
-		goto error;
+		goto abort;
 	it += len;
 	len = strcspn(it, " ");
 	if (len != 3 || 0 != strncmp(it, "101", 3))
-		goto error;
+		goto abort;
 
 	/* reads the rest of the response until empty line */
 	clen = 0;
@@ -249,15 +250,13 @@ static int receive_response(int fd, const char **protocols, const char *ack)
 	if (clen > 0) {
 		while (read(fd, line, len) < 0 && errno == EINTR);
 	}
-	if (haserr != 0)
-		result = -1;
-	else if (result < 0) {
-		result = 0;
-		while(protocols[result] != NULL)
-			result++;
-	}
-error:
+	if (haserr != 0 || result < 0)
+		goto abort;
 	return result;
+abort:
+	errno = ECONNABORTED;
+error:
+	return -1;
 }
 
 static int negociate(int fd, const char **protocols, const char *path, const char *host)
@@ -365,8 +364,10 @@ struct afb_wsj1 *afb_ws_client_connect_wsj1(const char *uri, struct afb_wsj1_itf
 				rc = negociate(fd, proto_json1, path, xhost);
 				if (rc == 0) {
 					result = afb_wsj1_create(fd, itf, closure);
-					if (result != NULL)
+					if (result != NULL) {
+						fcntl(fd, F_SETFL, O_NONBLOCK);
 						break;
+					}
 				}
 			}
 			close(fd);