Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

cmake: unbreak LWS_WITH_SYS_STATE disabled build

Browse source
This commit is contained in:
Andy Green 2021-09-27 06:29:34 +01:00
parent 71b8f4dc68
commit ee15b82b6e
7 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/core-net/route.c
View file

@ -341,8 +341,12 @@ _lws_route_pt_close_unroutable(struct lws_context_per_thread *pt)
struct lws *wsi;
unsigned int n;
if (!pt->context->nl_initial_done ||
pt->context->mgr_system.state < LWS_SYSTATE_IFACE_COLDPLUG)
if (!pt->context->nl_initial_done
#if defined(LWS_WITH_SYS_STATE)
||
pt->context->mgr_system.state < LWS_SYSTATE_IFACE_COLDPLUG
#endif
)
return 0;
lwsl_cx_debug(pt->context, "in");

4
lib/core/context.c
View file

@ -2085,10 +2085,10 @@ next:
#if defined(LWS_WITH_NETWORK)
if (context->event_loop_ops->destroy_context2)
context->event_loop_ops->destroy_context2(context);
#if defined(LWS_WITH_SYS_STATE)
lws_state_transition_steps(&context->mgr_system,
LWS_SYSTATE_CONTEXT_DESTROYING);
#endif
/*
* finalize destroy of pt and things hanging off it
*/

3
lib/roles/netlink/ops-netlink.c
View file

@ -49,9 +49,10 @@ lws_netlink_coldplug_done_cb(lws_sorted_usec_list_t *sul)
struct lws_context *ctx = lws_container_of(sul, struct lws_context,
sul_nl_coldplug);
ctx->nl_initial_done = 1;
#if defined(LWS_WITH_SYS_STATE)
/* if nothing is there to intercept anything, go all the way */
lws_state_transition_steps(&ctx->mgr_system, LWS_SYSTATE_OPERATIONAL);
#endif
}
static int

1
minimal-examples/api-tests/api-test-lws_smd/CMakeLists.txt
View file

@ -8,6 +8,7 @@ include(LwsCheckRequirements)
set(requirements 1)
require_pthreads(requirements)
require_lws_config(LWS_WITH_SYS_SMD 1 requirements)
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
if (requirements)
add_executable(${PROJECT_NAME} main.c)

1
minimal-examples/http-client/minimal-http-client-multi/CMakeLists.txt
View file

@ -13,6 +13,7 @@ set(MBEDTLS 0)
require_lws_config(LWS_ROLE_H1 1 requirements)
require_lws_config(LWS_WITH_CLIENT 1 requirements)
require_lws_config(LWS_WITH_TLS 1 requirements)
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
require_lws_config(LWS_WITH_MBEDTLS 1 MBEDTLS)

2
minimal-examples/secure-streams/minimal-secure-streams-client-tx/CMakeLists.txt
View file

@ -13,7 +13,7 @@ require_lws_config(LWS_ROLE_H1 1 requirements)
require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 requirements)
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
if (requirements)
add_executable(${SAMP} ${SRCS})

1
minimal-examples/ws-server/minimal-ws-server-threads-smp/CMakeLists.txt
View file

@ -13,6 +13,7 @@ set(requirements 1)
require_pthreads(requirements)
require_lws_config(LWS_ROLE_WS 1 requirements)
require_lws_config(LWS_WITH_SERVER 1 requirements)
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
if (requirements)
add_executable(${SAMP} ${SRCS})