X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-binder.git;a=blobdiff_plain;f=src%2Fafb-ws-client.c;h=d1cea8c71d06defdd28b024fa3f68855b672b8de;hp=f00707c341f608342dca86ab0f3476bb1aa6fc27;hb=65353dce81a629e042800bb7b86fcd869a76727e;hpb=9b1f8506d92d34fc51763561421b393aaf040d90

diff --git a/src/afb-ws-client.c b/src/afb-ws-client.c
index f00707c3..d1cea8c7 100644
--- a/src/afb-ws-client.c
+++ b/src/afb-ws-client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "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");
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 
 #include "afb-wsj1.h"
+#include "fdev-systemd.h"
 
 /**************** WebSocket handshake ****************************/
 
@@ -320,6 +321,7 @@ struct afb_wsj1 *afb_ws_client_connect_wsj1(struct sd_event *eloop, const char *
 	const char *path;
 	struct addrinfo hint, *rai, *iai;
 	struct afb_wsj1 *result;
+	struct fdev *fdev;
 
 	/* scan the uri */
 	rc = parse_uri(uri, &host, &service, &path);
@@ -354,10 +356,13 @@ struct afb_wsj1 *afb_ws_client_connect_wsj1(struct sd_event *eloop, const char *
 			if (rc == 0) {
 				rc = negociate(fd, proto_json1, path, xhost);
 				if (rc == 0) {
-					result = afb_wsj1_create(eloop, fd, itf, closure);
-					if (result != NULL) {
-						fcntl(fd, F_SETFL, O_NONBLOCK);
-						break;
+					fdev = fdev_systemd_create(eloop, fd);
+					if (fdev) {
+						result = afb_wsj1_create(fdev, itf, closure);
+						if (result != NULL) {
+							fcntl(fd, F_SETFL, O_NONBLOCK);
+							break;
+						}
 					}
 				}
 			}
@@ -397,4 +402,130 @@ static char *makequery(const char *path, const char *uuid, const char *token)
 }
 #endif
 
+/*****************************************************************************************************************************/
+
+#include <sys/un.h>
+#include "afb-proto-ws.h"
+
+static int get_socket_unix(const char *uri)
+{
+	int fd, rc;
+	struct sockaddr_un addr;
+	size_t length;
+
+	length = strlen(uri);
+	if (length >= 108) {
+		errno = ENAMETOOLONG;
+		return -1;
+	}
+
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0)
+		return fd;
+
+	memset(&addr, 0, sizeof addr);
+	addr.sun_family = AF_UNIX;
+	strcpy(addr.sun_path, uri);
+	if (addr.sun_path[0] == '@')
+		addr.sun_path[0] = 0; /* implement abstract sockets */
+	rc = connect(fd, (struct sockaddr *) &addr, (socklen_t)(sizeof addr));
+	if (rc < 0) {
+		close(fd);
+		return rc;
+	}
+	return fd;
+}
+
+static int get_socket_inet(const char *uri)
+{
+	int rc, fd;
+	const char *service, *host, *api;
+	struct addrinfo hint, *rai, *iai;
+
+	/* scan the uri */
+	service = strrchr(uri, ':');
+	if (service == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+	api = strchrnul(service, '/');
+	host = strndupa(uri, service++ - uri);
+	service = strndupa(service, api - service);
+
+	/* get addr */
+	memset(&hint, 0, sizeof hint);
+	hint.ai_family = AF_INET;
+	hint.ai_socktype = SOCK_STREAM;
+	rc = getaddrinfo(host, service, &hint, &rai);
+	if (rc != 0) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	/* get the socket */
+	iai = rai;
+	while (iai != NULL) {
+		fd = socket(iai->ai_family, iai->ai_socktype, iai->ai_protocol);
+		if (fd >= 0) {
+			rc = connect(fd, iai->ai_addr, iai->ai_addrlen);
+			if (rc == 0) {
+				freeaddrinfo(rai);
+				return fd;
+			}
+			close(fd);
+		}
+		iai = iai->ai_next;
+	}
+	freeaddrinfo(rai);
+	return -1;
+}
+
+static int get_socket(const char *uri)
+{
+	int fd;
+
+	/* check for unix socket */
+	if (0 == strncmp(uri, "unix:", 5))
+		/* unix socket */
+		fd = get_socket_unix(uri + 5);
+	else if (0 == strncmp(uri, "tcp:", 4))
+		/* unix socket */
+		fd = get_socket_inet(uri + 4);
+	else
+		/* inet socket */
+		fd = get_socket_inet(uri);
+
+	/* configure the socket */
+	if (fd >= 0) {
+		fcntl(fd, F_SETFD, FD_CLOEXEC);
+		fcntl(fd, F_SETFL, O_NONBLOCK);
+	}
+	return fd;
+}
+
+/*
+ * Establish a websocket-like client connection to the API of 'uri' and if successful
+ * instantiate a client afb_proto_ws websocket for this API using 'itf' and 'closure'.
+ * (see afb_proto_ws_create_client).
+ * The systemd event loop 'eloop' is used to handle the websocket.
+ * Returns NULL in case of failure with errno set appropriately.
+ */
+struct afb_proto_ws *afb_ws_client_connect_api(struct sd_event *eloop, const char *uri, struct afb_proto_ws_client_itf *itf, void *closure)
+{
+	int fd;
+	struct afb_proto_ws *pws;
+	struct fdev *fdev;
+
+	fd = get_socket(uri);
+	if (fd >= 0) {
+		fdev = fdev_systemd_create(eloop, fd);
+		if (fdev) {
+			pws = afb_proto_ws_create_client(fdev, itf, closure);
+			if (pws)
+				return pws;
+		}
+		close(fd);
+	}
+	return NULL;
+}