Merge 949adfc5cf into a656eb5f1b

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "cmake.configureOnOpen": true
+}

include/libwebsockets.h

@@ -710,6 +710,7 @@ lws_fx_string(const lws_fx_t *a, char *buf, size_t size);
 #if defined(LWS_ROLE_MQTT)
 #include <libwebsockets/lws-mqtt.h>
 #endif
+#include <libwebsockets/lws-assert.h>
 #include <libwebsockets/lws-client.h>
 #include <libwebsockets/lws-http.h>
 #include <libwebsockets/lws-spa.h>

include/libwebsockets/lws-assert.h

@@ -0,0 +1,21 @@
+#if !defined(__LWS_ASSERT_H__)
+#define __LWS_ASSERT_H__
+
+
+
+
+typedef void (*lws_assert_cb)(const char *file, int line, const char *expression);
+void lws_set_assert_cb(lws_assert_cb cb);
+
+#ifdef  LWS_ENABLE_CUSTOM_ASSERT
+void lws_assert(const char *file, int line, const char *expression);
+#   ifdef assert
+#       undef assert
+#   endif
+#define assert(expression) (void)((expression) || (lws_assert(__FILE__, __LINE__, #expression), 0))
+#endif
+
+
+
+
+#endif

lib/core/CMakeLists.txt

@@ -32,6 +32,7 @@ if (NOT LWS_ONLY_SSPC)
 
 	list(APPEND SOURCES
 		core/alloc.c
+		core/assert.c
 		core/buflist.c
 		core/context.c
 		core/lws_map.c

lib/core/assert.c

@@ -0,0 +1,16 @@
+#include "private-lib-core.h"
+
+static lws_assert_cb assert_cb = NULL;
+
+void lws_set_assert_cb(lws_assert_cb cb) {
+    assert_cb = cb;
+}
+
+void lws_assert(const char *file, int line, const char *expression) {
+    if (assert_cb != NULL) {
+        assert_cb(file, line, expression);
+    } else {
+        fprintf(stderr, "Assertion failed: %s, file %s, line %d\n", expression, file, line);
+        abort();
+    }
+}

lib/core/private-lib-core.h

@@ -147,6 +147,7 @@
   *
   */
 
+#define LWS_ENABLE_CUSTOM_ASSERT
 #include "libwebsockets.h"
 
 /*

lib/roles/http/client/client-http.c

@@ -286,7 +286,7 @@ hs2:
 			lwsl_debug("ERROR writing to client socket\n");
 			lws_close_free_wsi(wsi, LWS_CLOSE_STATUS_NOSTATUS,
 					   "cws");
-			return 0;
+			return -1;	// closed wsi so let callers know
 		case LWS_SSL_CAPABLE_MORE_SERVICE:
 			lws_callback_on_writable(wsi);
 			break;

make.sh

@@ -0,0 +1,5 @@
+rm -rf build
+mkdir build
+cd build
+cmake .. -DLWS_WITH_MINIMAL_EXAMPLES=1
+make