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

sai: xenial

Browse source
This commit is contained in:
Andy Green 2021-02-28 17:17:55 +00:00
parent 671ffe7063
commit 9af105ebf8
10 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.sai.json
View file

@ -14,6 +14,9 @@
"linux-debian-sid/x86_64-amd/gcc": {
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib;export SAI_CPACK=\"-G DEB\";cmake .. ${cmake} && make -j4 && rm -rf ../destdir && make -j DESTDIR=../destdir install && ctest -j2 --output-on-failure ${cpack}"
},
"linux-ubuntu-xenial/x86_64-amd/gcc": {
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib;export SAI_CPACK=\"-G DEB\";cmake .. ${cmake} && make -j4 && rm -rf ../destdir && make -j DESTDIR=../destdir install && ctest -j2 --output-on-failure ${cpack}"
},
"linux-debian-sid/x86-amd/gcc": {
"build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;export LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib;export SAI_CPACK=\"-G DEB\";cmake .. ${cmake} && make -j4 && rm -rf ../destdir && make -j DESTDIR=../destdir install && ctest -j2 --output-on-failure ${cpack}"
},

2
lib/roles/dbus/CMakeLists.txt
View file

@ -52,7 +52,9 @@ int main(void) {
}" LWS_DBUS_CHECK_OK)
message("dbus include dir 1: ${LWS_DBUS_INCLUDE1}")
if (LWS_DBUS_INCLUDE1)
include_directories("${LWS_DBUS_INCLUDE1}")
endif()
list(APPEND LIB_LIST ${LWS_DBUS_LIB})
#

2
lib/roles/http/compression/stream.c
View file

@ -52,7 +52,7 @@ lws_http_compression_validate(struct lws *wsi)
for (n = 0; n < LWS_ARRAY_SIZE(lcs_available); n++)
if (strstr(a, lcs_available[n]->encoding_name))
wsi->http.comp_accept_mask |= (uint8_t)(1 << n);
wsi->http.comp_accept_mask = (uint8_t)(wsi->http.comp_accept_mask | (1 << n));
return 0;
}

4
lib/roles/mqtt/mqtt.c
View file

@ -1346,8 +1346,8 @@ bail1:
par->flag_prop_multi = !!(
par->props_seen[par->prop_id >> 3] &
(1 << (par->prop_id & 7)));
par->props_seen[par->prop_id >> 3] |=
(uint8_t)(1 << (par->prop_id & 7));
par->props_seen[par->prop_id >> 3] =
(uint8_t)((par->props_seen[par->prop_id >> 3]) | (1 << (par->prop_id & 7)));
/*
* even if it's not a vbi property arg,
* .consumed of this will be zero the first time

2
lib/system/async-dns/async-dns-parse.c
View file

@ -568,7 +568,7 @@ lws_adns_parse_udp(lws_async_dns_t *dns, const uint8_t *pkt, size_t len)
goto fail_out;
}
q->responded |= (uint8_t)n;
q->responded = (uint8_t)(q->responded | n);
/* we want to confirm the results against what we last requested... */

8
lib/tls/mbedtls/mbedtls-client.c
View file

@ -188,7 +188,7 @@ int ERR_get_error(void)
enum lws_ssl_capable_status
lws_tls_client_connect(struct lws *wsi, char *errbuf, size_t elen)
{
int m, n = SSL_connect(wsi->tls.ssl);
int m, n = SSL_connect(wsi->tls.ssl), en;
const unsigned char *prot;
unsigned int len;
@ -199,6 +199,7 @@ lws_tls_client_connect(struct lws *wsi, char *errbuf, size_t elen)
return LWS_SSL_CAPABLE_DONE;
}
en = (int)LWS_ERRNO;
m = SSL_get_error(wsi->tls.ssl, n);
if (m == SSL_ERROR_WANT_READ || SSL_want_read(wsi->tls.ssl))
@ -210,7 +211,10 @@ lws_tls_client_connect(struct lws *wsi, char *errbuf, size_t elen)
if (!n) /* we don't know what he wants, but he says to retry */
return LWS_SSL_CAPABLE_MORE_SERVICE;
lws_snprintf(errbuf, elen, "mbedtls connect %d %d %d", n, m, errno);
if (m == SSL_ERROR_SYSCALL && !en)
return LWS_SSL_CAPABLE_MORE_SERVICE;
lws_snprintf(errbuf, elen, "mbedtls connect %d %d %d", n, m, en);
return LWS_SSL_CAPABLE_ERROR;
}

4
minimal-examples/dbus-client/minimal-dbus-client/CMakeLists.txt
View file

@ -23,7 +23,9 @@ if (NOT MSVC AND NOT WIN32 AND requirements)
list(APPEND LWS_DBUS_LIB "${PC_DBUS1_LIBRARIES};dl")
endif()
include_directories("${LWS_DBUS_INCLUDE1}")
if (LWS_DBUS_INCLUDE1)
include_directories("${LWS_DBUS_INCLUDE1}")
endif()
if (websockets_shared)
target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})

4
minimal-examples/dbus-client/minimal-dbus-ws-proxy-testclient/CMakeLists.txt
View file

@ -20,7 +20,9 @@ if (NOT MSVC AND NOT WIN32 AND requirements)
list(APPEND LWS_DBUS_LIB "${PC_DBUS1_LIBRARIES};dl")
endif()
include_directories("${LWS_DBUS_INCLUDE1}")
if (LWS_DBUS_INCLUDE1)
include_directories("${LWS_DBUS_INCLUDE1}")
endif()
message("project ${PROJECT_NAME}")
if (websockets_shared)
target_link_libraries(${PROJECT_NAME} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})

4
minimal-examples/dbus-server/minimal-dbus-server/CMakeLists.txt
View file

@ -23,7 +23,9 @@ if (NOT MSVC AND NOT WIN32 AND requirements)
list(APPEND LWS_DBUS_LIB "${PC_DBUS1_LIBRARIES};dl")
endif()
include_directories("${LWS_DBUS_INCLUDE1}")
if (LWS_DBUS_INCLUDE1)
include_directories("${LWS_DBUS_INCLUDE1}")
endif()
if (websockets_shared)
target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})

4
minimal-examples/dbus-server/minimal-dbus-ws-proxy/CMakeLists.txt
View file

@ -25,7 +25,9 @@ if (NOT MSVC AND NOT WIN32 AND requirements)
list(APPEND LWS_DBUS_LIB "${PC_DBUS1_LIBRARIES};dl")
endif()
include_directories("${LWS_DBUS_INCLUDE1}")
if (LWS_DBUS_INCLUDE1)
include_directories("${LWS_DBUS_INCLUDE1}")
endif()
if (websockets_shared)
target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})