Update Bluewing Server to build 30

Build 28 was only fixes for the Fusion extension.
Build 29 had mostly Fusion-only fixes, but some edits:
* Fixed chance of crash for blank name set requests, the only crash in bluewing-cpp-server observed over a year of continous uptime now
+ Added channel close handler - runs just prior to channel unloading, be it from server-inited channel close, from last client leaving, from master leaving with autoclose on
* Version function now has ANSI or Unicode in it for Windows
(always Unicode compatible on mobile)
* Fixed an invalid return code from the address resolver thread - wouldn't cause an error, but was bad practice

And Bluewing Server b30 was a re-release of b29, after some botches in the release process, and issues with the then-bleeding-edge DarkEdif SDK v13.

Author: SortaCore

Lacewing/CodePointAllowList.cpp

@@ -81,7 +81,7 @@ std::string lacewing::codepointsallowlist::setcodepointsallowedlist(std::string
 			// Wildcard
 			if (cur[1] == '*')
 			{
-				char firstCharUpper = std::toupper(cur[0]);
+				char firstCharUpper = (char)std::toupper(cur[0]);
 				for (size_t i = 0; i < sizeof(wildcardCategory); i++)
 				{
 					if (firstCharUpper == wildcardCategory[i])
@@ -131,7 +131,7 @@ std::string lacewing::codepointsallowlist::setcodepointsallowedlist(std::string
 				if (std::find(specificCodePoints.cbegin(), specificCodePoints.cend(), codePointAllowed) != specificCodePoints.cend())
 					return CPALMakeError(this, acTemp, "Specific codepoint %lu was added twice in list \"%hs\".", codePointAllowed, acStr.c_str());
 
-				specificCodePoints.push_back(codePointAllowed);
+				specificCodePoints.push_back((int)codePointAllowed);
 				if (cur[0] == ',')
 					++cur;
 				goto nextChar;

Lacewing/FrameBuilder.h

@@ -47,27 +47,27 @@ class framebuilder : public messagebuilder
 		lw_ui32 headersize;
 
 		// Message size < 254; store as type byte + size byte
-		if (messagesize < 254)
+		if (messagesize < 0xfe)
 		{
-			buffer[6] = type;
-			buffer[7] = messagesize;
+			(*(lw_ui8*)(buffer + 6)) = (lw_ui8)type;
+			(*(lw_ui8*)(buffer + 7)) = (lw_ui8)messagesize;
 
 			headersize = 2;
 		}
 		// Message size >= 0xFF and <= 0xFFFF; store as type byte, plus size indicator byte of 254, plus size uint16
 		else if (messagesize < 0xffff)
 		{
-			buffer[4] = type;
+			(*(lw_ui8*)(buffer + 4)) = (lw_ui8)type;
 
 			(*(lw_ui8 *) (buffer + 5))	= 254;
-			(*(lw_ui16 *) (buffer + 6)) = messagesize;
+			(*(lw_ui16 *) (buffer + 6)) = (lw_ui16)messagesize;
 
 			headersize = 4;
 		}
 		// Message size > 0xFFFF and <= 0xFFFFFFFF; store as type byte, plus size indicator byte of 255, plus size uint32
-		else if (messagesize < 0xffffffff)
+		else if ((lw_ui32)messagesize < 0xffffffff)
 		{
-			buffer[2] = type;
+			(*(lw_ui8*)(buffer + 2)) = (lw_ui8)type;
 
 			(*(lw_ui8 *) (buffer + 3))	= 255;
 			(*(lw_ui32 *) (buffer + 4)) = messagesize;
@@ -107,10 +107,10 @@ class framebuilder : public messagebuilder
 			return;
 		}
 
-		add <lw_ui8>  ((type << 4) | variant);
+		add <lw_ui8>  ((lw_ui8)((type << 4) | variant));
 
 		if (isudpclient)
-			add <lw_ui16> (udpclientid);
+			add <lw_ui16> ((lw_ui16)udpclientid);
 	}
 
 	inline void send(lacewing::server_client client, bool clear = true)

Lacewing/FrameReader.h

@@ -62,7 +62,7 @@ class framereader
 
 		while (state < 3 && size -- > 0)
 		{
-			unsigned char byte = *(data ++);
+			lw_ui8 byte = *(data ++);
 
 			switch (state)
 			{
@@ -76,7 +76,7 @@ class framereader
 				{
 					if (sizebytesleft > 0)
 					{
-						buffer.add <unsigned char> (byte);
+						buffer.add <lw_ui8 > (byte);
 
 						if ((-- sizebytesleft) == 0)
 						{
@@ -152,7 +152,7 @@ class framereader
 				if (!mhRet)
 					return false; // Error, exit out
 
-				// Not safe to do this if messagehandler() is false
+				// Not safe to do this if messagehandler() is false, if we're using const memory
 				*(char *)&data[messagesize] = nextbyte;
 				state = 0;
 
@@ -175,7 +175,7 @@ class framereader
 
 		if (buffer.size == messagesize)
 		{
-			buffer.add <char> (0);
+			buffer.add <lw_ui8> (0);
 
 			if (!messagehandler(tag, messagetype, buffer.buffer, messagesize))
 				return false; // Error, exit out

Lacewing/Lacewing.h

@@ -118,10 +118,11 @@
 #include <mutex>
 #include <shared_mutex>
 #include <thread>
+#include <cctype>
 #include <cstring>
 
 // std::string_view requires C++17
-#if __cplusplus < 201703L && _MSVC_LANG < 201703L
+#if (__cplusplus < 201703L && _MSVC_LANG < 201703L) || (defined(__clang__) && !__has_include(<string_view>))
 	#error C++17 std::string_view not available, check what C++ standard your project is using
 #endif
 #include <string_view>
@@ -144,9 +145,7 @@ typedef lw_i8 lw_bool;
 #if (!defined(_lacewing_internal))
 
 	/* The ugly underscore prefixes are only necessary because we have to
-	 * compile the library as C++ for MSVC compatibility.  Maybe one day MSVC
-	 * will support C99 (or everyone will stop using Windows - I'm happy either
-	 * way.)
+	 * compile the library as C++ for MSVC compatibility.
 	 */
 
 	typedef struct _lw_thread			*  lw_thread;
@@ -195,9 +194,13 @@ typedef lw_i8 lw_bool;
 	lw_import			void  lw_md5_hex			(char * output, const char * input, size_t length);
 	lw_import			void  lw_sha1				(char * output, const char * input, size_t length);
 	lw_import			void  lw_sha1_hex			(char * output, const char * input, size_t length);
-	lw_import			void  lw_trace				(const char * format, ...);
+#if defined(_MSC_VER) || (defined(__unix__) && !defined(__ANDROID__))
+	#define __printflike(a,b) /* no op */
+#endif
+	lw_import			void  lw_trace				(const char * format, ...) __printflike(1, 2);
 	lw_import			void  lw_dump				(const char * buffer, size_t size);
 	lw_import		 lw_bool  lw_random				(char * buffer, size_t size);
+	lw_import		  size_t  lw_min_size_t			(size_t a, size_t b);
 
 /* Thread */
 
@@ -212,12 +215,12 @@ typedef lw_i8 lw_bool;
 /* Address */
 
 	lw_import			lw_addr  lw_addr_new			(const char * hostname, const char * service);
-	lw_import			lw_addr  lw_addr_new_port		(const char * hostname, long port);
-	lw_import			lw_addr  lw_addr_new_hint		(const char * hostname, const char * service, long hints);
-	lw_import			lw_addr  lw_addr_new_port_hint	(const char * hostname, long port, long hints);
+	lw_import			lw_addr  lw_addr_new_port		(const char * hostname, lw_ui16 port);
+	lw_import			lw_addr  lw_addr_new_hint		(const char * hostname, const char * service, int hints);
+	lw_import			lw_addr  lw_addr_new_port_hint	(const char * hostname, lw_ui16 port, int hints);
 	lw_import			lw_addr  lw_addr_clone			(lw_addr);
 	lw_import			   void  lw_addr_delete			(lw_addr);
-	lw_import			   long  lw_addr_port			(lw_addr);
+	lw_import			lw_ui16  lw_addr_port			(lw_addr);
 	lw_import			   void  lw_addr_set_port		(lw_addr, long port);
 	lw_import				int  lw_addr_type			(lw_addr);
 	lw_import			   void  lw_addr_set_type		(lw_addr, int);
@@ -378,7 +381,7 @@ typedef lw_i8 lw_bool;
 	typedef struct lw_streamdef
 	{
 		  size_t  (* sink_data)		 (lw_stream, const char * buffer, size_t size);
-		  size_t  (* sink_stream)	 (lw_stream, lw_stream source, size_t size);
+		  lw_i64  (* sink_stream)	 (lw_stream, lw_stream source, size_t size);
 			void  (* retry)			 (lw_stream, int when);
 		 lw_bool  (* is_transparent) (lw_stream);
 		 lw_bool  (* close) 		 (lw_stream, lw_bool immediate);
@@ -455,7 +458,7 @@ typedef lw_i8 lw_bool;
 
 	lw_import		lw_error  lw_error_new		();
 	lw_import			void  lw_error_delete	(lw_error);
-	lw_import			void  lw_error_add		(lw_error, long);
+	lw_import			void  lw_error_add		(lw_error, int);
 	lw_import			void  lw_error_addf		(lw_error, const char * format, ...);
 	lw_import			void  lw_error_addv		(lw_error, const char * format, va_list);
 	lw_import		  size_t  lw_error_size		(lw_error);
@@ -471,9 +474,9 @@ typedef lw_i8 lw_bool;
 	 */
 
 	lw_import	   lw_client  lw_client_new					(lw_pump);
-	lw_import			void  lw_client_connect				(lw_client, const char * host, long port);
+	lw_import			void  lw_client_connect				(lw_client, const char * host, lw_ui16 port);
 	lw_import			void  lw_client_connect_addr		(lw_client, lw_addr);
-	lw_import			void  lw_client_connect_secure		(lw_client, const char * host, long port);
+	lw_import			void  lw_client_connect_secure		(lw_client, const char * host, lw_ui16 port);
 	lw_import			void  lw_client_connect_addr_secure	(lw_client, lw_addr);
 	lw_import			void  lw_client_disconnect			(lw_client);
 	lw_import		 lw_bool  lw_client_connected			(lw_client);
@@ -530,12 +533,12 @@ typedef lw_i8 lw_bool;
 
 	lw_import	  lw_udp  lw_udp_new		 (lw_pump);
 	lw_import		void  lw_udp_delete		 (lw_udp);
-	lw_import		void  lw_udp_host		 (lw_udp, long port);
+	lw_import		void  lw_udp_host		 (lw_udp, lw_ui16 port);
 	lw_import		void  lw_udp_host_filter (lw_udp, lw_filter);
 	lw_import		void  lw_udp_host_addr	 (lw_udp, lw_addr);
 	lw_import	 lw_bool  lw_udp_hosting	 (lw_udp);
 	lw_import		void  lw_udp_unhost		 (lw_udp);
-	lw_import		long  lw_udp_port		 (lw_udp);
+	lw_import	 lw_ui16  lw_udp_port		 (lw_udp);
 	lw_import		void  lw_udp_send		 (lw_udp, lw_addr, const char * buffer, size_t size);
 	lw_import	  void *  lw_udp_tag		 (lw_udp);
 	lw_import		void  lw_udp_set_tag	 (lw_udp, void *);
@@ -680,6 +683,11 @@ typedef lw_i8 lw_bool;
 #else
 	#define lw_class_wraps(c)
 #endif
+#ifdef _MSC_VER
+#define lw_sprintf_s sprintf_s
+#else
+#define lw_sprintf_s sprintf
+#endif
 
 #pragma region Phi stuff
 
@@ -1008,7 +1016,7 @@ struct _fdstream : public _stream
 	lw_class_wraps (fdstream);
 
 	lw_import void set_fd
-		(lw_fd, lw_pump_watch watch = 0, bool auto_close = false);
+		(lw_fd, lw_pump_watch watch = 0, bool auto_close = false, bool is_socket = false);
 
 	lw_import bool valid ();
 
@@ -1048,8 +1056,8 @@ struct _address
 {
 	lw_class_wraps (address);
 
-	lw_import long port ();
-	lw_import void port (long);
+	lw_import lw_ui16 port ();
+	lw_import void port (lw_ui16);
 
 	lw_import int type ();
 	lw_import void type (int);
@@ -1072,9 +1080,9 @@ struct _address
 
 lw_import address address_new (address);
 lw_import address address_new (const char * hostname, const char * service);
-lw_import address address_new (const char * hostname, long port);
-lw_import address address_new (const char * hostname, const char * service, long hints);
-lw_import address address_new (const char * hostname, long port, long hints);
+lw_import address address_new (const char * hostname, lw_ui16 port);
+lw_import address address_new (const char * hostname, const char * service, int hints);
+lw_import address address_new (const char * hostname, lw_ui16 port, int hints);
 
 lw_import void address_delete (address);
 
@@ -1121,7 +1129,7 @@ struct _client : public _fdstream
 {
 	lw_class_wraps (client);
 
-	lw_import void connect (const char * host, long port);
+	lw_import void connect (const char * host, lw_ui16 port);
 	lw_import void connect (address);
 
 	lw_import bool connected ();
@@ -1217,14 +1225,14 @@ struct _udp
 {
 	lw_class_wraps (udp);
 
-	lw_import void host (long port);
+	lw_import void host (lw_ui16 port);
 	lw_import void host (filter);
 	lw_import void host (address);
 
 	lw_import bool hosting ();
 	lw_import void unhost ();
 
-	lw_import long port ();
+	lw_import lw_ui16 port ();
 
 	lw_import void send (address, const char * data, size_t size = -1);
 
@@ -1497,7 +1505,7 @@ struct _flashpolicy
 lw_import flashpolicy flashpolicy_new (pump);
 lw_import void flashpolicy_delete (flashpolicy);
 
-#pragma region Phi stuff
+//#pragma region Phi stuff
 // NOTE: if you edit this due to new liblacewing release, note:
 // _flashpolicy::on_error requires flash policy definition to be extracted.
 // Otherwise the flashpolicy can't be accessed for the C++ Flash Policy extension covered in flashpolicy2.cc.
@@ -1526,6 +1534,9 @@ lw_import void flashpolicy_delete (flashpolicy);
 //
 // lw_client is_connecting is now set to false properly if getaddrinfo fails.
 
+// Make sure you also add UDP keep-alive. Routers close connection otherwise.
+// Make sure you also fix the timer issue in unix.
+
 struct readlock;
 struct writelock;
 struct readwritelock
@@ -1566,6 +1577,7 @@ struct readwritelock
 #else
 	lacewing::readlock createReadLock();
 	lacewing::writelock createWriteLock();
+#endif
 
 protected:
 	void openReadLock(readlock & rl);
@@ -1577,10 +1589,10 @@ struct readwritelock
 	void upgradeReadLock(readlock &rl, writelock &wl);
 	void downgradeWriteLock(writelock &wl, readlock &rl);
 
-#endif
-
 private:
 
+	// Would use std::shared_mutex, or std::shared_timed_mutex, but iOS doesn't support it until 10.0,
+	// so we'll roll our own.
 	std::shared_timed_mutex lock;
 	//std::condition_variable read, write;
 	::std::atomic<size_t> readers, writers, read_waiters, write_waiters;
@@ -1688,7 +1700,7 @@ struct relayclientinternal;
 struct relayclient
 {
 public:
-	const static int buildnum = 96;
+	const static int buildnum = 99;
 
 	void * internaltag = nullptr, *tag = nullptr;
 
@@ -1912,7 +1924,7 @@ struct codepointsallowlist {
 struct relayserverinternal;
 struct relayserver
 {
-	static const int buildnum = 27;
+	static const int buildnum = 30;
 
 	void * internaltag, * tag = nullptr;
 
@@ -2204,10 +2216,12 @@ struct relayserver
 	void nameset_response(std::shared_ptr<lacewing::relayserver::client> client,
 		std::string_view newClientName, std::string_view denyReason);
 };
-#pragma endregion
+//#pragma endregion
 
 }
 
+#else
+#error Not building as C++
 #endif /* defined (__cplusplus) */
 #endif /* _lacewing_h */
 

Lacewing/MessageBuilder.h

@@ -57,8 +57,8 @@ class messagebuilder
 
 	void add(const char * const buffer, size_t sizeP)
 	{
-		if (sizeP == -1)
-			sizeP = (lw_i32)strlen(buffer);
+		if (sizeP == (size_t)-1)
+			sizeP = (lw_ui32)strlen(buffer);
 
 		if constexpr (sizeof(sizeP) > 4)
 			assert(sizeP < 0xFFFFFFFF);

Lacewing/PhiAddress.cc

@@ -295,10 +295,14 @@ std::string_view lw_u8str_trim(std::string_view toTrim, bool abortOnTrimNeeded)
 #endif
 void LacewingFatalErrorMsgBox2(const char * const func, const char * const file, const int line)
 {
+	// Remove the repository name
+	const char * fileSub = strstr(file, "Lacewing\\");
+	fileSub = fileSub ? fileSub : file;
+
 	std::stringstream err;
-	err << "Lacewing fatal error detected.\nFile: "sv << file << "\nFunction: "sv << func << "\nLine: "sv << line;
+	err << "Lacewing fatal error detected.\nFile: "sv << fileSub << "\nFunction: "sv << func << "\nLine: "sv << line;
 #ifdef _WIN32
-	MessageBoxA(NULL, err.str().c_str(), "" PROJECT_NAME " Msg Box Death", MB_ICONERROR);
+	MessageBoxA(NULL, err.str().c_str(), "" PROJECT_NAME " fatal error", MB_ICONERROR);
 #else
 	char output[512];
 	strcpy(output, err.str().c_str());