Skip to content

Commit 0f9c77b

Browse files
lws-teamlws-team
committed
fixes
1 parent 1e6379b commit 0f9c77b

File tree

18 files changed

+108
-44
lines changed

18 files changed

+108
-44
lines changed

‎.sai.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@
155155
"lws_system": {
156156
"cmake": "-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=1 -DLWS_WITH_ACME=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DCMAKE_BUILD_TYPE=RELEASE -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_NTPCLIENT=1"
157157
},
158+
"async_dnssec": {
159+
"cmake": "-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=1 -DCMAKE_BUILD_TYPE=DEBUG -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_ASYNC_DNS_DNSSEC=1"
160+
},
161+
158162
"secure-streams": {
159163
"cmake": "-DLWS_WITH_SECURE_STREAMS=1 -DLWS_WITH_MINIMAL_EXAMPLES=1",
160164
"platforms": "w11/x86_64-amd/msvc,netbsd/aarch64BE-bcm2837-a53/gcc"
@@ -254,14 +258,14 @@
254258
# only applies to the coverity builder, and on pushes to "coverity" branch
255259

256260
"coverity": {
257-
"cmake": "-DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_CGI=1 -DLWS_IPV6=1 -DLWS_WITH_HTTP_PROXY=1 -DLWS_WITH_RANGES=1 -DLWS_WITH_THREADPOOL=1 -DLWS_WITH_CBOR=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_COSE=1 -DLWS_WITH_SYS_DHCP_CLIENT=1 -DLWS_WITH_FTS=1 -DLWS_WITH_STRUCT_SQLITE3=1 -DLWS_ROLE_DBUS=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_FAULT_INJECTION=1 -DLWS_WITH_TLS_JIT_TRUST=1 -DLWS_ROLE_MQTT=1 -DLWS_ROLE_RAW_PROXY=1 -DLWS_WITH_EVENT_LIBS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_STRUCT_JSON=1 -DLWS_WITH_LWS_DSH=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1",
261+
"cmake": "-DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_CGI=1 -DLWS_IPV6=1 -DLWS_WITH_HTTP_PROXY=1 -DLWS_WITH_RANGES=1 -DLWS_WITH_THREADPOOL=1 -DLWS_WITH_CBOR=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_COSE=1 -DLWS_WITH_SYS_DHCP_CLIENT=1 -DLWS_WITH_FTS=1 -DLWS_WITH_STRUCT_SQLITE3=1 -DLWS_ROLE_DBUS=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_ASYNC_DNS_DNSSEC=1 -DLWS_WITH_WEBRTC=1 -DLWS_WITH_DHT=1 -DLWS_WITH_ASYNC_QUEUE=1 -DLWS_WITH_SYS_FAULT_INJECTION=1 -DLWS_WITH_TLS_JIT_TRUST=1 -DLWS_ROLE_MQTT=1 -DLWS_ROLE_RAW_PROXY=1 -DLWS_WITH_EVENT_LIBS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_STRUCT_JSON=1 -DLWS_WITH_LWS_DSH=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1",
258262
"platforms": "none, coverity/x86_64/gcc",
259263
"cpack": "export STAMP=`git log -1 --pretty=format:%h` && rm -f libwebsockets.tgz && tar czvf libwebsockets.tgz cov-int && script -q -c \"cat /etc/coverity/secrets.sh | lws-minimal-http-client-post-form https://scan.coverity.com:443/builds?project=warmcat%2Flibwebsockets --form file=@libwebsockets.tgz --form version=${STAMP} --form 'description=lws qa'\" /dev/null",
260264
"branches": "coverity"
261265
},
262266
# awkward, we also want to test mbedtls, but coverity blocks on SSL build needing manual intervention
263267
"coverity-mbedtls": {
264-
"cmake": "-DLWS_WITH_MBEDTLS=1 -DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_CGI=1 -DLWS_IPV6=1 -DLWS_WITH_HTTP_PROXY=1 -DLWS_WITH_RANGES=1 -DLWS_WITH_THREADPOOL=1 -DLWS_WITH_CBOR=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_COSE=1 -DLWS_WITH_SYS_DHCP_CLIENT=1 -DLWS_WITH_FTS=1 -DLWS_WITH_STRUCT_SQLITE3=1 -DLWS_ROLE_DBUS=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_FAULT_INJECTION=1 -DLWS_WITH_TLS_JIT_TRUST=1 -DLWS_ROLE_MQTT=1 -DLWS_ROLE_RAW_PROXY=1 -DLWS_WITH_EVENT_LIBS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_STRUCT_JSON=1 -DLWS_WITH_LWS_DSH=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1",
268+
"cmake": "-DLWS_WITH_MBEDTLS=1 -DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_CGI=1 -DLWS_IPV6=1 -DLWS_WITH_HTTP_PROXY=1 -DLWS_WITH_RANGES=1 -DLWS_WITH_THREADPOOL=1 -DLWS_WITH_CBOR=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_COSE=1 -DLWS_WITH_SYS_DHCP_CLIENT=1 -DLWS_WITH_FTS=1 -DLWS_WITH_STRUCT_SQLITE3=1 -DLWS_ROLE_DBUS=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_ASYNC_DNS_DNSSEC=1 -DLWS_WITH_WEBRTC=1 -DLWS_WITH_DHT=1 -DLWS_WITH_ASYNC_QUEUE=1 -DLWS_WITH_SYS_FAULT_INJECTION=1 -DLWS_WITH_TLS_JIT_TRUST=1 -DLWS_ROLE_MQTT=1 -DLWS_ROLE_RAW_PROXY=1 -DLWS_WITH_EVENT_LIBS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_STRUCT_JSON=1 -DLWS_WITH_LWS_DSH=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1",
265269
"platforms": "none, coverity/x86_64/gcc",
266270
"cpack": "export STAMP=`git log -1 --pretty=format:%h` && rm -f libwebsockets.tgz && tar czvf libwebsockets.tgz cov-int && script -q -c \"cat /etc/coverity/secrets.sh | lws-minimal-http-client-post-form https://scan.coverity.com:443/builds?project=warmcat%2Flibwebsockets --form file=@libwebsockets.tgz --form version=${STAMP} --form 'description=lws qa'\" /dev/null",
267271
"branches": "coverity"

‎include/libwebsockets.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@ typedef int suseconds_t;
175175
#include <unistd.h>
176176

177177
#if defined (LWS_PLAT_FREERTOS)
178+
#if defined(LWS_AMAZON_RTOS)
179+
#include <FreeRTOS.h>
180+
#include <semphr.h>
181+
#include <task.h>
182+
#else
183+
#include <freertos/FreeRTOS.h>
184+
#include <freertos/semphr.h>
185+
#include <freertos/task.h>
186+
#endif
187+
178188
typedef SemaphoreHandle_t lws_mutex_t;
179189
#define lws_mutex_init(x) x = xSemaphoreCreateMutex()
180190
#define lws_mutex_destroy(x) vSemaphoreDelete(x)

‎include/libwebsockets/lws-dht.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <stddef.h>
2929
#include <stdint.h>
3030
#include <stdio.h>
31+
#include <libwebsockets/lws-genhash.h>
3132

3233
/*! \defgroup dht Distributed Hash Table
3334
* ## Distributed Hash Table (DHT) API

‎lib/core-net/close.c‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -654,15 +654,6 @@ __lws_close_free_wsi(struct lws *wsi, enum lws_close_status reason,
654654
if (wsi->http.buflist_post_body)
655655
lws_buflist_destroy_all_segments(&wsi->http.buflist_post_body);
656656
#endif
657-
#if defined(LWS_WITH_UDP)
658-
if (wsi->udp) {
659-
/* confirm no sul left scheduled in wsi->udp itself */
660-
lws_sul_debug_zombies(wsi->a.context, wsi->udp,
661-
sizeof(*wsi->udp), "close udp wsi");
662-
663-
lws_free_set_NULL(wsi->udp);
664-
}
665-
#endif
666657

667658
if (lws_rops_fidx(wsi->role_ops, LWS_ROPS_close_kill_connection))
668659
lws_rops_func_fidx(wsi->role_ops,

‎lib/event-libs/glib/glib.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,10 @@ LWS_VISIBLE
506506
#endif
507507
const lws_plugin_evlib_t evlib_glib = {
508508
.hdr = {
509-
"glib event loop",
510-
"lws_evlib_plugin",
511-
LWS_BUILD_HASH,
512-
LWS_PLUGIN_API_MAGIC
509+
.name = "glib event loop",
510+
._class = "lws_evlib_plugin",
511+
.lws_build_hash = LWS_BUILD_HASH,
512+
.api_magic = LWS_PLUGIN_API_MAGIC
513513
},
514514

515515
.ops = &event_loop_ops_glib

‎lib/event-libs/libev/libev.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,10 @@ LWS_VISIBLE
458458
#endif
459459
const lws_plugin_evlib_t evlib_ev = {
460460
.hdr = {
461-
"libev event loop",
462-
"lws_evlib_plugin",
463-
LWS_BUILD_HASH,
464-
LWS_PLUGIN_API_MAGIC
461+
.name = "libev event loop",
462+
._class = "lws_evlib_plugin",
463+
.lws_build_hash = LWS_BUILD_HASH,
464+
.api_magic = LWS_PLUGIN_API_MAGIC
465465
},
466466

467467
.ops = &event_loop_ops_ev

‎lib/event-libs/libevent/libevent.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,10 +510,10 @@ LWS_VISIBLE
510510
#endif
511511
const lws_plugin_evlib_t evlib_event = {
512512
.hdr = {
513-
"libevent event loop",
514-
"lws_evlib_plugin",
515-
LWS_BUILD_HASH,
516-
LWS_PLUGIN_API_MAGIC
513+
.name = "libevent event loop",
514+
._class = "lws_evlib_plugin",
515+
.lws_build_hash = LWS_BUILD_HASH,
516+
.api_magic = LWS_PLUGIN_API_MAGIC
517517
},
518518

519519
.ops = &event_loop_ops_event

‎lib/event-libs/libuv/libuv.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -941,10 +941,10 @@ LWS_VISIBLE
941941
#endif
942942
const lws_plugin_evlib_t evlib_uv = {
943943
.hdr = {
944-
"libuv event loop",
945-
"lws_evlib_plugin",
946-
LWS_BUILD_HASH,
947-
LWS_PLUGIN_API_MAGIC
944+
.name = "libuv event loop",
945+
._class = "lws_evlib_plugin",
946+
.lws_build_hash = LWS_BUILD_HASH,
947+
.api_magic = LWS_PLUGIN_API_MAGIC
948948
},
949949

950950
.ops = &event_loop_ops_uv

‎lib/event-libs/poll/poll.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ struct lws_event_loop_ops event_loop_ops_poll = {
5252

5353
const lws_plugin_evlib_t evlib_poll = {
5454
.hdr = {
55-
"poll",
56-
"lws_evlib_plugin",
57-
"n/a",
58-
LWS_PLUGIN_API_MAGIC
55+
.name = "poll",
56+
._class = "lws_evlib_plugin",
57+
.lws_build_hash = "n/a",
58+
.api_magic = LWS_PLUGIN_API_MAGIC
5959
},
6060

6161
.ops = &event_loop_ops_poll

‎lib/event-libs/sdevent/sdevent.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,10 @@ LWS_VISIBLE
436436
#endif
437437
const lws_plugin_evlib_t evlib_sd = {
438438
.hdr = {
439-
"systemd event loop",
440-
"lws_evlib_plugin",
441-
LWS_BUILD_HASH,
442-
LWS_PLUGIN_API_MAGIC
439+
.name = "systemd event loop",
440+
._class = "lws_evlib_plugin",
441+
.lws_build_hash = LWS_BUILD_HASH,
442+
.api_magic = LWS_PLUGIN_API_MAGIC
443443
},
444444

445445
.ops = &event_loop_ops_sdevent

0 commit comments

Comments
 (0)