roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

websock: compile fixed for base ubuntu build

Browse source
This commit is contained in:
Roland Conybeare 2023-10-18 11:38:32 -04:00
commit 0de914aea5
2 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/websock/Webserver.cpp
View file

@ -1561,25 +1561,29 @@ namespace xo {
* and whether or not .per_session_data_size is 0.
* .tx_packet_size
*/
p_v->push_back({
"http",
&WebserverImpl::notify_dynamic_http,
sizeof(struct per_session_data__http),
0,
0,
NULL,
0
p_v->push_back(
{"http",
&WebserverImpl::notify_dynamic_http,
sizeof(struct per_session_data__http),
0,
0,
NULL,
0
});
p_v->push_back({
"lws-minimal",
&WebserverImplWsThread::notify_minimal,
sizeof(struct per_session_data__minimal),
128,
0,
NULL,
0});
p_v->push_back(
{"lws-minimal",
&WebserverImplWsThread::notify_minimal,
sizeof(struct per_session_data__minimal),
128,
0,
NULL,
0});
/* mandatory end-of-array sentinel, requires by lws */
#if ((LWS_LIBRARY_VERSION_MAJOR > 4) || (LWS_LIBRARY_VERSION_MAJOR == 4) && (LWS_LIBRARY_VERSION_MINOR >= 3))
p_v->push_back(LWS_PROTOCOL_LIST_TERM);
#else
p_v->push_back({ nullptr, nullptr, 0, 0, 0, nullptr, 0});
#endif
} /*init_protocols*/
/* called reentrantly from ::lws_service(),
@ -1889,6 +1893,8 @@ namespace xo {
" | visit http://localhost:%d\n", this->ws_config_.port());
#if defined(LWS_WITH_PLUGINS)
lwsl_user("LWS_WITH_PLUGINS present");
#endif
#if defined(LWS_WITH_TLS)
lwsl_user("LWS_WITH_TLS present");
#endif

6
src/websock/WebsockUtil.cpp
View file

@ -50,7 +50,7 @@ namespace xo {
CASE(LWS_CALLBACK_RECEIVE_CLIENT_HTTP);
CASE(LWS_CALLBACK_COMPLETED_CLIENT_HTTP);
CASE(LWS_CALLBACK_CLIENT_HTTP_WRITEABLE);
#if (LWS_LIBRARY_VERSION_MAJOR >= 4) && (LWS_LIBRARY_VERSION_MINOR >= 3)
#if ((LWS_LIBRARY_VERSION_MAJOR > 4) || (LWS_LIBRARY_VERSION_MAJOR == 4) && (LWS_LIBRARY_VERSION_MINOR >= 3))
CASE(LWS_CALLBACK_CLIENT_HTTP_REDIRECT);
#endif
CASE(LWS_CALLBACK_CLIENT_HTTP_BIND_PROTOCOL);
@ -120,7 +120,7 @@ namespace xo {
CASE(LWS_CALLBACK_TIMER);
CASE(LWS_CALLBACK_EVENT_WAIT_CANCELLED);
CASE(LWS_CALLBACK_CHILD_CLOSING);
#if (LWS_LIBRARY_VERSION_MAJOR >= 4) && (LWS_LIBRARY_VERSION_MINOR >= 3)
#if ((LWS_LIBRARY_VERSION_MAJOR > 4) || (LWS_LIBRARY_VERSION_MAJOR == 4) && (LWS_LIBRARY_VERSION_MINOR >= 3))
CASE(LWS_CALLBACK_CONNECTING);
#endif
CASE(LWS_CALLBACK_VHOST_CERT_AGING);
@ -136,7 +136,7 @@ namespace xo {
CASE(LWS_CALLBACK_MQTT_CLIENT_CLOSED);
CASE(LWS_CALLBACK_MQTT_ACK);
CASE(LWS_CALLBACK_MQTT_RESEND);
#if (LWS_LIBRARY_VERSION_MAJOR >= 4) && (LWS_LIBRARY_VERSION_MINOR >= 3)
#if ((LWS_LIBRARY_VERSION_MAJOR > 4) || (LWS_LIBRARY_VERSION_MAJOR == 4) && (LWS_LIBRARY_VERSION_MINOR >= 3))
CASE(LWS_CALLBACK_MQTT_UNSUBSCRIBE_TIMEOUT);
CASE(LWS_CALLBACK_MQTT_SHADOW_TIMEOUT);
#endif