Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add gitreview file for Lucky Lamprey branch
[src/app-framework-binder.git]
/
src
/
afb-ws-client.c
diff --git
a/src/afb-ws-client.c
b/src/afb-ws-client.c
index
7e1a04f
..
d1cea8c
100644
(file)
--- a/
src/afb-ws-client.c
+++ b/
src/afb-ws-client.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 201
6, 2017
"IoT.bzh"
+ * Copyright (C) 201
5-2020
"IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author: José Bollo <jose.bollo@iot.bzh>
*
* 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 */
struct addrinfo hint, *rai, *iai;
/* scan the uri */
- api = strrchr(uri, '/');
service = strrchr(uri, ':');
service = strrchr(uri, ':');
- if (
api == NULL || service == NULL || api < service
) {
+ if (
service == NULL
) {
errno = EINVAL;
return -1;
}
errno = EINVAL;
return -1;
}
+ api = strchrnul(service, '/');
host = strndupa(uri, service++ - uri);
service = strndupa(service, api - 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);
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);
else
/* inet socket */
fd = get_socket_inet(uri);
@@
-499,12
+502,13
@@
static int get_socket(const char *uri)
}
return fd;
}
}
return fd;
}
+
/*
* Establish a websocket-like client connection to the API of 'uri' and if successful
/*
* Establish a websocket-like client connection to the API of 'uri' and if successful
- * instan
c
iate a client afb_proto_ws websocket for this API using 'itf' and 'closure'.
+ * instan
t
iate 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.
* (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 appriately.
+ * Returns NULL in case of failure with errno set appr
opr
iately.
*/
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)
{
*/
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)
{