| libwebsockets.h (2.4.1) | | libwebsockets.h (2.4.2) |
|---|
| | |
| skipping to change at line 1069 ¶ | | skipping to change at line 1069 ¶ |
|---|
| LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS = 21, | | LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS = 21, |
| /**< if configured for | | /**< if configured for |
| * including OpenSSL support, this callback allows your user code | | * including OpenSSL support, this callback allows your user code |
| * to perform extra SSL_CTX_load_verify_locations() or similar | | * to perform extra SSL_CTX_load_verify_locations() or similar |
| * calls to direct OpenSSL where to find certificates the client | | * calls to direct OpenSSL where to find certificates the client |
| * can use to confirm the remote server identity. user is the | | * can use to confirm the remote server identity. user is the |
| * OpenSSL SSL_CTX* */ | | * OpenSSL SSL_CTX* */ |
| LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS = 22, | | LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS = 22, |
| /**< if configured for | | /**< if configured for |
| * including OpenSSL support, this callback allows your user code | | * including OpenSSL support, this callback allows your user code |
|
| * to load extra certifcates into the server which allow it to | | * to load extra certificates into the server which allow it to |
| * verify the validity of certificates returned by clients. user | | * verify the validity of certificates returned by clients. user |
| * is the server's OpenSSL SSL_CTX* */ | | * is the server's OpenSSL SSL_CTX* */ |
| LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION = 23, | | LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION = 23, |
| /**< if the libwebsockets vhost was created with the option | | /**< if the libwebsockets vhost was created with the option |
| * LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT, then this | | * LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT, then this |
| * callback is generated during OpenSSL verification of the cert | | * callback is generated during OpenSSL verification of the cert |
| * sent from the client. It is sent to protocol[0] callback as | | * sent from the client. It is sent to protocol[0] callback as |
| * no protocol has been negotiated on the connection yet. | | * no protocol has been negotiated on the connection yet. |
| * Notice that the libwebsockets context and wsi are both NULL | | * Notice that the libwebsockets context and wsi are both NULL |
| * during this callback. See | | * during this callback. See |
| | |
| skipping to change at line 4004 ¶ | | skipping to change at line 4004 ¶ |
|---|
| ///@} | | ///@} |
| | |
| /*! \defgroup sending-data Sending data | | /*! \defgroup sending-data Sending data |
| | |
| APIs related to writing data on a connection | | APIs related to writing data on a connection |
| */ | | */ |
| //@{ | | //@{ |
| #if !defined(LWS_SIZEOFPTR) | | #if !defined(LWS_SIZEOFPTR) |
| #define LWS_SIZEOFPTR (sizeof (void *)) | | #define LWS_SIZEOFPTR (sizeof (void *)) |
| #endif | | #endif |
|
| #if !defined(u_int64_t) | | |
| #define u_int64_t unsigned long long | | |
| #endif | | |
| | |
| #if defined(__x86_64__) | | #if defined(__x86_64__) |
| #define _LWS_PAD_SIZE 16 /* Intel recommended for best performance */ | | #define _LWS_PAD_SIZE 16 /* Intel recommended for best performance */ |
| #else | | #else |
| #define _LWS_PAD_SIZE LWS_SIZEOFPTR /* Size of a pointer on the target ar
ch */ | | #define _LWS_PAD_SIZE LWS_SIZEOFPTR /* Size of a pointer on the target ar
ch */ |
| #endif | | #endif |
| #define _LWS_PAD(n) (((n) % _LWS_PAD_SIZE) ? \ | | #define _LWS_PAD(n) (((n) % _LWS_PAD_SIZE) ? \ |
| ((n) + (_LWS_PAD_SIZE - ((n) % _LWS_PAD_SIZE))) : (n)) | | ((n) + (_LWS_PAD_SIZE - ((n) % _LWS_PAD_SIZE))) : (n)) |
| /* last 2 is for lws-meta */ | | /* last 2 is for lws-meta */ |
| #define LWS_PRE _LWS_PAD(4 + 10 + 2) | | #define LWS_PRE _LWS_PAD(4 + 10 + 2) |
| | |
| skipping to change at line 4797 ¶ | | skipping to change at line 4794 ¶ |
|---|
| lws_parse_uri(char *p, const char **prot, const char **ads, int *port, | | lws_parse_uri(char *p, const char **prot, const char **ads, int *port, |
| const char **path); | | const char **path); |
| | |
| /** | | /** |
| * lws_now_secs(): return seconds since 1970-1-1 | | * lws_now_secs(): return seconds since 1970-1-1 |
| */ | | */ |
| LWS_VISIBLE LWS_EXTERN unsigned long | | LWS_VISIBLE LWS_EXTERN unsigned long |
| lws_now_secs(void); | | lws_now_secs(void); |
| | |
| /** | | /** |
|
| * lws_get_context - Allow geting lws_context from a Websocket connection | | * lws_get_context - Allow getting lws_context from a Websocket connection |
| * instance | | * instance |
| * | | * |
| * With this function, users can access context in the callback function. | | * With this function, users can access context in the callback function. |
| * Otherwise users may have to declare context as a global variable. | | * Otherwise users may have to declare context as a global variable. |
| * | | * |
| * \param wsi: Websocket connection instance | | * \param wsi: Websocket connection instance |
| */ | | */ |
| LWS_VISIBLE LWS_EXTERN struct lws_context * LWS_WARN_UNUSED_RESULT | | LWS_VISIBLE LWS_EXTERN struct lws_context * LWS_WARN_UNUSED_RESULT |
| lws_get_context(const struct lws *wsi); | | lws_get_context(const struct lws *wsi); |
| | |
| | |
| End of changes. 3 change blocks. |
|---|
| 5 lines changed or deleted | | 2 lines changed or added |
|---|
|
| lws_config.h (2.4.1) | | lws_config.h (2.4.2) |
|---|
| /* lws_config.h Generated from lws_config.h.in */ | | /* lws_config.h Generated from lws_config.h.in */ |
| | |
| #ifndef NDEBUG | | #ifndef NDEBUG |
| #ifndef _DEBUG | | #ifndef _DEBUG |
| #define _DEBUG | | #define _DEBUG |
| #endif | | #endif |
| #endif | | #endif |
| | |
|
| #define LWS_INSTALL_DATADIR "/home/agreen/installed/libwebsockets/2.4.1/sha
re" | | #define LWS_INSTALL_DATADIR "/home/agreen/installed/libwebsockets/2.4.2/sha
re" |
| | |
| /* Define to 1 to use wolfSSL/CyaSSL as a replacement for OpenSSL. | | /* Define to 1 to use wolfSSL/CyaSSL as a replacement for OpenSSL. |
| * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */ | | * LWS_OPENSSL_SUPPORT needs to be set also for this to work. */ |
| /* #undef USE_WOLFSSL */ | | /* #undef USE_WOLFSSL */ |
| | |
| /* Also define to 1 (in addition to USE_WOLFSSL) when using the | | /* Also define to 1 (in addition to USE_WOLFSSL) when using the |
| (older) CyaSSL library */ | | (older) CyaSSL library */ |
| /* #undef USE_OLD_CYASSL */ | | /* #undef USE_OLD_CYASSL */ |
| /* #undef LWS_WITH_BORINGSSL */ | | /* #undef LWS_WITH_BORINGSSL */ |
| | |
| /* #undef LWS_WITH_MBEDTLS */ | | /* #undef LWS_WITH_MBEDTLS */ |
| /* #undef LWS_WITH_POLARSSL */ | | /* #undef LWS_WITH_POLARSSL */ |
| /* #undef LWS_WITH_ESP8266 */ | | /* #undef LWS_WITH_ESP8266 */ |
| /* #undef LWS_WITH_ESP32 */ | | /* #undef LWS_WITH_ESP32 */ |
| | |
| /* #undef LWS_WITH_PLUGINS */ | | /* #undef LWS_WITH_PLUGINS */ |
| /* #undef LWS_WITH_NO_LOGS */ | | /* #undef LWS_WITH_NO_LOGS */ |
| | |
| /* The Libwebsocket version */ | | /* The Libwebsocket version */ |
|
| #define LWS_LIBRARY_VERSION "2.4.1" | | #define LWS_LIBRARY_VERSION "2.4.2" |
| | |
| #define LWS_LIBRARY_VERSION_MAJOR 2 | | #define LWS_LIBRARY_VERSION_MAJOR 2 |
| #define LWS_LIBRARY_VERSION_MINOR 4 | | #define LWS_LIBRARY_VERSION_MINOR 4 |
|
| #define LWS_LIBRARY_VERSION_PATCH 1 | | #define LWS_LIBRARY_VERSION_PATCH 2 |
| /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ | | /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */ |
| #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS
_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH | | #define LWS_LIBRARY_VERSION_NUMBER (LWS_LIBRARY_VERSION_MAJOR*1000000)+(LWS
_LIBRARY_VERSION_MINOR*1000)+LWS_LIBRARY_VERSION_PATCH |
| | |
| /* The current git commit hash that we're building from */ | | /* The current git commit hash that we're building from */ |
| #define LWS_BUILD_HASH "root@mail.warmcat.com-" | | #define LWS_BUILD_HASH "root@mail.warmcat.com-" |
| | |
| /* Build with OpenSSL support */ | | /* Build with OpenSSL support */ |
| #define LWS_OPENSSL_SUPPORT | | #define LWS_OPENSSL_SUPPORT |
| | |
| /* The client should load and trust CA root certs it finds in the OS */ | | /* The client should load and trust CA root certs it finds in the OS */ |
| | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added |
|---|
|