Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fix defines for websocket support

Browse source
This commit is contained in:
Steffen Vogel 2018-07-18 08:13:34 +02:00
parent 583e3b730f
commit 1e46313d49
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/villas/config.h.in
View file

@ -76,7 +76,7 @@ extern "C"{
#cmakedefine HAS_SEMAPHORE
#cmakedefine LIBWEBSOCKETS_FOUND
#cmakedefine Libwebsockets_FOUND
#cmakedefine HDF5_FOUND
#cmakedefine PROTOBUF_FOUND
#cmakedefine LIBNL3_ROUTE_FOUND

4
lib/web.c
View file

@ -58,14 +58,14 @@ struct lws_protocols protocols[] = {
.rx_buffer_size = 0
},
#endif /* WITH_API */
#ifdef LIBWEBSOCKETS_FOUND
#ifdef Libwebsockets_FOUND
{
.name = "live",
.callback = websocket_protocol_cb,
.per_session_data_size = sizeof(struct websocket_connection),
.rx_buffer_size = 0
},
#endif /* LIBWEBSOCKETS_FOUND */
#endif /* Libwebsockets_FOUND */
#if 0 /* not supported yet */
{
.name = "log",

10
src/villas-pipe.cpp
View file

@ -351,20 +351,20 @@ check: if (optarg == endptr)
if (!node)
error("Node '%s' does not exist!", nodestr);
#ifdef LIBWEBSOCKETS_FOUND
#ifdef Libwebsockets_FOUND
/* Only start web subsystem if villas-pipe is used with a websocket node */
if (node->_vt->start == websocket_start) {
if (node_type(node)->start == websocket_start) {
web_start(&sn.web);
api_start(&sn.api);
}
#endif /* LIBWEBSOCKETS_FOUND */
#endif /* Libwebsockets_FOUND */
if (reverse)
node_reverse(node);
ret = node_type_start(node->_vt, &sn);
ret = node_type_start(node_type(node), &sn);
if (ret)
error("Failed to intialize node type: %s", node_type_name(node->_vt));
error("Failed to intialize node type: %s", node_type_name(node_type(node)));
ret = node_check(node);
if (ret)