private.h: rename to contain dir

Having unique private header names is a requirement of a particular
platform build system it's desirable to work with

https://github.com/warmcat/libwebsockets/commit/d7f0521aeb7e98bbbcdd1ed75df7331cfb11aa36

Change-Id: Ie7ebb3e65f352ee81be0f168c8b1d2226fa6f33a
Signed-off-by: Cheoleun Moon <chleun.moon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 491531a..a07683c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)

diff --git a/lib/abstract/abstract.c b/lib/abstract/abstract.c
index 0f52869..ad17545 100644 (file)
--- a/lib/abstract/abstract.c
+++ b/lib/abstract/abstract.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#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;

diff --git a/lib/abstract/private.h b/lib/abstract/private-lib-abstract.h
similarity index 100%
rename from lib/abstract/private.h
rename to lib/abstract/private-lib-abstract.h

diff --git a/lib/abstract/protocols/smtp/smtp.c b/lib/abstract/protocols/smtp/smtp.c
index 668ab19..eb52518 100644 (file)
--- a/lib/abstract/protocols/smtp/smtp.c
+++ b/lib/abstract/protocols/smtp/smtp.c
@@ -19,8 +19,8 @@
  * MA  02110-1301  USA
  */
 
-#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 {

diff --git a/lib/abstract/test-sequencer.c b/lib/abstract/test-sequencer.c
index 2872aef..f1e1dff 100644 (file)
--- a/lib/abstract/test-sequencer.c
+++ b/lib/abstract/test-sequencer.c
@@ -26,7 +26,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;

diff --git a/lib/abstract/transports/raw-skt.c b/lib/abstract/transports/raw-skt.c
index 74f08ab..eab8715 100644 (file)
--- a/lib/abstract/transports/raw-skt.c
+++ b/lib/abstract/transports/raw-skt.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#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;

diff --git a/lib/abstract/transports/unit-test.c b/lib/abstract/transports/unit-test.c
index c891861..b1095ae 100644 (file)
--- a/lib/abstract/transports/unit-test.c
+++ b/lib/abstract/transports/unit-test.c
@@ -24,8 +24,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 */
 

diff --git a/lib/core-net/adopt.c b/lib/core-net/adopt.c
index 9b84af2..43e8954 100644 (file)
--- a/lib/core-net/adopt.c
+++ b/lib/core-net/adopt.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 static int

diff --git a/lib/core-net/client.c b/lib/core-net/client.c
index 873478b..90283ef 100644 (file)
--- a/lib/core-net/client.c
+++ b/lib/core-net/client.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 LWS_VISIBLE int

diff --git a/lib/core-net/close.c b/lib/core-net/close.c
index f561e94..97719aa 100644 (file)
--- a/lib/core-net/close.c
+++ b/lib/core-net/close.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 void

diff --git a/lib/core-net/connect.c b/lib/core-net/connect.c
index 604bebb..ea66687 100644 (file)
--- a/lib/core-net/connect.c
+++ b/lib/core-net/connect.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 void
 lws_client_stash_destroy(struct lws *wsi)

diff --git a/lib/core-net/dummy-callback.c b/lib/core-net/dummy-callback.c
index bf227eb..5b0a468 100644 (file)
--- a/lib/core-net/dummy-callback.c
+++ b/lib/core-net/dummy-callback.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_HTTP_PROXY)
 static int

diff --git a/lib/core-net/lws-dsh.c b/lib/core-net/lws-dsh.c
index 7e28dad..c902670 100644 (file)
--- a/lib/core-net/lws-dsh.c
+++ b/lib/core-net/lws-dsh.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 struct lws_dsh_search {
        size_t          required;

diff --git a/lib/core-net/network.c b/lib/core-net/network.c
index 8c3fe1a..e487369 100644 (file)
--- a/lib/core-net/network.c
+++ b/lib/core-net/network.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if !defined(LWS_WITH_ESP32) && !defined(LWS_PLAT_OPTEE)
 static int

diff --git a/lib/core-net/output.c b/lib/core-net/output.c
index bcbc6d5..7c43eec 100644 (file)
--- a/lib/core-net/output.c
+++ b/lib/core-net/output.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * notice this returns number of bytes consumed, or -1

diff --git a/lib/core-net/pollfd.c b/lib/core-net/pollfd.c
index 725861c..77057e3 100644 (file)
--- a/lib/core-net/pollfd.c
+++ b/lib/core-net/pollfd.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 _lws_change_pollfd(struct lws *wsi, int _and, int _or, struct lws_pollargs *pa)

diff --git a/lib/core-net/private.h b/lib/core-net/private-lib-core-net.h
similarity index 99%
rename from lib/core-net/private.h
rename to lib/core-net/private-lib-core-net.h
index 7d5910e..16ca46c 100644 (file)
--- a/lib/core-net/private.h
+++ b/lib/core-net/private-lib-core-net.h
@@ -26,7 +26,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)

diff --git a/lib/core-net/sequencer.c b/lib/core-net/sequencer.c
index fbfd752..be1e889 100644 (file)
--- a/lib/core-net/sequencer.c
+++ b/lib/core-net/sequencer.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * per pending event

diff --git a/lib/core-net/server.c b/lib/core-net/server.c
index e64c034..9720bcb 100644 (file)
--- a/lib/core-net/server.c
+++ b/lib/core-net/server.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_SERVER_STATUS)
 

diff --git a/lib/core-net/service.c b/lib/core-net/service.c
index 05c14e9..d37379b 100644 (file)
--- a/lib/core-net/service.c
+++ b/lib/core-net/service.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_callback_as_writeable(struct lws *wsi)

diff --git a/lib/core-net/sorted-usec-list.c b/lib/core-net/sorted-usec-list.c
index 12348f6..7b3c66f 100644 (file)
--- a/lib/core-net/sorted-usec-list.c
+++ b/lib/core-net/sorted-usec-list.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 sul_compare(const lws_dll2_t *d, const lws_dll2_t *i)

diff --git a/lib/core-net/stats.c b/lib/core-net/stats.c
index e87fc2e..5554483 100644 (file)
--- a/lib/core-net/stats.c
+++ b/lib/core-net/stats.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 #if defined(LWS_WITH_STATS)

diff --git a/lib/core-net/vhost.c b/lib/core-net/vhost.c
index 69fe26a..85d3cbb 100644 (file)
--- a/lib/core-net/vhost.c
+++ b/lib/core-net/vhost.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 const struct lws_role_ops *available_roles[] = {
 #if defined(LWS_ROLE_H2)

diff --git a/lib/core-net/wsi-timeout.c b/lib/core-net/wsi-timeout.c
index 88d0cb3..35b774a 100644 (file)
--- a/lib/core-net/wsi-timeout.c
+++ b/lib/core-net/wsi-timeout.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 void
 __lws_wsi_remove_from_sul(struct lws *wsi)

diff --git a/lib/core-net/wsi.c b/lib/core-net/wsi.c
index 3968f62..8cbd940 100644 (file)
--- a/lib/core-net/wsi.c
+++ b/lib/core-net/wsi.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined (_DEBUG)
 void lwsi_set_role(struct lws *wsi, lws_wsi_state_t role)

diff --git a/lib/core/alloc.c b/lib/core/alloc.c
index 09d8882..a0738a7 100644 (file)
--- a/lib/core/alloc.c
+++ b/lib/core/alloc.c
@@ -1,4 +1,4 @@
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_HAVE_MALLOC_USABLE_SIZE)
 

diff --git a/lib/core/buflist.c b/lib/core/buflist.c
index 75c156f..e298c77 100644 (file)
--- a/lib/core/buflist.c
+++ b/lib/core/buflist.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/lib/core/context.c b/lib/core/context.c
index f4887b9..03a52a0 100644 (file)
--- a/lib/core/context.c
+++ b/lib/core/context.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifndef LWS_BUILD_HASH
 #define LWS_BUILD_HASH "unknown-build-hash"
@@ -149,8 +149,12 @@ 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 */
 

diff --git a/lib/core/libwebsockets.c b/lib/core/libwebsockets.c
index c425cdc..26b907d 100644 (file)
--- a/lib/core/libwebsockets.c
+++ b/lib/core/libwebsockets.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/lib/core/logs.c b/lib/core/logs.c
index dbece69..51eef0b 100644 (file)
--- a/lib/core/logs.c
+++ b/lib/core/logs.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/lib/core/lws_dll.c b/lib/core/lws_dll.c
index bbb9c2b..692c5de 100644 (file)
--- a/lib/core/lws_dll.c
+++ b/lib/core/lws_dll.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/lib/core/lws_dll2.c b/lib/core/lws_dll2.c
index f3b47f9..9530c18 100644 (file)
--- a/lib/core/lws_dll2.c
+++ b/lib/core/lws_dll2.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/lib/core/private.h b/lib/core/private-lib-core.h
similarity index 98%
rename from lib/core/private.h
rename to lib/core/private-lib-core.h
index 196b43a..4fcc607 100644 (file)
--- a/lib/core/private.h
+++ b/lib/core/private-lib-core.h
@@ -108,15 +108,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
@@ -129,7 +129,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
@@ -175,7 +175,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 {
@@ -238,7 +238,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

diff --git a/lib/core/vfs.c b/lib/core/vfs.c
index 0f37d90..f11a36a 100644 (file)
--- a/lib/core/vfs.c
+++ b/lib/core/vfs.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 LWS_VISIBLE LWS_EXTERN void

diff --git a/lib/event-libs/README.md b/lib/event-libs/README.md
index ccfbb7c..1fab4f4 100644 (file)
--- a/lib/event-libs/README.md
+++ b/lib/event-libs/README.md
@@ -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
 ```
 

diff --git a/lib/event-libs/libev/libev.c b/lib/event-libs/libev/libev.c
index 4b85c19..d1a587d 100644 (file)
--- a/lib/event-libs/libev/libev.c
+++ b/lib/event-libs/libev/libev.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#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)

diff --git a/lib/event-libs/libev/private.h b/lib/event-libs/libev/private-lib-event-libs-libev.h
similarity index 100%
rename from lib/event-libs/libev/private.h
rename to lib/event-libs/libev/private-lib-event-libs-libev.h

diff --git a/lib/event-libs/libevent/libevent.c b/lib/event-libs/libevent/libevent.c
index cc89c75..0f85040 100644 (file)
--- a/lib/event-libs/libevent/libevent.c
+++ b/lib/event-libs/libevent/libevent.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static void
 lws_event_hrtimer_cb(int fd, short event, void *p)

diff --git a/lib/event-libs/libevent/private.h b/lib/event-libs/libevent/private-lib-event-libs-libevent.h
similarity index 100%
rename from lib/event-libs/libevent/private.h
rename to lib/event-libs/libevent/private-lib-event-libs-libevent.h

diff --git a/lib/event-libs/libuv/libuv.c b/lib/event-libs/libuv/libuv.c
index 58c2056..5d723a8 100644 (file)
--- a/lib/event-libs/libuv/libuv.c
+++ b/lib/event-libs/libuv/libuv.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static void
 lws_uv_sultimer_cb(uv_timer_t *timer

diff --git a/lib/event-libs/libuv/private.h b/lib/event-libs/libuv/private-lib-event-libs-libuv.h
similarity index 100%
rename from lib/event-libs/libuv/private.h
rename to lib/event-libs/libuv/private-lib-event-libs-libuv.h

diff --git a/lib/event-libs/poll/poll.c b/lib/event-libs/poll/poll.c
index 6fb312f..0296dd9 100644 (file)
--- a/lib/event-libs/poll/poll.c
+++ b/lib/event-libs/poll/poll.c
@@ -18,10 +18,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  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",

diff --git a/lib/event-libs/poll/private.h b/lib/event-libs/poll/private-lib-event-libs-poll.h
similarity index 100%
rename from lib/event-libs/poll/private.h
rename to lib/event-libs/poll/private-lib-event-libs-poll.h

diff --git a/lib/event-libs/private.h b/lib/event-libs/private-lib-event-libs.h
similarity index 91%
rename from lib/event-libs/private.h
rename to lib/event-libs/private-lib-event-libs.h
index 58bca94..068cf14 100644 (file)
--- a/lib/event-libs/private.h
+++ b/lib/event-libs/private-lib-event-libs.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h
+ *  This is included from private-lib-core.h
  */
 
 struct lws_event_loop_ops {
@@ -57,18 +57,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
 

diff --git a/lib/jose/jwe/enc/aescbc.c b/lib/jose/jwe/enc/aescbc.c
index 54cabc7..46ad7db 100644 (file)
--- a/lib/jose/jwe/enc/aescbc.c
+++ b/lib/jose/jwe/enc/aescbc.c
@@ -22,8 +22,9 @@
  * JWE code for payload encrypt / decrypt using aescbc
  *
  */
-#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,

diff --git a/lib/jose/jwe/enc/aesgcm.c b/lib/jose/jwe/enc/aesgcm.c
index 4e93878..2abb1e3 100644 (file)
--- a/lib/jose/jwe/enc/aesgcm.c
+++ b/lib/jose/jwe/enc/aesgcm.c
@@ -22,8 +22,9 @@
  * JWE code related to aes gcm
  *
  */
-#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

diff --git a/lib/jose/jwe/enc/aeskw.c b/lib/jose/jwe/enc/aeskw.c
index 7d0b5a7..2fc969d 100644 (file)
--- a/lib/jose/jwe/enc/aeskw.c
+++ b/lib/jose/jwe/enc/aeskw.c
@@ -22,9 +22,9 @@
  * JWE code related to aeskw cbc
  *
  */
-#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

diff --git a/lib/jose/jwe/jwe-ecdh-es-aeskw.c b/lib/jose/jwe/jwe-ecdh-es-aeskw.c
index 4be1a56..29c7874 100644 (file)
--- a/lib/jose/jwe/jwe-ecdh-es-aeskw.c
+++ b/lib/jose/jwe/jwe-ecdh-es-aeskw.c
@@ -22,8 +22,9 @@
  * JWE code related to ecdh-es + Concat KDF and aes kw
  *
  */
-#include "core/private.h"
-#include "jose/jwe/private.h"
+
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 /*
  * From RFC7518 JWA

diff --git a/lib/jose/jwe/jwe-rsa-aescbc.c b/lib/jose/jwe/jwe-rsa-aescbc.c
index 7f2f21e..ad16945 100644 (file)
--- a/lib/jose/jwe/jwe-rsa-aescbc.c
+++ b/lib/jose/jwe/jwe-rsa-aescbc.c
@@ -22,8 +22,9 @@
  * JWE code related to rsa + aescbc
  *
  */
-#include "core/private.h"
-#include "jose/jwe/private.h"
+
+#include "private-lib-core.h"
+#include "private-lib-jose-jwe.h"
 
 /*
  * Requirements on entry:

diff --git a/lib/jose/jwe/jwe-rsa-aesgcm.c b/lib/jose/jwe/jwe-rsa-aesgcm.c
index 42eb0b2..d70e7f5 100644 (file)
--- a/lib/jose/jwe/jwe-rsa-aesgcm.c
+++ b/lib/jose/jwe/jwe-rsa-aesgcm.c
@@ -22,8 +22,9 @@
  * JWE code related to aes gcm
  *
  */
-#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
 

diff --git a/lib/jose/jwe/jwe.c b/lib/jose/jwe/jwe.c
index bb8446e..a99b163 100644 (file)
--- a/lib/jose/jwe/jwe.c
+++ b/lib/jose/jwe/jwe.c
@@ -22,9 +22,10 @@
  * This supports RFC7516 JSON Web Encryption
  *
  */
-#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)

diff --git a/lib/jose/jwe/private.h b/lib/jose/jwe/private-lib-jose-jwe.h
similarity index 100%
rename from lib/jose/jwe/private.h
rename to lib/jose/jwe/private-lib-jose-jwe.h

diff --git a/lib/jose/jwk/jwk.c b/lib/jose/jwk/jwk.c
index 35f4723..7b52536 100644 (file)
--- a/lib/jose/jwk/jwk.c
+++ b/lib/jose/jwk/jwk.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#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>

diff --git a/lib/jose/jws/jose.c b/lib/jose/jws/jose.c
index 627fd23..7332087 100644 (file)
--- a/lib/jose/jws/jose.c
+++ b/lib/jose/jws/jose.c
@@ -22,8 +22,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>
 

diff --git a/lib/jose/jws/jws.c b/lib/jose/jws/jws.c
index 2b37fd4..73991d2 100644 (file)
--- a/lib/jose/jws/jws.c
+++ b/lib/jose/jws/jws.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#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)

diff --git a/lib/jose/jws/private.h b/lib/jose/jws/private-lib-jose-jws.h
similarity index 100%
rename from lib/jose/jws/private.h
rename to lib/jose/jws/private-lib-jose-jws.h

diff --git a/lib/jose/private.h b/lib/jose/private-lib-jose.h
similarity index 100%
rename from lib/jose/private.h
rename to lib/jose/private-lib-jose.h

diff --git a/lib/misc/base64-decode.c b/lib/misc/base64-decode.c
index b46a942..010cc7d 100644 (file)
--- a/lib/misc/base64-decode.c
+++ b/lib/misc/base64-decode.c
@@ -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+/";

diff --git a/lib/misc/daemonize.c b/lib/misc/daemonize.c
index 52fd6ea..27076e7 100644 (file)
--- a/lib/misc/daemonize.c
+++ b/lib/misc/daemonize.c
@@ -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;

diff --git a/lib/misc/dir.c b/lib/misc/dir.c
index f3d8781..124b694 100644 (file)
--- a/lib/misc/dir.c
+++ b/lib/misc/dir.c
@@ -23,7 +23,7 @@
 #define _DARWIN_C_SOURCE
 
 #include <libwebsockets.h>
-#include "core/private.h"
+#include "private-lib-core.h"
 #include <string.h>
 #include <stdio.h>
 

diff --git a/lib/misc/diskcache.c b/lib/misc/diskcache.c
index 0a31810..d90805a 100644 (file)
--- a/lib/misc/diskcache.c
+++ b/lib/misc/diskcache.c
@@ -22,7 +22,7 @@
 #define _GNU_SOURCE
 #include <pthread.h>
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/lib/misc/fts/private.h b/lib/misc/fts/private-lib-misc-fts.h
similarity index 100%
rename from lib/misc/fts/private.h
rename to lib/misc/fts/private-lib-misc-fts.h

diff --git a/lib/misc/fts/trie-fd.c b/lib/misc/fts/trie-fd.c
index cdb2e42..a4bfd11 100644 (file)
--- a/lib/misc/fts/trie-fd.c
+++ b/lib/misc/fts/trie-fd.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#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>

diff --git a/lib/misc/fts/trie.c b/lib/misc/fts/trie.c
index d188165..774dc40 100644 (file)
--- a/lib/misc/fts/trie.c
+++ b/lib/misc/fts/trie.c
@@ -30,8 +30,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>

diff --git a/lib/misc/getifaddrs.c b/lib/misc/getifaddrs.c
index 735b899..7daeec8 100644 (file)
--- a/lib/misc/getifaddrs.c
+++ b/lib/misc/getifaddrs.c
@@ -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>

diff --git a/lib/misc/lejp.c b/lib/misc/lejp.c
index 2190413..0113ef1 100644 (file)
--- a/lib/misc/lejp.c
+++ b/lib/misc/lejp.c
@@ -20,7 +20,7 @@
  */
 
 #include <libwebsockets.h>
-#include "core/private.h"
+#include "private-lib-core.h"
 #include <string.h>
 #include <stdio.h>
 

diff --git a/lib/misc/lws-ring.c b/lib/misc/lws-ring.c
index bbd4df9..0381b64 100644 (file)
--- a/lib/misc/lws-ring.c
+++ b/lib/misc/lws-ring.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#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,

diff --git a/lib/misc/lws-struct-lejp.c b/lib/misc/lws-struct-lejp.c
index af637cc..2862292 100644 (file)
--- a/lib/misc/lws-struct-lejp.c
+++ b/lib/misc/lws-struct-lejp.c
@@ -20,7 +20,7 @@
  */
 
 #include <libwebsockets.h>
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #include <assert.h>
 

diff --git a/lib/misc/lws-struct-sqlite.c b/lib/misc/lws-struct-sqlite.c
index e89343e..ef17455 100644 (file)
--- a/lib/misc/lws-struct-sqlite.c
+++ b/lib/misc/lws-struct-sqlite.c
@@ -20,7 +20,7 @@
  */
 
 #include <libwebsockets.h>
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #include <sqlite3.h>
 

diff --git a/lib/misc/lwsac/cached-file.c b/lib/misc/lwsac/cached-file.c
index 6598201..9c0bb10 100644 (file)
--- a/lib/misc/lwsac/cached-file.c
+++ b/lib/misc/lwsac/cached-file.c
@@ -21,8 +21,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

diff --git a/lib/misc/lwsac/lwsac.c b/lib/misc/lwsac/lwsac.c
index 6471c16..024c71e 100644 (file)
--- a/lib/misc/lwsac/lwsac.c
+++ b/lib/misc/lwsac/lwsac.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#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,

diff --git a/lib/misc/lwsac/private.h b/lib/misc/lwsac/private-lib-misc-lwsac.h
similarity index 100%
rename from lib/misc/lwsac/private.h
rename to lib/misc/lwsac/private-lib-misc-lwsac.h

diff --git a/lib/misc/peer-limits.c b/lib/misc/peer-limits.c
index 53d9421..3bc1f9c 100644 (file)
--- a/lib/misc/peer-limits.c
+++ b/lib/misc/peer-limits.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /* requires context->lock */
 static void

diff --git a/lib/misc/sha-1.c b/lib/misc/sha-1.c
index c17a437..b38971f 100644 (file)
--- a/lib/misc/sha-1.c
+++ b/lib/misc/sha-1.c
@@ -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>

diff --git a/lib/misc/threadpool/threadpool.c b/lib/misc/threadpool/threadpool.c
index de9bab7..0aeff68 100644 (file)
--- a/lib/misc/threadpool/threadpool.c
+++ b/lib/misc/threadpool/threadpool.c
@@ -22,7 +22,7 @@
 #define _GNU_SOURCE
 #include <pthread.h>
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/lib/plat/esp32/esp32-fds.c b/lib/plat/esp32/esp32-fds.c
index a6fc86c..1d74d62 100644 (file)
--- a/lib/plat/esp32/esp32-fds.c
+++ b/lib/plat/esp32/esp32-fds.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 void
 lws_plat_insert_socket_into_fds(struct lws_context *context, struct lws *wsi)

diff --git a/lib/plat/esp32/esp32-file.c b/lib/plat/esp32/esp32-file.c
index f2909bb..0711f1e 100644 (file)
--- a/lib/plat/esp32/esp32-file.c
+++ b/lib/plat/esp32/esp32-file.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int lws_plat_apply_FD_CLOEXEC(int n)
 {

diff --git a/lib/plat/esp32/esp32-helpers.c b/lib/plat/esp32/esp32-helpers.c
index 7ecaf6f..8ff16aa 100644 (file)
--- a/lib/plat/esp32/esp32-helpers.c
+++ b/lib/plat/esp32/esp32-helpers.c
@@ -19,9 +19,9 @@
  *  MA  02110-1301  USA
  */
 
-#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>

diff --git a/lib/plat/esp32/esp32-init.c b/lib/plat/esp32/esp32-init.c
index 2f537d0..fe7e3f8 100644 (file)
--- a/lib/plat/esp32/esp32-init.c
+++ b/lib/plat/esp32/esp32-init.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_context_early_init(void)

diff --git a/lib/plat/esp32/esp32-misc.c b/lib/plat/esp32/esp32-misc.c
index 65de064..8f6e90b 100644 (file)
--- a/lib/plat/esp32/esp32-misc.c
+++ b/lib/plat/esp32/esp32-misc.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 lws_usec_t
 lws_now_usecs(void)

diff --git a/lib/plat/esp32/esp32-pipe.c b/lib/plat/esp32/esp32-pipe.c
index c8e11c8..ac9950a 100644 (file)
--- a/lib/plat/esp32/esp32-pipe.c
+++ b/lib/plat/esp32/esp32-pipe.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_pipe_create(struct lws *wsi)

diff --git a/lib/plat/esp32/esp32-service.c b/lib/plat/esp32/esp32-service.c
index 36c7c69..28ccb14 100644 (file)
--- a/lib/plat/esp32/esp32-service.c
+++ b/lib/plat/esp32/esp32-service.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_service(struct lws_context *context, int timeout_ms)

diff --git a/lib/plat/esp32/esp32-sockets.c b/lib/plat/esp32/esp32-sockets.c
index 80b50c8..5e95479 100644 (file)
--- a/lib/plat/esp32/esp32-sockets.c
+++ b/lib/plat/esp32/esp32-sockets.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_send_pipe_choked(struct lws *wsi)

diff --git a/lib/plat/esp32/private.h b/lib/plat/esp32/private-lib-plat-esp32.h
similarity index 97%
rename from lib/plat/esp32/private.h
rename to lib/plat/esp32/private-lib-plat-esp32.h
index fa48c51..e228540 100644 (file)
--- a/lib/plat/esp32/private.h
+++ b/lib/plat/esp32/private-lib-plat-esp32.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  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

diff --git a/lib/plat/optee/lws-plat-optee.c b/lib/plat/optee/lws-plat-optee.c
index 21307fd..674cda9 100644 (file)
--- a/lib/plat/optee/lws-plat-optee.c
+++ b/lib/plat/optee/lws-plat-optee.c
@@ -1,4 +1,28 @@
-#include "core/private.h"
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010 - 2019 Andy Green <andy@warmcat.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "private-lib-core.h"
 
 #if !defined(LWS_WITH_NETWORK)
 #include <crypto/crypto.h>

diff --git a/lib/plat/optee/network.c b/lib/plat/optee/network.c
index 2677de8..3444170 100644 (file)
--- a/lib/plat/optee/network.c
+++ b/lib/plat/optee/network.c
@@ -1,4 +1,28 @@
-#include "core/private.h"
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010 - 2019 Andy Green <andy@warmcat.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "private-lib-core.h"
 
 
 int

diff --git a/lib/plat/optee/private.h b/lib/plat/optee/private-lib-plat-optee.h
similarity index 96%
rename from lib/plat/optee/private.h
rename to lib/plat/optee/private-lib-plat-optee.h
index 256289f..863a65c 100644 (file)
--- a/lib/plat/optee/private.h
+++ b/lib/plat/optee/private-lib-plat-optee.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  Included from lib/core/private.h if LWS_WITH_OPTEE
+ * Included from lib/private-lib-core.h if LWS_WITH_OPTEE
  */
 
  #include <unistd.h>

diff --git a/lib/plat/unix/private.h b/lib/plat/unix/private-lib-plat-unix.h
similarity index 98%
rename from lib/plat/unix/private.h
rename to lib/plat/unix/private-lib-plat-unix.h
index 1702d4b..6aefa5c 100644 (file)
--- a/lib/plat/unix/private.h
+++ b/lib/plat/unix/private-lib-plat-unix.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  Included from lib/core/private.h if no explicit platform
+ *  Included from lib/private-lib-core.h if no explicit platform
  */
 
 #include <fcntl.h>

diff --git a/lib/plat/unix/unix-caps.c b/lib/plat/unix/unix-caps.c
index 3414e30..e4642d3 100644 (file)
--- a/lib/plat/unix/unix-caps.c
+++ b/lib/plat/unix/unix-caps.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>

diff --git a/lib/plat/unix/unix-fds.c b/lib/plat/unix/unix-fds.c
index 221d967..1a84745 100644 (file)
--- a/lib/plat/unix/unix-fds.c
+++ b/lib/plat/unix/unix-fds.c
@@ -20,7 +20,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)

diff --git a/lib/plat/unix/unix-file.c b/lib/plat/unix/unix-file.c
index bcdc213..d94a430 100644 (file)
--- a/lib/plat/unix/unix-file.c
+++ b/lib/plat/unix/unix-file.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>

diff --git a/lib/plat/unix/unix-init.c b/lib/plat/unix/unix-init.c
index 6204e52..2ccec19 100644 (file)
--- a/lib/plat/unix/unix-init.c
+++ b/lib/plat/unix/unix-init.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>

diff --git a/lib/plat/unix/unix-misc.c b/lib/plat/unix/unix-misc.c
index f5e7a94..1c1fc4e 100644 (file)
--- a/lib/plat/unix/unix-misc.c
+++ b/lib/plat/unix/unix-misc.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 lws_usec_t
 lws_now_usecs(void)

diff --git a/lib/plat/unix/unix-pipe.c b/lib/plat/unix/unix-pipe.c
index 64ce253..753f9bd 100644 (file)
--- a/lib/plat/unix/unix-pipe.c
+++ b/lib/plat/unix/unix-pipe.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 int

diff --git a/lib/plat/unix/unix-plugins.c b/lib/plat/unix/unix-plugins.c
index a56046a..c9c09c9 100644 (file)
--- a/lib/plat/unix/unix-plugins.c
+++ b/lib/plat/unix/unix-plugins.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>

diff --git a/lib/plat/unix/unix-service.c b/lib/plat/unix/unix-service.c
index 198da6d..71ed299 100644 (file)
--- a/lib/plat/unix/unix-service.c
+++ b/lib/plat/unix/unix-service.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_poll_listen_fd(struct lws_pollfd *fd)

diff --git a/lib/plat/unix/unix-sockets.c b/lib/plat/unix/unix-sockets.c
index e356f91..3a6622f 100644 (file)
--- a/lib/plat/unix/unix-sockets.c
+++ b/lib/plat/unix/unix-sockets.c
@@ -20,7 +20,7 @@
  */
 
 #define _GNU_SOURCE
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #include <pwd.h>
 #include <grp.h>

diff --git a/lib/plat/windows/private.h b/lib/plat/windows/private-lib-plat-windows.h
similarity index 97%
rename from lib/plat/windows/private.h
rename to lib/plat/windows/private-lib-plat-windows.h
index a7756d8..f6466b1 100644 (file)
--- a/lib/plat/windows/private.h
+++ b/lib/plat/windows/private-lib-plat-windows.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  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

diff --git a/lib/plat/windows/windows-fds.c b/lib/plat/windows/windows-fds.c
index 0d324e8..d9defe7 100644 (file)
--- a/lib/plat/windows/windows-fds.c
+++ b/lib/plat/windows/windows-fds.c
@@ -22,7 +22,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)

diff --git a/lib/plat/windows/windows-file.c b/lib/plat/windows/windows-file.c
index 6516b70..4b78ce5 100644 (file)
--- a/lib/plat/windows/windows-file.c
+++ b/lib/plat/windows/windows-file.c
@@ -22,7 +22,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)
 {

diff --git a/lib/plat/windows/windows-init.c b/lib/plat/windows/windows-init.c
index 5a2df0d..97dc558 100644 (file)
--- a/lib/plat/windows/windows-init.c
+++ b/lib/plat/windows/windows-init.c
@@ -22,7 +22,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_drop_app_privileges(struct lws_context *context, int actually_set)

diff --git a/lib/plat/windows/windows-misc.c b/lib/plat/windows/windows-misc.c
index 9059a73..9a07a8b 100644 (file)
--- a/lib/plat/windows/windows-misc.c
+++ b/lib/plat/windows/windows-misc.c
@@ -22,7 +22,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 lws_usec_t

diff --git a/lib/plat/windows/windows-pipe.c b/lib/plat/windows/windows-pipe.c
index 0953871..04a3640 100644 (file)
--- a/lib/plat/windows/windows-pipe.c
+++ b/lib/plat/windows/windows-pipe.c
@@ -22,7 +22,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_pipe_create(struct lws *wsi)

diff --git a/lib/plat/windows/windows-plugins.c b/lib/plat/windows/windows-plugins.c
index 7f83524..c14a648 100644 (file)
--- a/lib/plat/windows/windows-plugins.c
+++ b/lib/plat/windows/windows-plugins.c
@@ -22,7 +22,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_plat_plugins_init(struct lws_context * context, const char * const *d)

diff --git a/lib/plat/windows/windows-service.c b/lib/plat/windows/windows-service.c
index a0f0046..cb2aba0 100644 (file)
--- a/lib/plat/windows/windows-service.c
+++ b/lib/plat/windows/windows-service.c
@@ -22,7 +22,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 LWS_EXTERN int

diff --git a/lib/plat/windows/windows-sockets.c b/lib/plat/windows/windows-sockets.c
index 6ebff31..810b7c9 100644 (file)
--- a/lib/plat/windows/windows-sockets.c
+++ b/lib/plat/windows/windows-sockets.c
@@ -1,7 +1,7 @@
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
 #define _WINSOCK_DEPRECATED_NO_WARNINGS
 #endif
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 LWS_VISIBLE int

diff --git a/lib/roles/README.md b/lib/roles/README.md
index 7905cfa..d0dd21c 100644 (file)
--- a/lib/roles/README.md
+++ b/lib/roles/README.md
@@ -54,7 +54,7 @@ If the role is disabled in cmake, nothing in its directory is built.
 
 ### Role ops struct
 
-The role is defined by `struct lws_role_ops` in `lib/roles/private.h`,
+The role is defined by `struct lws_role_ops` in `lib/roles/private-lib-roles.h`,
 each role instantiates one of these and fills in the appropriate ops
 callbacks to perform its job.  By convention that lives in
 `./lib/roles/**role name**/ops-**role_name**.c`.
@@ -64,15 +64,15 @@ callbacks to perform its job.  By convention that lives in
 Truly private declarations for the role can go in the role directory as you like.
 However when the declarations must be accessible to other things in lws build, eg,
 the role adds members to `struct lws` when enabled, they should be in the role
-directory in a file `private.h`.
+directory in a file `private-lib-roles-myrole.h`.
 
-Search for "bring in role private declarations" in `./lib/roles/private.h
+Search for "bring in role private declarations" in `./lib/roles/private-lib-roles.h
 and add your private role file there following the style used for the other roles,
 eg,
 
 ```
 #if defined(LWS_ROLE_WS)
- #include "roles/ws/private.h"
+ #include "roles/ws/private-lib-roles-ws.h"
 #else
  #define lwsi_role_ws(wsi) (0)
 #endif

diff --git a/lib/roles/cgi/cgi-server.c b/lib/roles/cgi/cgi-server.c
index ea93815..9cf1455 100644 (file)
--- a/lib/roles/cgi/cgi-server.c
+++ b/lib/roles/cgi/cgi-server.c
@@ -21,7 +21,7 @@
 
 #define  _GNU_SOURCE
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(WIN32) || defined(_WIN32)
 #else

diff --git a/lib/roles/cgi/ops-cgi.c b/lib/roles/cgi/ops-cgi.c
index 4880e21..83297a3 100644 (file)
--- a/lib/roles/cgi/ops-cgi.c
+++ b/lib/roles/cgi/ops-cgi.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_cgi(struct lws_context_per_thread *pt, struct lws *wsi,

diff --git a/lib/roles/cgi/private.h b/lib/roles/cgi/private-lib-roles-cgi.h
similarity index 97%
rename from lib/roles/cgi/private.h
rename to lib/roles/cgi/private-lib-roles-cgi.h
index 53e5f72..23e2e8f 100644 (file)
--- a/lib/roles/cgi/private.h
+++ b/lib/roles/cgi/private-lib-roles-cgi.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_ROLE_WS
+ * This is included from private-lib-core.h if LWS_ROLE_WS
  */
 
 #if defined(LWS_WITH_ZLIB)

diff --git a/lib/roles/dbus/dbus.c b/lib/roles/dbus/dbus.c
index 0b82125..1a9003d 100644 (file)
--- a/lib/roles/dbus/dbus.c
+++ b/lib/roles/dbus/dbus.c
@@ -33,7 +33,7 @@
  * worries we create a new shadow wsi until it looks like it is closing again.
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #include <libwebsockets/lws-dbus.h>
 

diff --git a/lib/roles/dbus/private.h b/lib/roles/dbus/private-lib-roles-dbus.h
similarity index 95%
rename from lib/roles/dbus/private.h
rename to lib/roles/dbus/private-lib-roles-dbus.h
index 5d7a9ac..7cca60c 100644 (file)
--- a/lib/roles/dbus/private.h
+++ b/lib/roles/dbus/private-lib-roles-dbus.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_ROLE_DBUS
+ * This is included from private-lib-core.h if LWS_ROLE_DBUS
  */
 
 #include <dbus/dbus.h>

diff --git a/lib/roles/h1/ops-h1.c b/lib/roles/h1/ops-h1.c
index 87228e8..d1af4d2 100644 (file)
--- a/lib/roles/h1/ops-h1.c
+++ b/lib/roles/h1/ops-h1.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))

diff --git a/lib/roles/h1/private.h b/lib/roles/h1/private-lib-roles-h1.h
similarity index 94%
rename from lib/roles/h1/private.h
rename to lib/roles/h1/private-lib-roles-h1.h
index 3f53954..4d34e6b 100644 (file)
--- a/lib/roles/h1/private.h
+++ b/lib/roles/h1/private-lib-roles-h1.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_ROLE_H1
+ *  This is included from private-lib-core.h if LWS_ROLE_H1
  *
  *  Most of the h1 business is defined in the h1 / h2 common roles/http dir
  */

diff --git a/lib/roles/h2/hpack.c b/lib/roles/h2/hpack.c
index f8b89c3..a624c4d 100644 (file)
--- a/lib/roles/h2/hpack.c
+++ b/lib/roles/h2/hpack.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * Official static header table for HPACK

diff --git a/lib/roles/h2/http2.c b/lib/roles/h2/http2.c
index 76449b2..454e7a9 100644 (file)
--- a/lib/roles/h2/http2.c
+++ b/lib/roles/h2/http2.c
@@ -19,8 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * bitmap of control messages that are valid to receive for each http2 state

diff --git a/lib/roles/h2/ops-h2.c b/lib/roles/h2/ops-h2.c
index eb87fce..b581602 100644 (file)
--- a/lib/roles/h2/ops-h2.c
+++ b/lib/roles/h2/ops-h2.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 /*
  * These are the standardized defaults.

diff --git a/lib/roles/h2/private.h b/lib/roles/h2/private-lib-roles-h2.h
similarity index 100%
rename from lib/roles/h2/private.h
rename to lib/roles/h2/private-lib-roles-h2.h

diff --git a/lib/roles/http/client/client-handshake.c b/lib/roles/http/client/client-handshake.c
index 53498ec..42ac989 100644 (file)
--- a/lib/roles/http/client/client-handshake.c
+++ b/lib/roles/http/client/client-handshake.c
@@ -1,4 +1,28 @@
-#include "core/private.h"
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010 - 2019 Andy Green <andy@warmcat.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "private-lib-core.h"
 
 static int
 lws_getaddrinfo46(struct lws *wsi, const char *ads, struct addrinfo **result)

diff --git a/lib/roles/http/client/client.c b/lib/roles/http/client/client-http.c
similarity index 99%
rename from lib/roles/http/client/client.c
rename to lib/roles/http/client/client-http.c
index 65b7c54..d0052cc 100644 (file)
--- a/lib/roles/http/client/client.c
+++ b/lib/roles/http/client/client-http.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 LWS_VISIBLE LWS_EXTERN void
 lws_client_http_body_pending(struct lws *wsi, int something_left_to_send)

diff --git a/lib/roles/http/compression/README.md b/lib/roles/http/compression/README.md
index 8d9d57f..ad42872 100644 (file)
--- a/lib/roles/http/compression/README.md
+++ b/lib/roles/http/compression/README.md
@@ -6,7 +6,7 @@ specifically HTTP content streams, after the header, be it h1 or h2.
 
 The compression transforms expose an "ops" type struct and a compressor name
 as used by `content-encoding`... the ops struct definition can be found in
-./private.h.
+./private-lib-roles-http-compression.h.
 
 Because the compression transform depends on being able to send on its output
 before it can process new input, the transform adds a new kind of buflist

diff --git a/lib/roles/http/compression/brotli/brotli.c b/lib/roles/http/compression/brotli/brotli.c
index 0c977de..4724a38 100644 (file)
--- a/lib/roles/http/compression/brotli/brotli.c
+++ b/lib/roles/http/compression/brotli/brotli.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 
 static int

diff --git a/lib/roles/http/compression/deflate/deflate.c b/lib/roles/http/compression/deflate/deflate.c
index c092ec5..c9ab178 100644 (file)
--- a/lib/roles/http/compression/deflate/deflate.c
+++ b/lib/roles/http/compression/deflate/deflate.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 lcs_init_compression_deflate(lws_comp_ctx_t *ctx, int decomp)

diff --git a/lib/roles/http/compression/private.h b/lib/roles/http/compression/private-lib-roles-http-compression.h
similarity index 96%
rename from lib/roles/http/compression/private.h
rename to lib/roles/http/compression/private-lib-roles-http-compression.h
index 97b5d7b..f806709 100644 (file)
--- a/lib/roles/http/compression/private.h
+++ b/lib/roles/http/compression/private-lib-roles-http-compression.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_WITH_HTTP_STREAM_COMPRESSION
+ *  This is included from private-lib-core.h if LWS_WITH_HTTP_STREAM_COMPRESSION
  */
 
 #if defined(LWS_WITH_MINIZ)

diff --git a/lib/roles/http/compression/stream.c b/lib/roles/http/compression/stream.c
index 7acb58e..e6fea0e 100644 (file)
--- a/lib/roles/http/compression/stream.c
+++ b/lib/roles/http/compression/stream.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /* compression methods listed in order of preference */
 

diff --git a/lib/roles/http/header.c b/lib/roles/http/header.c
index d161d78..d93a3f8 100644 (file)
--- a/lib/roles/http/header.c
+++ b/lib/roles/http/header.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 #include "lextable-strings.h"
 
 

diff --git a/lib/roles/http/private.h b/lib/roles/http/private-lib-roles-http.h
similarity index 98%
rename from lib/roles/http/private.h
rename to lib/roles/http/private-lib-roles-http.h
index 5759c85..73a74d9 100644 (file)
--- a/lib/roles/http/private.h
+++ b/lib/roles/http/private-lib-roles-http.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if either H1 or H2 roles are
+ *  This is included from private-lib-core.h if either H1 or H2 roles are
  *  enabled
  */
 
@@ -28,7 +28,7 @@
  #endif
 
 #if defined(LWS_WITH_HTTP_STREAM_COMPRESSION)
-#include "roles/http/compression/private.h"
+#include "private-lib-roles-http-compression.h"
 #endif
 
 #define lwsi_role_http(wsi) (lwsi_role_h1(wsi) || lwsi_role_h2(wsi))

diff --git a/lib/roles/http/server/access-log.c b/lib/roles/http/server/access-log.c
index 74ae30e..b39ecdb 100644 (file)
--- a/lib/roles/http/server/access-log.c
+++ b/lib/roles/http/server/access-log.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * Produce Apache-compatible log string for wsi, like this:

diff --git a/lib/roles/http/server/fops-zip.c b/lib/roles/http/server/fops-zip.c
index 5c1d482..d3b625d 100644 (file)
--- a/lib/roles/http/server/fops-zip.c
+++ b/lib/roles/http/server/fops-zip.c
@@ -51,7 +51,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_MINIZ)
 #include <miniz.h>

diff --git a/lib/roles/http/server/lejp-conf.c b/lib/roles/http/server/lejp-conf.c
index e8dfffd..dde5951 100644 (file)
--- a/lib/roles/http/server/lejp-conf.c
+++ b/lib/roles/http/server/lejp-conf.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #ifndef _WIN32
 /* this is needed for Travis CI */

diff --git a/lib/roles/http/server/lws-spa.c b/lib/roles/http/server/lws-spa.c
index 4e25695..03bed2d 100644 (file)
--- a/lib/roles/http/server/lws-spa.c
+++ b/lib/roles/http/server/lws-spa.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #define LWS_MAX_ELEM_NAME 32
 

diff --git a/lib/roles/http/server/parsers.c b/lib/roles/http/server/parsers.c
index 795b53b..c84c66d 100644 (file)
--- a/lib/roles/http/server/parsers.c
+++ b/lib/roles/http/server/parsers.c
@@ -19,14 +19,10 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static const unsigned char lextable[] = {
-#if defined(LWS_AMAZON_RTOS) || defined(LWS_AMAZON_LINUX)
-       #include "roles/http/lextable.h"
-#else
-       #include "../lextable.h"
-#endif
+       #include "lextable.h"
 };
 
 #define FAIL_CHAR 0x08

diff --git a/lib/roles/http/server/ranges.c b/lib/roles/http/server/ranges.c
index 56ba748..8ae9cf6 100644 (file)
--- a/lib/roles/http/server/ranges.c
+++ b/lib/roles/http/server/ranges.c
@@ -21,7 +21,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * RFC7233 examples

diff --git a/lib/roles/http/server/rewrite.c b/lib/roles/http/server/rewrite.c
index eca443a..272fb12 100644 (file)
--- a/lib/roles/http/server/rewrite.c
+++ b/lib/roles/http/server/rewrite.c
@@ -1,4 +1,4 @@
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_HUBBUB)
 

diff --git a/lib/roles/http/server/server.c b/lib/roles/http/server/server.c
index 3ecda73..6bf0f86 100644 (file)
--- a/lib/roles/http/server/server.c
+++ b/lib/roles/http/server/server.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 const char * const method_names[] = {
        "GET", "POST", "OPTIONS", "PUT", "PATCH", "DELETE", "CONNECT", "HEAD",

diff --git a/lib/roles/listen/ops-listen.c b/lib/roles/listen/ops-listen.c
index 5d87f4b..6f85769 100644 (file)
--- a/lib/roles/listen/ops-listen.c
+++ b/lib/roles/listen/ops-listen.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_listen(struct lws_context_per_thread *pt, struct lws *wsi,

diff --git a/lib/roles/pipe/ops-pipe.c b/lib/roles/pipe/ops-pipe.c
index 012050b..063c0db 100644 (file)
--- a/lib/roles/pipe/ops-pipe.c
+++ b/lib/roles/pipe/ops-pipe.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_pipe(struct lws_context_per_thread *pt, struct lws *wsi,

diff --git a/lib/roles/private.h b/lib/roles/private-lib-roles.h
similarity index 97%
rename from lib/roles/private.h
rename to lib/roles/private-lib-roles.h
index 55d9550..48f07cf 100644 (file)
--- a/lib/roles/private.h
+++ b/lib/roles/private-lib-roles.h
@@ -273,43 +273,43 @@ extern struct lws_role_ops role_ops_raw_skt, role_ops_raw_file, role_ops_listen,
 /* bring in role private declarations */
 
 #if defined(LWS_ROLE_H1) || defined(LWS_ROLE_H2)
- #include "roles/http/private.h"
+ #include "private-lib-roles-http.h"
 #else
  #define lwsi_role_http(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_H1)
- #include "roles/h1/private.h"
+ #include "private-lib-roles-h1.h"
 #else
  #define lwsi_role_h1(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_H2)
- #include "roles/h2/private.h"
+ #include "private-lib-roles-h2.h"
 #else
  #define lwsi_role_h2(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_WS)
- #include "roles/ws/private.h"
+ #include "private-lib-roles-ws.h"
 #else
  #define lwsi_role_ws(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_CGI)
- #include "roles/cgi/private.h"
+ #include "private-lib-roles-cgi.h"
 #else
  #define lwsi_role_cgi(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_DBUS)
- #include "roles/dbus/private.h"
+ #include "private-lib-roles-dbus.h"
 #else
  #define lwsi_role_dbus(wsi) (0)
 #endif
 
 #if defined(LWS_ROLE_RAW_PROXY)
- #include "roles/raw-proxy/private.h"
+ #include "private-lib-roles-raw-proxy.h"
 #else
  #define lwsi_role_raw_proxy(wsi) (0)
 #endif

diff --git a/lib/roles/raw-file/ops-raw-file.c b/lib/roles/raw-file/ops-raw-file.c
index e19bd2a..c7b74ec 100644 (file)
--- a/lib/roles/raw-file/ops-raw-file.c
+++ b/lib/roles/raw-file/ops-raw-file.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_raw_file(struct lws_context_per_thread *pt, struct lws *wsi,

diff --git a/lib/roles/raw-proxy/ops-raw-proxy.c b/lib/roles/raw-proxy/ops-raw-proxy.c
index 9deb9c1..3155598 100644 (file)
--- a/lib/roles/raw-proxy/ops-raw-proxy.c
+++ b/lib/roles/raw-proxy/ops-raw-proxy.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_raw_proxy(struct lws_context_per_thread *pt, struct lws *wsi,

diff --git a/lib/roles/raw-proxy/private.h b/lib/roles/raw-proxy/private-lib-roles-raw-proxy.h
similarity index 94%
rename from lib/roles/raw-proxy/private.h
rename to lib/roles/raw-proxy/private-lib-roles-raw-proxy.h
index 6f169d9..6c37cab 100644 (file)
--- a/lib/roles/raw-proxy/private.h
+++ b/lib/roles/raw-proxy/private-lib-roles-raw-proxy.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_ROLE_RAW_PROXY
+ *  This is included from private-lib-core.h if LWS_ROLE_RAW_PROXY
  */
 
 extern struct lws_role_ops role_ops_raw_proxy;

diff --git a/lib/roles/raw-skt/ops-raw-skt.c b/lib/roles/raw-skt/ops-raw-skt.c
index ab3429c..6f704a7 100644 (file)
--- a/lib/roles/raw-skt/ops-raw-skt.c
+++ b/lib/roles/raw-skt/ops-raw-skt.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 static int
 rops_handle_POLLIN_raw_skt(struct lws_context_per_thread *pt, struct lws *wsi,

diff --git a/lib/roles/ws/client-parser-ws.c b/lib/roles/ws/client-parser-ws.c
index 299ba03..3dbceda 100644 (file)
--- a/lib/roles/ws/client-parser-ws.c
+++ b/lib/roles/ws/client-parser-ws.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * parsers.c: lws_ws_rx_sm() needs to be roughly kept in

diff --git a/lib/roles/ws/client-ws.c b/lib/roles/ws/client-ws.c
index 61a59d5..dc85cbc 100644 (file)
--- a/lib/roles/ws/client-ws.c
+++ b/lib/roles/ws/client-ws.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 /*
  * In-place str to lower case

diff --git a/lib/roles/ws/ext/extension-permessage-deflate.c b/lib/roles/ws/ext/extension-permessage-deflate.c
index b18efe1..5f2e83b 100644 (file)
--- a/lib/roles/ws/ext/extension-permessage-deflate.c
+++ b/lib/roles/ws/ext/extension-permessage-deflate.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 #include "extension-permessage-deflate.h"
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/roles/ws/ext/extension.c b/lib/roles/ws/ext/extension.c
index a8bb1c7..576cb14 100644 (file)
--- a/lib/roles/ws/ext/extension.c
+++ b/lib/roles/ws/ext/extension.c
@@ -1,4 +1,28 @@
-#include "core/private.h"
+/*
+ * libwebsockets - small server side websockets and web server implementation
+ *
+ * Copyright (C) 2010 - 2019 Andy Green <andy@warmcat.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "private-lib-core.h"
 
 #include "extension-permessage-deflate.h"
 

diff --git a/lib/roles/ws/ops-ws.c b/lib/roles/ws/ops-ws.c
index ef0d8a6..c184f37 100644 (file)
--- a/lib/roles/ws/ops-ws.c
+++ b/lib/roles/ws/ops-ws.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #define LWS_CPYAPP(ptr, str) { strcpy(ptr, str); ptr += strlen(str); }
 

diff --git a/lib/roles/ws/private.h b/lib/roles/ws/private-lib-roles-ws.h
similarity index 98%
rename from lib/roles/ws/private.h
rename to lib/roles/ws/private-lib-roles-ws.h
index 001b8f1..303d48f 100644 (file)
--- a/lib/roles/ws/private.h
+++ b/lib/roles/ws/private-lib-roles-ws.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_ROLE_WS
+ *  This is included from private-lib-core.h if LWS_ROLE_WS
  */
 
 extern struct lws_role_ops role_ops_ws;

diff --git a/lib/roles/ws/server-ws.c b/lib/roles/ws/server-ws.c
index 680c2e6..7e3e38a 100644 (file)
--- a/lib/roles/ws/server-ws.c
+++ b/lib/roles/ws/server-ws.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include <core/private.h>
+#include <private-lib-core.h>
 
 #define LWS_CPYAPP(ptr, str) { strcpy(ptr, str); ptr += strlen(str); }
 

diff --git a/lib/tls/lws-gencrypto-common.c b/lib/tls/lws-gencrypto-common.c
index 468b530..149df00 100644 (file)
--- a/lib/tls/lws-gencrypto-common.c
+++ b/lib/tls/lws-gencrypto-common.c
@@ -18,7 +18,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  */
-#include "core/private.h"
+
+#include "private-lib-core.h"
 
 /*
  * These came from RFC7518 (JSON Web Algorithms) Section 3

diff --git a/lib/tls/lws-genec-common.c b/lib/tls/lws-genec-common.c
index 0df1c8b..c84bb4c 100644 (file)
--- a/lib/tls/lws-genec-common.c
+++ b/lib/tls/lws-genec-common.c
@@ -21,7 +21,7 @@
  *  lws_genec provides an EC abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
+#include "private-lib-core.h"
 
 const struct lws_ec_curves *
 lws_genec_curve(const struct lws_ec_curves *table, const char *name)

diff --git a/lib/tls/mbedtls/lws-genaes.c b/lib/tls/mbedtls/lws-genaes.c
index 0e4da81..9e3a59a 100644 (file)
--- a/lib/tls/mbedtls/lws-genaes.c
+++ b/lib/tls/mbedtls/lws-genaes.c
@@ -21,8 +21,8 @@
  *  lws_genaes provides an abstraction api for AES in lws that works the
  *  same whether you are using openssl or mbedtls hash functions underneath.
  */
-#include "core/private.h"
-#include "../../jose/private.h"
+#include "private-lib-core.h"
+#include "../../jose/private-lib-jose.h"
 
 static int operation_map[] = { MBEDTLS_AES_ENCRYPT, MBEDTLS_AES_DECRYPT };
 

diff --git a/lib/tls/mbedtls/lws-gencrypto.c b/lib/tls/mbedtls/lws-gencrypto.c
index dd91ad5..a65292d 100644 (file)
--- a/lib/tls/mbedtls/lws-gencrypto.c
+++ b/lib/tls/mbedtls/lws-gencrypto.c
@@ -21,8 +21,8 @@
  *  lws-gencrypto openssl-specific common code
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 mbedtls_md_type_t
 lws_gencrypto_mbedtls_hash_to_MD_TYPE(enum lws_genhash_types hash_type)

diff --git a/lib/tls/mbedtls/lws-genec.c b/lib/tls/mbedtls/lws-genec.c
index c7ff5e2..4cf6b25 100644 (file)
--- a/lib/tls/mbedtls/lws-genec.c
+++ b/lib/tls/mbedtls/lws-genec.c
@@ -21,8 +21,8 @@
  *  lws_genec provides an EC abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 const struct lws_ec_curves lws_ec_curves[] = {
        /*

diff --git a/lib/tls/mbedtls/lws-genrsa.c b/lib/tls/mbedtls/lws-genrsa.c
index 2589064..0554275 100644 (file)
--- a/lib/tls/mbedtls/lws-genrsa.c
+++ b/lib/tls/mbedtls/lws-genrsa.c
@@ -21,8 +21,8 @@
  *  lws_genrsa provides an RSA abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 #include <mbedtls/rsa.h>
 
 LWS_VISIBLE void

diff --git a/lib/tls/mbedtls/mbedtls-client.c b/lib/tls/mbedtls/mbedtls-client.c
index d3de991..0aab507 100644 (file)
--- a/lib/tls/mbedtls/mbedtls-client.c
+++ b/lib/tls/mbedtls/mbedtls-client.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 static int
 OpenSSL_client_verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)

diff --git a/lib/tls/mbedtls/mbedtls-server.c b/lib/tls/mbedtls/mbedtls-server.c
index f993a54..5c54d57 100644 (file)
--- a/lib/tls/mbedtls/mbedtls-server.c
+++ b/lib/tls/mbedtls/mbedtls-server.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 #include <mbedtls/x509_csr.h>
 
 int

diff --git a/lib/tls/mbedtls/ssl.c b/lib/tls/mbedtls/mbedtls-ssl.c
similarity index 99%
rename from lib/tls/mbedtls/ssl.c
rename to lib/tls/mbedtls/mbedtls-ssl.c
index 4e8d20b..65f3725 100644 (file)
--- a/lib/tls/mbedtls/ssl.c
+++ b/lib/tls/mbedtls/mbedtls-ssl.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 
 LWS_VISIBLE void

diff --git a/lib/tls/mbedtls/tls.c b/lib/tls/mbedtls/mbedtls-tls.c
similarity index 94%
rename from lib/tls/mbedtls/tls.c
rename to lib/tls/mbedtls/mbedtls-tls.c
index ecb0949..e1954fd 100644 (file)
--- a/lib/tls/mbedtls/tls.c
+++ b/lib/tls/mbedtls/mbedtls-tls.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 
 void
 lws_tls_err_describe_clear(void)

diff --git a/lib/tls/mbedtls/x509.c b/lib/tls/mbedtls/mbedtls-x509.c
similarity index 99%
rename from lib/tls/mbedtls/x509.c
rename to lib/tls/mbedtls/mbedtls-x509.c
index 9c0ac05..99d9409 100644 (file)
--- a/lib/tls/mbedtls/x509.c
+++ b/lib/tls/mbedtls/mbedtls-x509.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-#include "tls/mbedtls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-mbedtls.h"
 #include <mbedtls/oid.h>
 
 #if defined(LWS_PLAT_OPTEE) || defined(OPTEE_DEV_KIT)

diff --git a/lib/tls/mbedtls/private.h b/lib/tls/mbedtls/private-lib-tls-mbedtls.h
similarity index 100%
rename from lib/tls/mbedtls/private.h
rename to lib/tls/mbedtls/private-lib-tls-mbedtls.h

diff --git a/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h b/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
index ad32cb9..3b342db 100644 (file)
--- a/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
+++ b/lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
@@ -15,7 +15,7 @@
 #ifndef _SSL_DEBUG_H_
 #define _SSL_DEBUG_H_
 
-#include "platform/ssl_port.h"
+#include "ssl_port.h"
 
 #ifdef __cplusplus
  extern "C" {

diff --git a/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h b/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
index 1f5f948..bfd5c2e 100644 (file)
--- a/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
+++ b/lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
@@ -19,7 +19,7 @@
  extern "C" {
 #endif
 
-//#include "core/private.h"
+//#include "private-lib-core.h"
 #include <lws_config.h>
 #if defined(LWS_WITH_ESP32)
  /* AMAZON RTOS has its own setting via MTK_MBEDTLS_CONFIG_FILE */

diff --git a/lib/tls/mbedtls/wrapper/include/openssl/ssl.h b/lib/tls/mbedtls/wrapper/include/openssl/ssl.h
index 9427283..f01e8c3 100755 (executable)
--- a/lib/tls/mbedtls/wrapper/include/openssl/ssl.h
+++ b/lib/tls/mbedtls/wrapper/include/openssl/ssl.h
@@ -20,8 +20,8 @@
 #endif\r
 \r
 #include <stdlib.h>\r
-#include "internal/ssl_x509.h"\r
-#include "internal/ssl_pkey.h"\r
+#include "ssl_x509.h"\r
+#include "ssl_pkey.h"\r
 \r
 /*\r
 {\r

diff --git a/lib/tls/mbedtls/wrapper/library/ssl_lib.c b/lib/tls/mbedtls/wrapper/library/ssl_lib.c
index ec46fd8..825be82 100644 (file)
--- a/lib/tls/mbedtls/wrapper/library/ssl_lib.c
+++ b/lib/tls/mbedtls/wrapper/library/ssl_lib.c
@@ -19,7 +19,7 @@
 #include "ssl_dbg.h"
 #include "ssl_port.h"
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 char *
 lws_strncpy(char *dest, const char *src, size_t size);

diff --git a/lib/tls/mbedtls/wrapper/platform/ssl_pm.c b/lib/tls/mbedtls/wrapper/platform/ssl_pm.c
index dea6894..776abf5 100755 (executable)
--- a/lib/tls/mbedtls/wrapper/platform/ssl_pm.c
+++ b/lib/tls/mbedtls/wrapper/platform/ssl_pm.c
@@ -25,7 +25,7 @@
 #include "mbedtls/error.h"
 #include "mbedtls/certs.h"
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #define X509_INFO_STRING_LENGTH 8192
 

diff --git a/lib/tls/openssl/lws-genaes.c b/lib/tls/openssl/lws-genaes.c
index cf3ac36..24b0486 100644 (file)
--- a/lib/tls/openssl/lws-genaes.c
+++ b/lib/tls/openssl/lws-genaes.c
@@ -21,8 +21,8 @@
  *  lws_genaes provides an AES abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls hash functions underneath.
  */
-#include "core/private.h"
-#include "../../jose/private.h"
+#include "private-lib-core.h"
+#include "../../jose/private-lib-jose.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the

diff --git a/lib/tls/openssl/lws-gencrypto.c b/lib/tls/openssl/lws-gencrypto.c
index dd74149..f8634b5 100644 (file)
--- a/lib/tls/openssl/lws-gencrypto.c
+++ b/lib/tls/openssl/lws-gencrypto.c
@@ -21,8 +21,8 @@
  *  lws-gencrypto openssl-specific common code
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the

diff --git a/lib/tls/openssl/lws-genec.c b/lib/tls/openssl/lws-genec.c
index cb62a67..67ce6c4 100644 (file)
--- a/lib/tls/openssl/lws-genec.c
+++ b/lib/tls/openssl/lws-genec.c
@@ -21,8 +21,8 @@
  *  lws_genec provides an EC abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the

diff --git a/lib/tls/openssl/lws-genrsa.c b/lib/tls/openssl/lws-genrsa.c
index ec7bde8..ea86577 100644 (file)
--- a/lib/tls/openssl/lws-genrsa.c
+++ b/lib/tls/openssl/lws-genrsa.c
@@ -21,8 +21,8 @@
  *  lws_genrsa provides an RSA abstraction api in lws that works the
  *  same whether you are using openssl or mbedtls crypto functions underneath.
  */
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the

diff --git a/lib/tls/openssl/openssl-client.c b/lib/tls/openssl/openssl-client.c
index f822f63..68948e7 100644 (file)
--- a/lib/tls/openssl/openssl-client.c
+++ b/lib/tls/openssl/openssl-client.c
@@ -19,9 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the

diff --git a/lib/tls/openssl/openssl-server.c b/lib/tls/openssl/openssl-server.c
index 917c0ea..f64e999 100644 (file)
--- a/lib/tls/openssl/openssl-server.c
+++ b/lib/tls/openssl/openssl-server.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * Care: many openssl apis return 1 for success.  These are translated to the

diff --git a/lib/tls/openssl/ssl.c b/lib/tls/openssl/openssl-ssl.c
similarity index 99%
rename from lib/tls/openssl/ssl.c
rename to lib/tls/openssl/openssl-ssl.c
index ad2a76e..afe4f97 100644 (file)
--- a/lib/tls/openssl/ssl.c
+++ b/lib/tls/openssl/openssl-ssl.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 #include <errno.h>
 
 int openssl_websocket_private_data_index,

diff --git a/lib/tls/openssl/tls.c b/lib/tls/openssl/openssl-tls.c
similarity index 98%
rename from lib/tls/openssl/tls.c
rename to lib/tls/openssl/openssl-tls.c
index d14cd83..5a76de7 100644 (file)
--- a/lib/tls/openssl/tls.c
+++ b/lib/tls/openssl/openssl-tls.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 extern int openssl_websocket_private_data_index,
 openssl_SSL_CTX_private_data_index;

diff --git a/lib/tls/openssl/x509.c b/lib/tls/openssl/openssl-x509.c
similarity index 99%
rename from lib/tls/openssl/x509.c
rename to lib/tls/openssl/openssl-x509.c
index d441001..3dee44e 100644 (file)
--- a/lib/tls/openssl/x509.c
+++ b/lib/tls/openssl/openssl-x509.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-#include "tls/openssl/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls-openssl.h"
 
 #if !defined(LWS_PLAT_OPTEE)
 static int

diff --git a/lib/tls/openssl/private.h b/lib/tls/openssl/private-lib-tls-openssl.h
similarity index 100%
rename from lib/tls/openssl/private.h
rename to lib/tls/openssl/private-lib-tls-openssl.h

diff --git a/lib/tls/private.h b/lib/tls/private-lib-tls.h
similarity index 95%
rename from lib/tls/private.h
rename to lib/tls/private-lib-tls.h
index 16b7d66..dc0d894 100644 (file)
--- a/lib/tls/private.h
+++ b/lib/tls/private-lib-tls.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_WITH_TLS
+ *  This is included from private-lib-core.h if LWS_WITH_TLS
  */
 
 #if !defined(__LWS_TLS_PRIVATE_H__)
@@ -60,7 +60,7 @@
   #include <mbedtls/aes.h>
   #include <mbedtls/gcm.h>
   #include <mbedtls/x509_crt.h>
-  #include "tls/mbedtls/wrapper/include/openssl/ssl.h" /* wrapper !!!! */
+  #include "openssl/ssl.h" /* wrapper !!!! */
  #else /* not esp32 */
   #if defined(LWS_WITH_MBEDTLS)
    #include <mbedtls/ssl.h>
@@ -70,7 +70,7 @@
    #include <mbedtls/x509_csr.h>
    #include <mbedtls/ecp.h>
    #include <mbedtls/ecdsa.h>
-   #include "tls/mbedtls/wrapper/include/openssl/ssl.h" /* wrapper !!!! */
+   #include "openssl/ssl.h" /* wrapper !!!! */
   #else
    #include <openssl/ssl.h>
    #include <openssl/evp.h>
@@ -118,7 +118,7 @@ typedef BIO lws_tls_bio;
 typedef X509 lws_tls_x509;
 
 #if defined(LWS_WITH_NETWORK)
-#include "tls/private-network.h"
+#include "private-network.h"
 #endif
 
 LWS_EXTERN int

diff --git a/lib/tls/private-network.h b/lib/tls/private-network.h
index 806b62d..7933e0f 100644 (file)
--- a/lib/tls/private-network.h
+++ b/lib/tls/private-network.h
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *  MA  02110-1301  USA
  *
- *  This is included from core/private.h if LWS_WITH_TLS
+ *  This is included from private-lib-core.h if LWS_WITH_TLS
  */
 
 struct lws_context_per_thread;

diff --git a/lib/tls/tls-client.c b/lib/tls/tls-client.c
index 45911bd..d631e69 100644 (file)
--- a/lib/tls/tls-client.c
+++ b/lib/tls/tls-client.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 int
 lws_ssl_client_connect1(struct lws *wsi)

diff --git a/lib/tls/tls-network.c b/lib/tls/tls-network.c
index 99b5ac8..76dcc23 100644 (file)
--- a/lib/tls/tls-network.c
+++ b/lib/tls/tls-network.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 /*
  * fakes POLLIN on all tls guys with buffered rx

diff --git a/lib/tls/tls-server.c b/lib/tls/tls-server.c
index db14a6d..9fb459d 100644 (file)
--- a/lib/tls/tls-server.c
+++ b/lib/tls/tls-server.c
@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
+#include "private-lib-core.h"
 
 #if defined(LWS_WITH_MBEDTLS) || (defined(OPENSSL_VERSION_NUMBER) && \
                                  OPENSSL_VERSION_NUMBER >= 0x10002000L)

diff --git a/lib/tls/tls.c b/lib/tls/tls.c
index 0132573..39029e4 100644 (file)
--- a/lib/tls/tls.c
+++ b/lib/tls/tls.c
@@ -19,8 +19,8 @@
  *  MA  02110-1301  USA
  */
 
-#include "core/private.h"
-#include "tls/private.h"
+#include "private-lib-core.h"
+#include "private-lib-tls.h"
 
 #if !defined(LWS_PLAT_OPTEE) && !defined(OPTEE_DEV_KIT)
 #if defined(LWS_WITH_ESP32) && !defined(LWS_AMAZON_RTOS)
@@ -275,11 +275,11 @@ lws_tls_extant(const char *name)
  * 4) LWS_TLS_EXTANT_YES: The certs are present with the correct name and we
  *    have the rights to read them.
  */
-#if !defined(LWS_AMAZON_RTOS)
+
 enum lws_tls_extant
 lws_tls_use_any_upgrade_check_extant(const char *name)
 {
-#if !defined(LWS_PLAT_OPTEE)
+#if !defined(LWS_PLAT_OPTEE) && !defined(LWS_AMAZON_RTOS)
 
        int n;
 
@@ -332,5 +332,3 @@ lws_tls_use_any_upgrade_check_extant(const char *name)
 #endif
        return LWS_TLS_EXTANT_YES;
 }
-#endif
-