From 1e46313d49e7fecdbf8ee6d0b64e594300c9b16a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 18 Jul 2018 08:13:34 +0200 Subject: [PATCH] fix defines for websocket support --- include/villas/config.h.in | 2 +- lib/web.c | 4 ++-- src/villas-pipe.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/villas/config.h.in b/include/villas/config.h.in index 282818f4d..2612bb2f1 100644 --- a/include/villas/config.h.in +++ b/include/villas/config.h.in @@ -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 diff --git a/lib/web.c b/lib/web.c index 37047a3d7..30b15cd27 100644 --- a/lib/web.c +++ b/lib/web.c @@ -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", diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp index 99f3c65d3..097f56f77 100644 --- a/src/villas-pipe.cpp +++ b/src/villas-pipe.cpp @@ -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)