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

pipe: do not start API

Browse source
This commit is contained in:
Steffen Vogel 2019-04-05 19:36:21 +02:00
parent 8a8dd30370
commit 487672e9af
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/api/sessions/http.cpp
View file

@ -147,9 +147,11 @@ int api_http_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, void
void *user_ctx = lws_context_user(ctx);
Web *w = static_cast<Web *>(user_ctx);
Http *s = static_cast<Http *>(user);
Api *a = w->getApi();
Http *s = static_cast<Http *>(user);
if (a == nullptr)
return -1;
switch (reason) {
case LWS_CALLBACK_HTTP_BIND_PROTOCOL:

6
lib/api/sessions/websocket.cpp
View file

@ -104,10 +104,12 @@ int api_ws_protocol_cb(lws *wsi, enum lws_callback_reasons reason, void *user, v
lws_context *ctx = lws_get_context(wsi);
void *user_ctx = lws_context_user(ctx);
Web *w = static_cast<Web*>(user_ctx);
Web *w = static_cast<Web *>(user_ctx);
WebSocket *s = static_cast<WebSocket *>(user);
Api *a = w->getApi();
WebSocket *s = static_cast<WebSocket *>(user);
if (a == nullptr)
return -1;
switch (reason) {
case LWS_CALLBACK_ESTABLISHED:

3
src/villas-pipe.cpp
View file

@ -378,10 +378,7 @@ check: if (optarg == endptr)
/* Only start web subsystem if villas-pipe is used with a websocket node */
if (node_type(node)->start == websocket_start) {
Web *w = sn.getWeb();
Api *a = sn.getApi();
w->start();
a->start();
}
#endif /* WITH_NODE_WEBSOCKET */