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=a0c37f31317dbdd975b684b494fd3f836fb91699;hb=65353dce81a629e042800bb7b86fcd869a76727e;hpb=4a73fa6fce2d3df39872e2767811ad4d6b533087 diff --git a/src/afb-ws-client.c b/src/afb-ws-client.c index a0c37f31..d1cea8c7 100644 --- a/src/afb-ws-client.c +++ b/src/afb-ws-client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017, 2018 "IoT.bzh" + * Copyright (C) 2015-2020 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -443,12 +443,12 @@ static int get_socket_inet(const char *uri) struct addrinfo hint, *rai, *iai; /* scan the uri */ - api = strrchr(uri, '/'); service = strrchr(uri, ':'); - if (api == NULL || service == NULL || api < service) { + if (service == NULL) { errno = EINVAL; return -1; } + api = strchrnul(service, '/'); host = strndupa(uri, service++ - uri); service = strndupa(service, api - service); @@ -488,6 +488,9 @@ static int get_socket(const char *uri) 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); @@ -499,6 +502,7 @@ static int get_socket(const char *uri) } 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'.