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

private.h: rename to contain dir

Browse source 
Having unique private header names is a requirement of a particular
platform build system it's desirable to work with
This commit is contained in:
Andy Green 2019-08-15 10:49:52 +01:00
parent 26319663f7
commit d7f0521aeb
182 changed files with 267 additions and 251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
CMakeLists.txt
View file

@ -339,7 +339,26 @@ if (NOT LWS_ROLE_WS)
set(LWS_WITHOUT_EXTENSIONS 1)
endif()
include_directories(include plugins)
if (LWS_WITH_MBEDTLS)
include_directories(lib/tls/mbedtls/wrapper/include)
endif()
include_directories(include plugins lib/core lib/core-net lib/event-libs include/abstract lib/tls lib/roles lib/event-libs/libuv lib/event-libs/poll lib/event-libs/libevent lib/event-libs/libev lib/jose/jwe lib/jose/jws lib/jose lib/misc lib/roles/http lib/roles/http/compression lib/roles/h1 lib/roles/h2 lib/roles/ws lib/roles/cgi lib/roles/dbus lib/roles/raw-proxy)
if (LWS_WITH_ESP32)
include_directories(lib/plat/esp32)
else()
if (WIN32)
include_directories(lib/plat/windows)
else()
if (LWS_WITH_OPTEE)
include_directories(lib/plat/optee)
else()
include_directories(lib/plat/unix)
endif()
endif()
endif()
if (LWS_WITH_LWSWS)
message(STATUS "LWS_WITH_LWSWS --> Enabling LWS_WITH_PLUGINS and LWS_WITH_LIBUV")
@ -940,7 +959,7 @@ include_directories("${PROJECT_SOURCE_DIR}/lib")
# Group headers and sources.
# Some IDEs use this for nicer file structure.
set(HDR_PRIVATE
lib/core/private.h)
lib/core/private-lib-core.h)
set(HDR_PUBLIC
"${PROJECT_SOURCE_DIR}/include/libwebsockets.h"
@ -1119,7 +1138,7 @@ if (NOT LWS_WITHOUT_CLIENT)
list(APPEND SOURCES
lib/core-net/connect.c
lib/core-net/client.c
lib/roles/http/client/client.c
lib/roles/http/client/client-http.c
lib/roles/http/client/client-handshake.c)
endif()
@ -1185,12 +1204,12 @@ if (LWS_WITH_SSL)
if (LWS_WITH_MBEDTLS)
list(APPEND SOURCES
lib/tls/mbedtls/tls.c
lib/tls/mbedtls/x509.c
lib/tls/mbedtls/mbedtls-tls.c
lib/tls/mbedtls/mbedtls-x509.c
)
if (LWS_WITH_NETWORK)
list(APPEND SOURCES
lib/tls/mbedtls/ssl.c
lib/tls/mbedtls/mbedtls-ssl.c
)
endif()
if (LWS_WITH_GENCRYPTO)
@ -1205,12 +1224,12 @@ if (LWS_WITH_SSL)
endif()
else()
list(APPEND SOURCES
lib/tls/openssl/tls.c
lib/tls/openssl/x509.c
lib/tls/openssl/openssl-tls.c
lib/tls/openssl/openssl-x509.c
)
if (LWS_WITH_NETWORK)
list(APPEND SOURCES
lib/tls/openssl/ssl.c
lib/tls/openssl/openssl-ssl.c
)
endif()
if (LWS_WITH_GENCRYPTO)

4
lib/abstract/abstract.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include <core/private.h>
#include <abstract/private.h>
#include <private-lib-core.h>
#include <private-lib-abstract.h>
extern const lws_abs_transport_t lws_abs_transport_cli_raw_skt,
lws_abs_transport_cli_unit_test;

0
lib/abstract/private.h → lib/abstract/private-lib-abstract.h
View file

4
lib/abstract/protocols/smtp/smtp.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "abstract/private.h"
#include "private-lib-core.h"
#include "private-lib-abstract.h"
/** enum lwsgs_smtp_states - where we are in SMTP protocol sequence */
typedef enum lwsgs_smtp_states {

2
lib/abstract/test-sequencer.c
View file

@ -28,7 +28,7 @@
* for each test using te
*/
#include <core/private.h>
#include <private-lib-core.h>
struct lws_seq_test_sequencer {
lws_abs_t original_abs;

4
lib/abstract/transports/raw-skt.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "abstract/private.h"
#include "private-lib-core.h"
#include "private-lib-abstract.h"
typedef struct lws_abstxp_raw_skt_priv {
struct lws_abs *abs;

4
lib/abstract/transports/unit-test.c
View file

@ -26,8 +26,8 @@
* to provided canned packets from an array of test vectors.
*/
#include "core/private.h"
#include "abstract/private.h"
#include "private-lib-core.h"
#include "private-lib-abstract.h"
/* this is the transport priv instantiated at abs->ati */

2
lib/core-net/adopt.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
static int
lws_get_idlest_tsi(struct lws_context *context)

2
lib/core-net/client.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
LWS_VISIBLE int
lws_set_proxy(struct lws_vhost *vhost, const char *proxy)

2
lib/core-net/close.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
void
__lws_free_wsi(struct lws *wsi)

2
lib/core-net/connect.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
void
lws_client_stash_destroy(struct lws *wsi)

2
lib/core-net/dummy-callback.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#if defined(LWS_WITH_HTTP_PROXY)
static int

2
lib/core-net/lws-dsh.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
struct lws_dsh_search {
size_t required;

2
lib/core-net/network.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#if !defined(LWS_WITH_ESP32) && !defined(LWS_PLAT_OPTEE)
static int

2
lib/core-net/output.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
/*
* notice this returns number of bytes consumed, or -1

2
lib/core-net/pollfd.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int
_lws_change_pollfd(struct lws *wsi, int _and, int _or, struct lws_pollargs *pa)

2
lib/core-net/private.h → lib/core-net/private-lib-core-net.h
View file

@ -29,7 +29,7 @@
#define _POSIX_C_SOURCE 200112L
#endif
#include "roles/private.h"
#include "private-lib-roles.h"
#ifdef LWS_WITH_IPV6
#if defined(WIN32) || defined(_WIN32)

2
lib/core-net/sequencer.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
/*
* per pending event

2
lib/core-net/server.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#if defined(LWS_WITH_SERVER_STATUS)

2
lib/core-net/service.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int
lws_callback_as_writeable(struct lws *wsi)

2
lib/core-net/sorted-usec-list.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
static int
sul_compare(const lws_dll2_t *d, const lws_dll2_t *i)

2
lib/core-net/stats.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#if defined(LWS_WITH_STATS)

2
lib/core-net/vhost.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
const struct lws_role_ops *available_roles[] = {
#if defined(LWS_ROLE_H2)

2
lib/core-net/wsi-timeout.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
void
__lws_wsi_remove_from_sul(struct lws *wsi)

2
lib/core-net/wsi.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#if defined (_DEBUG)
void lwsi_set_role(struct lws *wsi, lws_wsi_state_t role)

2
lib/core/alloc.c
View file

@ -1,4 +1,4 @@
#include "core/private.h"
#include "private-lib-core.h"
#if defined(LWS_HAVE_MALLOC_USABLE_SIZE)

2
lib/core/buflist.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#ifdef LWS_HAVE_SYS_TYPES_H
#include <sys/types.h>

6
lib/core/context.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#ifndef LWS_BUILD_HASH
#define LWS_BUILD_HASH "unknown-build-hash"
@ -152,7 +152,11 @@ lwsl_info("context created\n");
#endif
#if defined(LWS_WITH_ESP32)
#if defined(LWS_AMAZON_RTOS)
context->last_free_heap = xPortGetFreeHeapSize();
#else
context->last_free_heap = esp_get_free_heap_size();
#endif
#endif
/* default to just the platform fops implementation */

2
lib/core/libwebsockets.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#ifdef LWS_HAVE_SYS_TYPES_H
#include <sys/types.h>

2
lib/core/logs.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#ifdef LWS_HAVE_SYS_TYPES_H
#include <sys/types.h>

2
lib/core/lws_dll.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#ifdef LWS_HAVE_SYS_TYPES_H
#include <sys/types.h>

2
lib/core/lws_dll2.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#ifdef LWS_HAVE_SYS_TYPES_H
#include <sys/types.h>

14
lib/core/private.h → lib/core/private-lib-core.h
View file

@ -111,15 +111,15 @@
*/
#if defined(LWS_WITH_ESP32)
#include "plat/esp32/private.h"
#include "private-lib-plat-esp32.h"
#else
#if defined(WIN32) || defined(_WIN32)
#include "plat/windows/private.h"
#include "private-lib-plat-windows.h"
#else
#if defined(LWS_PLAT_OPTEE)
#include "plat/optee/private.h"
#include "private-lib-plat.h"
#else
#include "plat/unix/private.h"
#include "private-lib-plat-unix.h"
#endif
#endif
#endif
@ -132,7 +132,7 @@
#include "libwebsockets.h"
#include "tls/private.h"
#include "private-lib-tls.h"
#if defined(WIN32) || defined(_WIN32)
// Visual studio older than 2015 and WIN_CE has only _stricmp
@ -178,7 +178,7 @@ struct lws_protocols;
struct lws;
#if defined(LWS_WITH_NETWORK)
#include "event-libs/private.h"
#include "private-lib-event-libs.h"
struct lws_io_watcher {
@ -241,7 +241,7 @@ lws_mutex_refcount_unlock(struct lws_mutex_refcount *mr);
#endif
#if defined(LWS_WITH_NETWORK)
#include "core-net/private.h"
#include "private-lib-core-net.h"
#endif
struct lws_deferred_free

2
lib/core/vfs.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
LWS_VISIBLE LWS_EXTERN void
lws_set_fops(struct lws_context *context, const struct lws_plat_file_ops *fops)

8
lib/event-libs/README.md
View file

@ -24,7 +24,7 @@ If the event lib is disabled in cmake, nothing in its directory is built or refe
### Event loop ops struct
The event lib support is defined by `struct lws_event_loop_ops` in `lib/event-libs/private.h`,
The event lib support is defined by `struct lws_event_loop_ops` in `lib/event-libs/private-lib-event-libs.h`,
each event lib support instantiates one of these and fills in the appropriate ops
callbacks to perform its job. By convention that lives in
`./lib/event-libs/**lib name**/**lib_name**.c`.
@ -34,15 +34,15 @@ callbacks to perform its job. By convention that lives in
Truly private declarations for the event lib can go in the event-libs directory as you like.
However when the declarations must be accessible to other things in lws build, eg,
the event lib support adds members to `struct lws` when enabled, they should be in the
event lib supporr directory in a file `private.h`.
event lib support directory in a file `private-lib-event-libs-myeventlib.h`.
Search for "bring in event libs private declarations" in `./lib/core/private.h
Search for "bring in event libs private declarations" in `./lib/core/private-lib-core.h
and add your private event lib support file there following the style used for the other
event libs, eg,
```
#if defined(LWS_WITH_LIBUV)
#include "event-libs/libuv/private.h"
#include "event-libs/libuv/private-lib-event-libs-libuv.h"
#endif
```

2
lib/event-libs/libev/libev.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
static void
lws_ev_hrtimer_cb(struct ev_loop *loop, struct ev_timer *watcher, int revents)

0
lib/event-libs/libev/private.h → lib/event-libs/libev/private-lib-event-libs-libev.h
View file

2
lib/event-libs/libevent/libevent.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
static void
lws_event_hrtimer_cb(int fd, short event, void *p)

0
lib/event-libs/libevent/private.h → lib/event-libs/libevent/private-lib-event-libs-libevent.h
View file

2
lib/event-libs/libuv/libuv.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
static void
lws_uv_sultimer_cb(uv_timer_t *timer

0
lib/event-libs/libuv/private.h → lib/event-libs/libuv/private-lib-event-libs-libuv.h
View file

4
lib/event-libs/poll/poll.c
View file

@ -21,10 +21,10 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* This is included from core/private.h if LWS_ROLE_WS
* This is included from private-lib-core.h if LWS_ROLE_WS
*/
#include <core/private.h>
#include <private-lib-core.h>
struct lws_event_loop_ops event_loop_ops_poll = {
/* name */ "poll",

0
lib/event-libs/poll/private.h → lib/event-libs/poll/private-lib-event-libs-poll.h
View file

10
lib/event-libs/private.h → lib/event-libs/private-lib-event-libs.h
View file

@ -21,7 +21,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* This is included from core/private.h
* This is included from private-lib-core.h
*/
struct lws_event_loop_ops {
@ -60,18 +60,18 @@ struct lws_event_loop_ops {
/* bring in event libs private declarations */
#if defined(LWS_WITH_POLL)
#include "event-libs/poll/private.h"
#include "private-lib-event-libs-poll.h"
#endif
#if defined(LWS_WITH_LIBUV)
#include "event-libs/libuv/private.h"
#include "private-lib-event-libs-libuv.h"
#endif
#if defined(LWS_WITH_LIBEVENT)
#include "event-libs/libevent/private.h"
#include "private-lib-event-libs-libevent.h"
#endif
#if defined(LWS_WITH_LIBEV)
#include "event-libs/libev/private.h"
#include "private-lib-event-libs-libev.h"
#endif

4
lib/jose/jwe/enc/aescbc.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/jwe/private.h"
#include "private-lib-core.h"
#include "private-lib-jose-jwe.h"
int
lws_jwe_encrypt_cbc_hs(struct lws_jwe *jwe, uint8_t *cek,

4
lib/jose/jwe/enc/aesgcm.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/jwe/private.h"
#include "private-lib-core.h"
#include "private-lib-jose-jwe.h"
/*
* NOTICE this is AESGCM content encryption, it's not AES GCM key wrapping

4
lib/jose/jwe/enc/aeskw.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/jwe/private.h"
#include "private-lib-core.h"
#include "private-lib-jose-jwe.h"
/*
* RFC3394 Key Wrap uses a 128-bit key, and bloats what it is wrapping by

4
lib/jose/jwe/jwe-ecdh-es-aeskw.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/jwe/private.h"
#include "private-lib-core.h"
#include "private-lib-jose-jwe.h"
/*
* From RFC7518 JWA

4
lib/jose/jwe/jwe-rsa-aescbc.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/jwe/private.h"
#include "private-lib-core.h"
#include "private-lib-jose-jwe.h"
/*
* Requirements on entry:

4
lib/jose/jwe/jwe-rsa-aesgcm.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/jwe/private.h"
#include "private-lib-core.h"
#include "private-lib-jose-jwe.h"
#define LWS_AESGCM_IV 12

6
lib/jose/jwe/jwe.c
View file

@ -22,9 +22,9 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/private.h"
#include "jose/jwe/private.h"
#include "private-lib-core.h"
#include "private-lib-jose.h"
#include "private-lib-jose-jwe.h"
/*
* Currently only support flattened or compact (implicitly single signature)

0
lib/jose/jwe/private.h → lib/jose/jwe/private-lib-jose-jwe.h
View file

4
lib/jose/jwk/jwk.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "jose/private.h"
#include "private-lib-core.h"
#include "private-lib-jose.h"
#if !defined(LWS_PLAT_OPTEE) && !defined(OPTEE_DEV_KIT)
#include <fcntl.h>

4
lib/jose/jws/jose.c
View file

@ -25,8 +25,8 @@
* to specify its JOSE JSON object. So it lives in ./lib/jose/jws/jose.c.
*/
#include "core/private.h"
#include "jose/private.h"
#include "private-lib-core.h"
#include "jose/private-lib-jose.h"
#include <stdint.h>

4
lib/jose/jws/jws.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private.h"
#include "private-lib-core.h"
#include "private-lib-jose-jws.h"
/*
* Currently only support flattened or compact (implicitly single signature)

0
lib/jose/jws/private.h → lib/jose/jws/private-lib-jose-jws.h
View file

0
lib/jose/private.h → lib/jose/private-lib-jose.h
View file

2
lib/misc/base64-decode.c
View file

@ -40,7 +40,7 @@
#include <stdio.h>
#include <string.h>
#include "core/private.h"
#include "private-lib-core.h"
static const char encode_orig[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz0123456789+/";

2
lib/misc/daemonize.c
View file

@ -26,7 +26,7 @@
#include <unistd.h>
#include <errno.h>
#include "core/private.h"
#include "private-lib-core.h"
pid_t pid_daemon;
static char *lock_path;

2
lib/misc/dir.c
View file

@ -26,7 +26,7 @@
#define _DARWIN_C_SOURCE
#include <libwebsockets.h>
#include "core/private.h"
#include "private-lib-core.h"
#include <string.h>
#include <stdio.h>

2
lib/misc/diskcache.c
View file

@ -25,7 +25,7 @@
#define _GNU_SOURCE
#include <pthread.h>
#include "core/private.h"
#include "private-lib-core.h"
#include <string.h>
#include <stdio.h>

0
lib/misc/fts/private.h → lib/misc/fts/private-lib-misc-fts.h
View file

4
lib/misc/fts/trie-fd.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "misc/fts/private.h"
#include "private-lib-core.h"
#include "private-lib-misc-fts.h"
#include <stdio.h>
#include <string.h>

4
lib/misc/fts/trie.c
View file

@ -33,8 +33,8 @@
* having to load it all in memory
*/
#include "core/private.h"
#include "misc/fts/private.h"
#include "private-lib-core.h"
#include "private-lib-misc-fts.h"
#include <stdio.h>
#include <string.h>

2
lib/misc/getifaddrs.c
View file

@ -43,7 +43,7 @@
#include <string.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include "core/private.h"
#include "private-lib-core.h"
#ifdef LWS_HAVE_SYS_SOCKIO_H
#include <sys/sockio.h>

2
lib/misc/lejp.c
View file

@ -23,7 +23,7 @@
*/
#include <libwebsockets.h>
#include "core/private.h"
#include "private-lib-core.h"
#include <string.h>
#include <stdio.h>

2
lib/misc/lws-ring.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
LWS_VISIBLE LWS_EXTERN struct lws_ring *
lws_ring_create(size_t element_len, size_t count,

2
lib/misc/lws-struct-lejp.c
View file

@ -23,7 +23,7 @@
*/
#include <libwebsockets.h>
#include <core/private.h>
#include <private-lib-core.h>
#include <assert.h>

2
lib/misc/lws-struct-sqlite.c
View file

@ -23,7 +23,7 @@
*/
#include <libwebsockets.h>
#include <core/private.h>
#include <private-lib-core.h>
#include <sqlite3.h>

4
lib/misc/lwsac/cached-file.c
View file

@ -24,8 +24,8 @@
#if !defined(LWS_PLAT_OPTEE) && !defined(OPTEE_DEV_KIT)
#include "core/private.h"
#include "misc/lwsac/private.h"
#include "private-lib-core.h"
#include "private-lib-misc-lwsac.h"
/*
* Helper for caching a file in memory in a lac, but also to check at intervals

4
lib/misc/lwsac/lwsac.c
View file

@ -22,8 +22,8 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "misc/lwsac/private.h"
#include "private-lib-core.h"
#include "private-lib-misc-lwsac.h"
void
lws_list_ptr_insert(lws_list_ptr *head, lws_list_ptr *add,

0
lib/misc/lwsac/private.h → lib/misc/lwsac/private-lib-misc-lwsac.h
View file

2
lib/misc/peer-limits.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
/* requires context->lock */
static void

2
lib/misc/sha-1.c
View file

@ -32,7 +32,7 @@
* implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
*/
#include "core/private.h"
#include "private-lib-core.h"
#ifdef LWS_HAVE_SYS_TYPES_H
#include <sys/types.h>

2
lib/misc/threadpool/threadpool.c
View file

@ -25,7 +25,7 @@
#define _GNU_SOURCE
#include <pthread.h>
#include "core/private.h"
#include "private-lib-core.h"
#include <string.h>
#include <stdio.h>

2
lib/plat/esp32/esp32-fds.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
void
lws_plat_insert_socket_into_fds(struct lws_context *context, struct lws *wsi)

2
lib/plat/esp32/esp32-file.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int lws_plat_apply_FD_CLOEXEC(int n)
{

4
lib/plat/esp32/esp32-helpers.c
View file

@ -22,9 +22,9 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#include "misc/romfs.h"
#include "romfs.h"
#include <esp_ota_ops.h>
#include <tcpip_adapter.h>
#include <esp_image_format.h>

2
lib/plat/esp32/esp32-init.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int
lws_plat_context_early_init(void)

2
lib/plat/esp32/esp32-misc.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
lws_usec_t
lws_now_usecs(void)

2
lib/plat/esp32/esp32-pipe.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int
lws_plat_pipe_create(struct lws *wsi)

2
lib/plat/esp32/esp32-service.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int
lws_plat_service(struct lws_context *context, int timeout_ms)

2
lib/plat/esp32/esp32-sockets.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int
lws_send_pipe_choked(struct lws *wsi)

2
lib/plat/esp32/private.h → lib/plat/esp32/private-lib-plat-esp32.h
View file

@ -21,7 +21,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Included from lib/core/private.h if LWS_WITH_ESP32
* Included from lib/private-lib-core.h if LWS_WITH_ESP32
*/
#define MSG_NOSIGNAL 0

2
lib/plat/optee/lws-plat-optee.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
#if !defined(LWS_WITH_NETWORK)
#include <crypto/crypto.h>

2
lib/plat/optee/network.c
View file

@ -22,7 +22,7 @@
* IN THE SOFTWARE.
*/
#include "core/private.h"
#include "private-lib-core.h"
int

2
lib/plat/optee/private.h → lib/plat/optee/private-lib-plat-optee.h
View file

@ -21,7 +21,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Included from lib/core/private.h if LWS_WITH_OPTEE
* Included from lib/private-lib-core.h if LWS_WITH_OPTEE
*/
#include <unistd.h>

2
lib/plat/unix/private.h → lib/plat/unix/private-lib-plat-unix.h
View file

@ -21,7 +21,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Included from lib/core/private.h if no explicit platform
* Included from lib/private-lib-core.h if no explicit platform
*/
#include <fcntl.h>

2
lib/plat/unix/unix-caps.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
#include <pwd.h>
#include <grp.h>

2
lib/plat/unix/unix-fds.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
struct lws *
wsi_from_fd(const struct lws_context *context, int fd)

2
lib/plat/unix/unix-file.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
#include <pwd.h>
#include <grp.h>

2
lib/plat/unix/unix-init.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
#include <pwd.h>
#include <grp.h>

2
lib/plat/unix/unix-misc.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
lws_usec_t
lws_now_usecs(void)

2
lib/plat/unix/unix-pipe.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
int

2
lib/plat/unix/unix-plugins.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
#include <pwd.h>
#include <grp.h>

2
lib/plat/unix/unix-service.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
int
lws_poll_listen_fd(struct lws_pollfd *fd)

2
lib/plat/unix/unix-sockets.c
View file

@ -23,7 +23,7 @@
*/
#define _GNU_SOURCE
#include "core/private.h"
#include "private-lib-core.h"
#include <pwd.h>
#include <grp.h>

2
lib/plat/windows/private.h → lib/plat/windows/private-lib-plat-windows.h
View file

@ -21,7 +21,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Included from lib/core/private.h if defined(WIN32) || defined(_WIN32)
* Included from lib/private-lib-core.h if defined(WIN32) || defined(_WIN32)
*/
#ifndef WIN32_LEAN_AND_MEAN

2
lib/plat/windows/windows-fds.c
View file

@ -25,7 +25,7 @@
#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
#define _WINSOCK_DEPRECATED_NO_WARNINGS
#endif
#include "core/private.h"
#include "private-lib-core.h"
struct lws *
wsi_from_fd(const struct lws_context *context, lws_sockfd_type fd)

2
lib/plat/windows/windows-file.c
View file

@ -25,7 +25,7 @@
#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
#define _WINSOCK_DEPRECATED_NO_WARNINGS
#endif
#include "core/private.h"
#include "private-lib-core.h"
int lws_plat_apply_FD_CLOEXEC(int n)
{

Some files were not shown because too many files have changed in this diff Show more