diff options
author | Jorge E. Moreira <jemoreira@google.com> | 2022-01-10 20:38:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-10 20:38:27 +0000 |
commit | 61e20ae288e9fc017b5bbaa1b8aa61d8bb320e2e (patch) | |
tree | 8fa01b2a4ce5dd41cd7fb3abc969ae9876a180a7 | |
parent | 87e444f977cde21f7760403f88ac51a6432bf5b9 (diff) | |
parent | eedbf0ba28719c6e7cbb5f2ac4d0e72a41bf9810 (diff) | |
download | libwebsockets-61e20ae288e9fc017b5bbaa1b8aa61d8bb320e2e.tar.gz |
Fix build files for update to 4.3 am: 4d0db3edcd am: ecd3ebb2af am: d70f7ac941 am: eedbf0ba28
Original change: https://android-review.googlesource.com/c/platform/external/libwebsockets/+/1932879
Change-Id: I18a24edfa8ba3f76040192475143da1246e73908
-rw-r--r-- | Android.bp | 28 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | include/libwebsockets.h | 5 | ||||
-rw-r--r-- | include/lws_config.h | 99 | ||||
-rw-r--r-- | include/lws_config_private.h | 28 |
5 files changed, 116 insertions, 46 deletions
@@ -53,19 +53,22 @@ license { libwebsocketsSrcFiles = [ "lib/core-net/adopt.c", - "lib/core-net/client.c", + "lib/core-net/client/client.c", + "lib/core-net/client/conmon.c", + "lib/core-net/client/connect.c", + "lib/core-net/client/connect2.c", + "lib/core-net/client/connect3.c", + "lib/core-net/client/connect4.c", + "lib/core-net/client/sort-dns.c", "lib/core-net/close.c", - "lib/core-net/connect.c", "lib/core-net/dummy-callback.c", "lib/core-net/network.c", "lib/core-net/output.c", "lib/core-net/pollfd.c", - "lib/core-net/sequencer.c", - "lib/core-net/server.c", + "lib/core-net/route.c", "lib/core-net/service.c", "lib/core-net/sorted-usec-list.c", "lib/core-net/state.c", - "lib/core-net/stats.c", "lib/core-net/vhost.c", "lib/core-net/wsi-timeout.c", "lib/core-net/wsi.c", @@ -75,14 +78,19 @@ libwebsocketsSrcFiles = [ "lib/core/libwebsockets.c", "lib/core/logs.c", "lib/core/lws_dll2.c", + "lib/core/lws_map.c", "lib/core/vfs.c", "lib/event-libs/poll/poll.c", "lib/misc/base64-decode.c", + "lib/misc/cache-ttl/file.c", + "lib/misc/cache-ttl/heap.c", + "lib/misc/cache-ttl/lws-cache-ttl.c", "lib/misc/dir.c", "lib/misc/lejp.c", "lib/misc/lws-ring.c", "lib/misc/lwsac/cached-file.c", "lib/misc/lwsac/lwsac.c", + "lib/misc/prng.c", "lib/misc/sha-1.c", "lib/plat/unix/unix-caps.c", "lib/plat/unix/unix-fds.c", @@ -96,14 +104,16 @@ libwebsocketsSrcFiles = [ "lib/roles/h2/hpack.c", "lib/roles/h2/http2.c", "lib/roles/h2/ops-h2.c", - "lib/roles/http/client/client-handshake.c", "lib/roles/http/client/client-http.c", + "lib/roles/http/cookie.c", + "lib/roles/http/date.c", "lib/roles/http/header.c", "lib/roles/http/parsers.c", "lib/roles/http/server/lejp-conf.c", "lib/roles/http/server/lws-spa.c", "lib/roles/http/server/server.c", "lib/roles/listen/ops-listen.c", + "lib/roles/netlink/ops-netlink.c", "lib/roles/pipe/ops-pipe.c", "lib/roles/raw-file/ops-raw-file.c", "lib/roles/raw-skt/ops-raw-skt.c", @@ -111,15 +121,18 @@ libwebsocketsSrcFiles = [ "lib/roles/ws/client-ws.c", "lib/roles/ws/ops-ws.c", "lib/roles/ws/server-ws.c", + "lib/system/smd/smd.c", "lib/system/system.c", "lib/tls/openssl/openssl-client.c", "lib/tls/openssl/openssl-server.c", + "lib/tls/openssl/openssl-session.c", "lib/tls/openssl/openssl-ssl.c", "lib/tls/openssl/openssl-tls.c", "lib/tls/openssl/openssl-x509.c", "lib/tls/tls-client.c", "lib/tls/tls-network.c", "lib/tls/tls-server.c", + "lib/tls/tls-sessions.c", "lib/tls/tls.c", ] @@ -150,6 +163,8 @@ libwebsocketsIncludePath = [ "lib/roles/raw-proxy", "lib/abstract", "lib/system/async-dns", + "lib/system/smd", + "lib/system/metrics", "lib/roles/mqtt", "lib/plat/unix", "lib", @@ -164,6 +179,7 @@ cc_library_static { "libssl", "libcap", ], + c_std: "gnu17", host_supported: true, product_variables: { debuggable: { diff --git a/CMakeLists.txt b/CMakeLists.txt index 62bb2227..33790b38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,7 @@ option(LWS_IPV6 "Compile with support for ipv6" OFF) option(LWS_UNIX_SOCK "Compile with support for UNIX domain socket if OS supports it" ON) option(LWS_WITH_PLUGINS "Support plugins for protocols and extensions (implies LWS_WITH_PLUGINS_API)" OFF) option(LWS_WITH_PLUGINS_BUILTIN "Build the plugin protocols directly into lws library" OFF) -option(LWS_WITH_HTTP_PROXY "Support for active HTTP proxying" OFF) +option(LWS_WITH_HTTP_PROXY "Support for active HTTP proxying" ON) option(LWS_WITH_ZIP_FOPS "Support serving pre-zipped files" OFF) option(LWS_WITH_SOCKS5 "Allow use of SOCKS5 proxy on client connections" OFF) option(LWS_WITH_PEER_LIMITS "Track peers and restrict resources a single peer can allocate" OFF) diff --git a/include/libwebsockets.h b/include/libwebsockets.h index 4409ee27..65500ecd 100644 --- a/include/libwebsockets.h +++ b/include/libwebsockets.h @@ -218,8 +218,9 @@ typedef int suseconds_t; #endif #endif - -#if defined(__ANDROID__) +// __ANDROID__ is not defined for host builds, but this headers are available in +// them. +#if defined(__ANDROID__) || 1 #include <netinet/in.h> #include <unistd.h> #endif diff --git a/include/lws_config.h b/include/lws_config.h index b0b36ee4..9b87f6b7 100644 --- a/include/lws_config.h +++ b/include/lws_config.h @@ -7,31 +7,38 @@ #endif #define LWS_INSTALL_DATADIR "/usr/local/share" +#define LWS_INSTALL_LIBDIR "/usr/local/lib" #define LWS_LIBRARY_VERSION_MAJOR 4 -#define LWS_LIBRARY_VERSION_MINOR 0 -#define LWS_LIBRARY_VERSION_PATCH 1 +#define LWS_LIBRARY_VERSION_MINOR 3 +#define LWS_LIBRARY_VERSION_PATCH 0 + /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR * 1000000) + \ (LWS_LIBRARY_VERSION_MINOR * 1000) + \ LWS_LIBRARY_VERSION_PATCH #define LWS_MAX_SMP 1 +/* #undef LWS_ESP_PLATFORM */ /* #undef LWS_LIBRARY_VERSION_NUMBER */ +/* #undef LWS_EXT_PTHREAD_LIBRARIES */ + /* #undef LWS_AVOID_SIGPIPE_IGN */ /* #undef LWS_BUILD_HASH */ /* #undef LWS_BUILTIN_GETIFADDRS */ #define LWS_CLIENT_HTTP_PROXYING +/* #undef LWS_DETECTED_PLAT_IOS */ /* #undef LWS_FALLBACK_GETHOSTBYNAME */ #define LWS_HAS_INTPTR_T #define LWS_HAS_GETOPT_LONG /* #undef LWS_HAVE__ATOI64 */ #define LWS_HAVE_ATOLL -#define LWS_HAVE_BN_bn2binpad +/* #undef LWS_HAVE_BN_bn2binpad */ #define LWS_HAVE_CLOCK_GETTIME /* #undef LWS_HAVE_EC_POINT_get_affine_coordinates */ -#define LWS_HAVE_ECDSA_SIG_set0 -#define LWS_HAVE_EVP_MD_CTX_free +/* #undef LWS_HAVE_EC_KEY_new_by_curve_name */ +/* #undef LWS_HAVE_ECDSA_SIG_set0 */ +/* #undef LWS_HAVE_EVP_MD_CTX_free */ /* #undef LWS_HAVE_EVP_aes_128_wrap */ /* #undef LWS_HAVE_EVP_aes_128_cfb8 */ /* #undef LWS_HAVE_EVP_aes_128_cfb128 */ @@ -39,46 +46,73 @@ /* #undef LWS_HAVE_EVP_aes_192_cfb128 */ /* #undef LWS_HAVE_EVP_aes_256_cfb8 */ /* #undef LWS_HAVE_EVP_aes_256_cfb128 */ +/* #undef LWS_HAVE_EVP_aes_128_ofb */ /* #undef LWS_HAVE_EVP_aes_128_xts */ +/* #undef LWS_HAVE_EVP_aes_128_ctr */ +/* #undef LWS_HAVE_EVP_aes_128_ecb */ +/* #undef LWS_HAVE_EVP_PKEY_new_raw_private_key */ #define LWS_HAVE_EXECVPE +#define LWS_HAVE_LOCALTIME_R +#define LWS_HAVE_GMTIME_R +#define LWS_HAVE_CTIME_R +#define LWS_HAVE_GETGRGID_R +#define LWS_HAVE_GETGRNAM_R +#define LWS_HAVE_GETPWUID_R +#define LWS_HAVE_GETPWNAM_R #define LWS_HAVE_LIBCAP -#define LWS_HAVE_HMAC_CTX_new +/* #undef LWS_HAVE_HMAC_CTX_new */ #define LWS_HAVE_MALLOC_H #define LWS_HAVE_MALLOC_TRIM #define LWS_HAVE_MALLOC_USABLE_SIZE +/* #undef LWS_HAVE_mbedtls_md_setup */ /* #undef LWS_HAVE_mbedtls_net_init */ +/* #undef LWS_HAVE_mbedtls_rsa_complete */ +/* #undef LWS_HAVE_mbedtls_internal_aes_encrypt */ /* #undef LWS_HAVE_mbedtls_ssl_conf_alpn_protocols */ /* #undef LWS_HAVE_mbedtls_ssl_get_alpn_protocol */ /* #undef LWS_HAVE_mbedtls_ssl_conf_sni */ /* #undef LWS_HAVE_mbedtls_ssl_set_hs_ca_chain */ /* #undef LWS_HAVE_mbedtls_ssl_set_hs_own_cert */ /* #undef LWS_HAVE_mbedtls_ssl_set_hs_authmode */ +/* #undef LWS_HAVE_mbedtls_ssl_set_verify */ +/* #undef LWS_HAVE_mbedtls_x509_crt_parse_file */ /* #undef LWS_HAVE_MBEDTLS_NET_SOCKETS */ +/* #undef LWS_HAVE_MBEDTLS_AUTH_KEY_ID */ /* #undef LWS_HAVE_NEW_UV_VERSION_H */ #define LWS_HAVE_OPENSSL_ECDH_H +/* #undef LWS_HAVE_OPENSSL_STACK */ #define LWS_HAVE_PIPE2 #define LWS_HAVE_EVENTFD #define LWS_HAVE_PTHREAD_H -#define LWS_HAVE_RSA_SET0_KEY -#define LWS_HAVE_RSA_verify_pss_mgf1 +/* #undef LWS_HAVE_RSA_SET0_KEY */ +/* #undef LWS_HAVE_RSA_verify_pss_mgf1 */ /* #undef LWS_HAVE_SSL_CTX_get0_certificate */ +/* #undef LWS_HAVE_SSL_CTX_load_verify_file */ +/* #undef LWS_HAVE_SSL_CTX_load_verify_dir */ /* #undef LWS_HAVE_SSL_CTX_set1_param */ /* #undef LWS_HAVE_SSL_CTX_set_ciphersuites */ /* #undef LWS_HAVE_SSL_EXTRA_CHAIN_CERTS */ /* #undef LWS_HAVE_SSL_get0_alpn_selected */ -#define LWS_HAVE_SSL_CTX_EVP_PKEY_new_raw_private_key +/* #undef LWS_HAVE_SSL_CTX_EVP_PKEY_new_raw_private_key */ /* #undef LWS_HAVE_SSL_set_alpn_protos */ /* #undef LWS_HAVE_SSL_SET_INFO_CALLBACK */ +/* #undef LWS_HAVE_SSL_SESSION_set_time */ +/* #undef LWS_HAVE_SSL_SESSION_up_ref */ /* #undef LWS_HAVE__STAT32I64 */ #define LWS_HAVE_STDINT_H #define LWS_HAVE_SYS_CAPABILITY_H +#define LWS_HAVE_TIMEGM /* #undef LWS_HAVE_TLS_CLIENT_METHOD */ /* #undef LWS_HAVE_TLSV1_2_CLIENT_METHOD */ +#define LWS_HAVE_SUSECONDS_T /* #undef LWS_HAVE_UV_VERSION_H */ #define LWS_HAVE_VFORK -#define LWS_HAVE_X509_get_key_usage -#define LWS_HAVE_X509_VERIFY_PARAM_set1_host -#define LWS_LIBRARY_VERSION "4.0.1" +#define LWS_LIBRARY_VERSION "4.3.0" +/* #undef LWS_HAVE_X509_get_key_usage */ +/* #undef LWS_HAVE_X509_VERIFY_PARAM_set1_host */ +#define LWS_LOGGING_BITFIELD_CLEAR 0 +#define LWS_LOGGING_BITFIELD_SET 0 +#define LWS_LOG_TAG_LIFECYCLE /* #undef LWS_MINGW_SUPPORT */ /* #undef LWS_NO_CLIENT */ #define LWS_NO_DAEMONIZE @@ -99,6 +133,9 @@ /* #undef LWS_SHA1_USE_OPENSSL_NAME */ #define LWS_SSL_CLIENT_USE_OS_CA_CERTS /* #undef LWS_SSL_SERVER_WITH_ECDH_CERT */ +#define LWS_SUPPRESS_DEPRECATED_API_WARNINGS +/* #undef LWS_TLS_LOG_PLAINTEXT_RX */ +/* #undef LWS_TLS_LOG_PLAINTEXT_TX */ /* #undef LWS_WITH_ABSTRACT */ /* #undef LWS_WITH_ACCESS_LOG */ /* #undef LWS_WITH_ACME */ @@ -106,10 +143,13 @@ /* #undef LWS_WITH_SYS_ASYNC_DNS */ #define LWS_WITH_BORINGSSL /* #undef LWS_WITH_CGI */ +#define LWS_WITH_CONMON +/* #undef LWS_WITH_COSE */ #define LWS_WITH_CUSTOM_HEADERS /* #undef LWS_WITH_DEPRECATED_LWS_DLL */ /* #undef LWS_WITH_DETAILED_LATENCY */ #define LWS_WITH_DIR +/* #undef LWS_WITH_DRIVERS */ /* #undef LWS_WITH_ESP32 */ /* #undef LWS_HAVE_EVBACKEND_LINUXAIO */ /* #undef LWS_HAVE_EVBACKEND_IOURING */ @@ -124,51 +164,76 @@ #define LWS_WITH_HTTP2 #define LWS_WITH_HTTP_BASIC_AUTH /* #undef LWS_WITH_HTTP_BROTLI */ -/* #undef LWS_WITH_HTTP_PROXY */ +/* #undef LWS_HTTP_HEADERS_ALL */ +#define LWS_WITH_HTTP_PROXY /* #undef LWS_WITH_HTTP_STREAM_COMPRESSION */ #define LWS_WITH_HTTP_UNCOMMON_HEADERS /* #undef LWS_WITH_IPV6 */ /* #undef LWS_WITH_JOSE */ +/* #undef LWS_WITH_CBOR */ +#define LWS_WITH_CBOR_FLOAT #define LWS_WITH_LEJP /* #undef LWS_WITH_LIBEV */ /* #undef LWS_WITH_LIBEVENT */ /* #undef LWS_WITH_LIBUV */ +/* #undef LWS_WITH_SDEVENT */ #define LWS_WITH_LWSAC #define LWS_LOGS_TIMESTAMP /* #undef LWS_WITH_MBEDTLS */ /* #undef LWS_WITH_MINIZ */ +#define LWS_WITH_NETLINK #define LWS_WITH_NETWORK /* #undef LWS_WITH_NO_LOGS */ +#define LWS_WITH_CACHE_NSCOOKIEJAR #define LWS_WITH_CLIENT #define LWS_WITHOUT_EXTENSIONS #define LWS_WITH_SERVER /* #undef LWS_WITH_SPAWN */ /* #undef LWS_WITH_PEER_LIMITS */ /* #undef LWS_WITH_PLUGINS */ +/* #undef LWS_WITH_PLUGINS_BUILTIN */ /* #undef LWS_WITH_POLARSSL */ #define LWS_WITH_POLL /* #undef LWS_WITH_RANGES */ +/* #undef LWS_WITH_RFC6724 */ /* #undef LWS_WITH_SECURE_STREAMS */ +/* #undef LWS_WITH_SECURE_STREAMS_CPP */ /* #undef LWS_WITH_SECURE_STREAMS_SYS_AUTH_API_AMAZON_COM */ /* #undef LWS_WITH_SECURE_STREAMS_PROXY_API */ +/* #undef LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY */ +/* #undef LWS_WITH_SECURE_STREAMS_AUTH_SIGV4 */ +/* #undef LWS_WITH_SECURE_STREAMS_BUFFER_DUMP */ +/* #undef LWS_WITH_SS_DIRECT_PROTOCOL_STR */ /* #undef LWS_WITH_SELFTESTS */ -#define LWS_WITH_SEQUENCER +/* #undef LWS_WITH_SEQUENCER */ /* #undef LWS_WITH_SERVER_STATUS */ +#define LWS_WITH_SYS_SMD /* #undef LWS_WITH_SMTP */ /* #undef LWS_WITH_SOCKS5 */ /* #undef LWS_WITH_STATEFUL_URLDECODE */ /* #undef LWS_WITH_STATS */ /* #undef LWS_WITH_STRUCT_SQLITE3 */ /* #undef LWS_WITH_STRUCT_JSON */ +/* #undef LWS_WITH_SUL_DEBUGGING */ /* #undef LWS_WITH_SQLITE3 */ -/* #undef LWS_WITH_SYS_NTPCLIENT */ /* #undef LWS_WITH_SYS_DHCP_CLIENT */ +/* #undef LWS_WITH_SYS_FAULT_INJECTION */ +/* #undef LWS_WITH_SYS_METRICS */ +/* #undef LWS_WITH_SYS_NTPCLIENT */ +#define LWS_WITH_SYS_STATE /* #undef LWS_WITH_THREADPOOL */ #define LWS_WITH_TLS +/* #undef LWS_WITH_TLS_JIT_TRUST */ +#define LWS_WITH_TLS_SESSIONS #define LWS_WITH_UDP -/* #undef LWS_WITH_UNIX_SOCK */ +/* #undef LWS_WITH_ULOOP */ +#define LWS_WITH_UNIX_SOCK /* #undef LWS_WITH_ZIP_FOPS */ /* #undef USE_OLD_CYASSL */ /* #undef USE_WOLFSSL */ - +/* #undef LWS_WITH_EVENT_LIBS */ +/* #undef LWS_WITH_EVLIB_PLUGINS */ +/* #undef LWS_WITH_LIBUV_INTERNAL */ +/* #undef LWS_WITH_PLUGINS_API */ +/* #undef LWS_HAVE_RTA_PREF */ diff --git a/include/lws_config_private.h b/include/lws_config_private.h index bbf8bf9e..9c172f6b 100644 --- a/include/lws_config_private.h +++ b/include/lws_config_private.h @@ -5,21 +5,16 @@ #define _DEBUG #endif #endif +/* #undef LWIP_PROVIDE_ERRNO */ /* Define to 1 to use CyaSSL as a replacement for OpenSSL. * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */ /* #undef USE_CYASSL */ -/* Define to 1 if you have the <dlfcn.h> header file. */ -#define LWS_HAVE_DLFCN_H - -/* Define to 1 if you have the <fcntl.h> header file. */ -#define LWS_HAVE_FCNTL_H - /* Define to 1 if you have the `fork' function. */ #define LWS_HAVE_FORK -/* Define to 1 if you have the `getenv’ function. */ +/* Define to 1 if you have the `getenv' function. */ #define LWS_HAVE_GETENV /* Define to 1 if you have the <in6addr.h> header file. */ @@ -32,19 +27,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #define LWS_HAVE_MEMORY_H -/* Define to 1 if you have the `memset' function. */ -#define LWS_HAVE_MEMSET - /* Define to 1 if you have the <netinet/in.h> header file. */ #define LWS_HAVE_NETINET_IN_H -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#define LWS_HAVE_REALLOC - -/* Define to 1 if you have the `socket' function. */ -#define LWS_HAVE_SOCKET - /* Define to 1 if you have the <stdint.h> header file. */ #define LWS_HAVE_STDINT_H @@ -63,6 +48,9 @@ /* Define to 1 if you have the <sys/prctl.h> header file. */ #define LWS_HAVE_SYS_PRCTL_H +/* Define to 1 if you have the <sys/resource.h> header file. */ +#define LWS_HAVE_SYS_RESOURCE_H + /* Define to 1 if you have the <sys/socket.h> header file. */ #define LWS_HAVE_SYS_SOCKET_H @@ -87,10 +75,10 @@ /* #undef LWS_HAVE_VFORK_H */ /* Define to 1 if `fork' works. */ -#define LWS_HAVE_WORKING_FORK +/* #undef LWS_HAVE_WORKING_FORK */ /* Define to 1 if `vfork' works. */ -#define LWS_HAVE_WORKING_VFORK +/* #undef LWS_HAVE_WORKING_VFORK */ /* Define to 1 if execvpe() exists */ #define LWS_HAVE_EXECVPE @@ -117,7 +105,7 @@ /* #undef inline */ /* #undef LWS_WITH_ZLIB */ -#define LWS_HAS_PTHREAD_SETNAME_NP +/* #undef LWS_HAS_PTHREAD_SETNAME_NP */ /* Defined if you have the <inttypes.h> header file. */ #define LWS_HAVE_INTTYPES_H |