ardour/livetrax
13
0
Fork 0
Code

WebSockets: allow compilation with lws < 2.1.0

Browse Source 
Old libwebsockets does not define lws_callback_http_dummy()
Conditionally use custom code instead
This commit is contained in:
Luciano Iam 2020-05-17 15:38:45 +02:00 committed by Robin Gareus
parent 3840264edd
commit e253302c62
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libs/surfaces/websockets/server.cc
View File

@ -38,6 +38,12 @@
#endif
#endif
/* libwebsockets version of LWS_LIBRARY_VERSION_NUMBER also appends
LWS_LIBRARY_VERSION_PATCH which can contain non-numeric characters
rendering it unsuitable for numeric version checks */
#define LWS_LIBRARY_VERSION_NUM (LWS_LIBRARY_VERSION_MAJOR * 1000000) + \
(LWS_LIBRARY_VERSION_MINOR * 1000)
#define MAX_INDEX_SIZE 65536
using namespace Glib;
@ -399,10 +405,37 @@ WebsocketsServer::lws_callback (struct lws* wsi, enum lws_callback_reasons reaso
case LWS_CALLBACK_DEL_POLL_FD:
rc = server->del_poll_fd (static_cast<struct lws_pollargs*> (in));
break;
#endif
#endif // LWS_WITH_GLIB
#if LWS_LIBRARY_VERSION_NUM >= 2001000
// lws_callback_http_dummy is not available on lws < 2.1.0
default:
rc = lws_callback_http_dummy (wsi, reason, user, in, len);
break;
#else
case LWS_CALLBACK_FILTER_NETWORK_CONNECTION:
case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION:
case LWS_CALLBACK_SERVER_NEW_CLIENT_INSTANTIATED:
case LWS_CALLBACK_PROTOCOL_INIT:
case LWS_CALLBACK_PROTOCOL_DESTROY:
case LWS_CALLBACK_WSI_CREATE:
case LWS_CALLBACK_WSI_DESTROY:
case LWS_CALLBACK_LOCK_POLL:
case LWS_CALLBACK_UNLOCK_POLL:
case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE:
case LWS_CALLBACK_FILTER_HTTP_CONNECTION:
/* do nothing but keep connection alive */
rc = 0;
break;
default:
#ifndef NDEBUG
/* see libwebsockets.h lws_callback_reasons */
std::cerr << "LWS: unhandled callback " << reason << std::endl;
#endif
rc = -1;
break;
#endif // LWS_LIBRARY_VERSION_NUM >= 2001000
}
return rc;