Update Bluewing Server to build 25 (final ANSI)

Final ANSI build; adds client and channel name checks to make sure valid ASCII human-readable names are used.
Added relayserver::client::istrusted(). Whether a client is being disconnected from misuse of messages, or not, is now possible to view in the Disconnect handler, even when client has not received Lacewing Connect Success response. This was necessary as connections dropped due to improper messages before On Connect was triggered may have been treated as if they got On Connect triggered.
Added write lock around setting welcome message.
Fixed a compilation warning when building for 64-bit.
Fixed some excess whitespace.

Author: SortaCore

.editorconfig

@@ -6,4 +6,12 @@ insert_final_newline = true
 charset = utf-8
 indent_style = tab
 indent_size = 4
-trim_trailing_whitespace = true
+trim_trailing_whitespace = true
+
+[*.{md}]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = false

Lacewing/Lacewing.h

@@ -35,7 +35,7 @@ bool lw_sv_cmp(std::string_view first, std::string_view second)
 	if (first.size() != second.size())
 		return false;
 
-	return !strncmp(first.data(), second.data(), first.size());
+	return !memcmp(first.data(), second.data(), first.size());
 }
 
 /// <summary> Compares if two strings match, returns true if so. Case insensitive. Does a size check. </summary>

Lacewing/PhiAddress.cc

@@ -159,7 +159,7 @@ namespace lacewing
 	std::shared_ptr<relayclient::channel> relayclientinternal::findchannelbyid(unsigned short id)
 	{
 		lacewing::readlock rl = this->client.lock.createReadLock();
-		auto i = std::find_if(channels.cbegin(), channels.cend(), 
+		auto i = std::find_if(channels.cbegin(), channels.cend(),
 			[&](const std::shared_ptr<const relayclient::channel> &c) { return c->id() == id; });
 		return i == channels.cend() ? nullptr : *i;
 	}
@@ -170,7 +170,7 @@ namespace lacewing
 
 		/* opening 0 byte */
 		socket->write("", 1);
-		
+
 		// internal.udp->host(socket->server_address(), nullptr, 0U);
 
 		framebuilder &message = internal.message;
@@ -211,7 +211,7 @@ namespace lacewing
 		char * dataCpy = (char *)malloc(size);
 		if (!dataCpy)
 			throw std::exception("Out of memory.");
-		
+
 		memcpy(dataCpy, data, size);
 
 		internal.reader.process(dataCpy, size);
@@ -364,7 +364,7 @@ namespace lacewing
 	void relayclient::join(std::string_view channelName, bool hidden, bool autoclose)
 	{
 		relayclientinternal &internal = *((relayclientinternal *)internaltag);
-		
+
 		if (name().empty())
 		{
 			error error = lacewing::error_new();
@@ -541,7 +541,7 @@ namespace lacewing
 		lacewing::readlock rl = lock.createReadLock();
 		return _id;
 	}
-	
+
 	std::string relayclient::channel::peer::name() const
 	{
 		lacewing::readlock rl = lock.createReadLock();
@@ -559,14 +559,14 @@ namespace lacewing
 		// Atomic, no point changing it
 		return _readonly;
 	}
-	
+
 	size_t relayclient::channelcount() const
 	{
 		lacewing::readlock rl = lock.createReadLock();
 		return ((relayclientinternal *)internaltag)->channels.size();
 	}
 
-	int relayclient::id() const
+	lw_ui16 relayclient::id() const
 	{
 		lacewing::readlock rl = lock.createReadLock();
 		return ((relayclientinternal *)internaltag)->id;
@@ -587,8 +587,8 @@ namespace lacewing
 
 	bool relayclientinternal::messagehandler(unsigned char type, const char * message, size_t size, bool blasted)
 	{
-		unsigned char messagetypeid = (type >> 4);
-		unsigned char variant = (type << 4);
+		lw_ui8 messagetypeid = (type >> 4);
+		lw_ui8 variant = (type << 4);
 
 		variant >>= 4;
 
@@ -598,8 +598,8 @@ namespace lacewing
 		{
 		case 0: /* response */
 		{
-			unsigned char  responsetype = reader.get <unsigned char>();
-			bool			succeeded = reader.get <unsigned char>() != 0;
+			lw_ui8  responsetype = reader.get <lw_ui8>();
+			bool	succeeded    = reader.get <lw_ui8>() != 0;
 
 			if (reader.failed)
 				break;
@@ -610,14 +610,14 @@ namespace lacewing
 			{
 				if (succeeded)
 				{
-					id = reader.get <unsigned short>();
+					id = reader.get <lw_ui16>();
 
 					// Don't expect welcome message to be null terminated
 					std::string_view welcomemessage = reader.get(reader.bytesleft());
 
 					if (reader.failed)
 						break;
-				
+
 					this->welcomemessage = welcomemessage;
 
 					socket->server_address()->resolve();
@@ -712,16 +712,16 @@ namespace lacewing
 
 					auto channel = std::make_shared<relayclient::channel>(*this);
 					auto channelWriteLock = channel->lock.createWriteLock();
-					
+
 					channel->_id = channelid;
 					channel->_name = name;
 					channel->_ischannelmaster = (flags & 1) != 0;
 
 					for (; reader.bytesleft() > 0;)
 					{
-						int peerid = reader.get <unsigned short>();
-						int flags2 = reader.get <unsigned char>();
-						int namelength2 = reader.get <unsigned char>();
+						lw_ui16 peerid     = reader.get <lw_ui16>();
+						lw_ui8 flags2      = reader.get <lw_ui8>();
+						lw_ui8 namelength2 = reader.get <lw_ui8>();
 						std::string_view name2 = reader.get(namelength2);
 
 						if (reader.failed)
@@ -781,7 +781,7 @@ namespace lacewing
 
 					if (handler_channel_leave)
 						handler_channel_leave(client, channel);
-					
+
 					// Handler BEFORE finding it in channel list, in case leave handler calls disconnect.
 					if (!connected)
 						break;
@@ -953,8 +953,8 @@ namespace lacewing
 
 		case 4: /* binaryserverchannelmessage */
 		{
-			int subchannel = reader.get <unsigned char>();
-			unsigned short channel = reader.get<unsigned short>();
+			lw_ui8 subchannel = reader.get <lw_ui8>();
+			lw_ui16 channel   = reader.get<lw_ui16>();
 			if (reader.failed)
 				break;
 
@@ -1033,7 +1033,7 @@ namespace lacewing
 
 			lw_ui8 flags = reader.get <lw_ui8>();
 			std::string_view name = reader.get(reader.bytesleft()); // name's not null terminated
-			
+
 			if (reader.failed)
 			{
 				/* no flags/name - the peer must have left the channel */
@@ -1044,9 +1044,12 @@ namespace lacewing
 					return true;
 
 				peer->_readonly = true;
+
+				channelWriteLock.lw_unlock(); // Don't leave it locked while handler is run
+
 				if (handler_peer_disconnect)
 					handler_peer_disconnect(client, channel2, peer);
-				
+
 				channel2 = findchannelbyid(channel);
 
 				// Handler called disconnect, so channel is no longer accessible
@@ -1055,6 +1058,7 @@ namespace lacewing
 
 				// LW_ESCALATION_NOTE
 				// auto channelWriteLock = channelReadLock.lw_upgrade();
+				channelWriteLock.lw_relock();
 				auto i = std::find_if(channel2->peers.begin(), channel2->peers.end(),
 					[=](std::shared_ptr<relayclient::channel::peer> &p) { return p->_id == peerid; });
 				if (i != channel2->peers.end())
@@ -1074,6 +1078,8 @@ namespace lacewing
 
 					// this does channel2->peers.push_back()
 					peer = channel2->addnewpeer(peerid, flags, name);
+
+					channelWriteLock.lw_unlock(); // Don't leave it locked while handler is run (when escalation happens, it will unlock by {}s
 				}
 
 				if (handler_peer_connect)
@@ -1244,8 +1250,8 @@ namespace lacewing
 		// udphellotick just sends UDPHello every 0.5s, and is managed by the relayclientinternal::udphellotimer var.
 		// It starts from the time the Connect Request Success message is sent.
 		if (!udp->hosting())
-			throw std::exception("udphellotick() called, but not hosting UDP."); 
-		
+			throw std::exception("udphellotick() called, but not hosting UDP.");
+
 		message.addheader(7, 0, true, id); /* udphello */
 		message.send(udp, socket->server_address());
 	}
@@ -1336,7 +1342,7 @@ namespace lacewing
 		return _ischannelmaster;
 	}
 
-	unsigned short relayclient::channel::peer::id() const
+	lw_ui16 relayclient::channel::peer::id() const
 	{
 		// We won't check for read lock, as ID cannot change, so there's no use to threadsafe-ing its access.
 		return _id;
@@ -1374,7 +1380,7 @@ namespace lacewing
 	{
 		relayclientinternal::channel &internal = *(relayclientinternal::channel *)internaltag;
 		auto end = internal.client.channels.end();
-		
+
 		auto i = std::find_if(internal.client.channels.begin(), end,
 			[&](relayclientinternal::channel * &c) { return c->id == internal.id; });
 		return (i == end || ++i == end) ? nullptr : &(*i)->public_;
@@ -1385,7 +1391,7 @@ namespace lacewing
 		std::vector<relayclientinternal::channel *> &c = ((lacewing::relayclientinternal *)internaltag)->channels;
 		return (c.begin() == c.end()) ? nullptr : &(*c.begin())->public_;
 	}
-	
+
 	relayclient::channel::peer * relayclient::channel::firstpeer() const
 	{
 		std::vector<relayclientinternal::peer *> &p = ((lacewing::relayclientinternal::channel *)internaltag)->peers;
@@ -1414,7 +1420,7 @@ namespace lacewing
 		lock.checkHoldsRead();
 		return ((relayclientinternal *)internaltag)->channellist;
 	}
-	
+
 #define autohandlerfunctions(pub, intern, handlername)			  \
 	void pub::on##handlername(pub::handler_##handlername handler)	\
 		{	((intern *) internaltag)->handler_##handlername = handler;	  \

Lacewing/RelayClient.cc

@@ -158,7 +158,7 @@ struct relayserverinternal
 			decltype(msElapsedTCP) msElapsedUDP = 0;
 			if (!client->pseudoUDP)
 				msElapsedUDP = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - client->lastudpmessagetime).count();
-			
+
 			// detect a buggy version of std::chrono::steady_clock (was in a VS 2019 preview)
 			if (msElapsedTCP < 0 || msElapsedUDP < 0 || msElapsedNonPing < 0)
 				DebugBreak();
@@ -1356,8 +1356,8 @@ bool relayserverinternal::client_messagehandler(std::shared_ptr<relayserver::cli
 {
 	auto cliReadLock = client->lock.createReadLock();
 
-	unsigned char messagetypeid  = (type >> 4);
-	unsigned char variant        = (type << 4);
+	lw_ui8 messagetypeid  = (type >> 4);
+	lw_ui8 variant        = (type << 4);
 
 	variant >>= 4;
 	const char * message = messageP.data();
@@ -1405,7 +1405,7 @@ bool relayserverinternal::client_messagehandler(std::shared_ptr<relayserver::cli
 		client->lasttcpmessagetime = ::std::chrono::steady_clock::now();
 
 	std::stringstream errStr;
-	bool trustedClient = true;
+	bool& trustedClient = client->trustedClient;
 
 	switch (messagetypeid)
 	{
@@ -2170,6 +2170,7 @@ std::vector<std::shared_ptr<lacewing::relayserver::client>>& relayserver::channe
 
 void relayserver::setwelcomemessage(std::string_view message)
 {
+	lacewing::writelock wl = lock.createWriteLock();
 	relayserverinternal& serverinternal = *(relayserverinternal *)internaltag;
 	serverinternal.welcomemessage = message;
 }
@@ -2218,6 +2219,10 @@ bool relayserver::client::readonly() const
 {
 	return _readonly;
 }
+bool relayserver::client::istrusted() const
+{
+	return trustedClient;
+}
 
 std::vector<std::shared_ptr<lacewing::relayserver::channel>> & relayserver::client::getchannels()
 {
@@ -2294,15 +2299,26 @@ relayserver::client::~client() noexcept(false)
 
 std::shared_ptr<relayserver::channel> relayserver::createchannel(std::string_view channelName, std::shared_ptr<relayserver::client> master, bool hidden, bool autoclose)
 {
-	auto channel = std::make_shared<relayserver::channel>(*(lacewing::relayserverinternal *)internaltag, channelName);
+	auto& serverinternal = *(lacewing::relayserverinternal *)internaltag;
+	auto channel = std::make_shared<relayserver::channel>(serverinternal, channelName);
 	auto channelWriteLock = channel->lock.createWriteLock();
 
 	channel->_channelmaster = master;
 	channel->_hidden = hidden;
 	channel->_autoclose = autoclose;
 
-	joinchannel_response(channel, master, std::string_view());
-	// calls serverinternal.channels.push_back(channel);
+	if (master)
+	{
+		joinchannel_response(channel, master, std::string_view());
+		// calls serverinternal.channels.push_back(channel);
+	}
+	else
+	{
+		lacewing::writelock serverWriteLock = lock.createWriteLock();
+		if (std::find(serverinternal.channels.cbegin(), serverinternal.channels.cend(), channel) == serverinternal.channels.cend())
+			serverinternal.channels.push_back(channel);
+	}
+
 	channelWriteLock.lw_unlock();
 
 	return channel;

Lacewing/RelayServer.cc

@@ -87,7 +87,6 @@ static void completion (void * tag, OVERLAPPED * _overlapped,
 
 		 if (error || !bytes_transferred)
 		 {
-
 			// First, establish if connection has died, or temporarily had an error.
 			// If it's died, we'll do an immediate shutdown, otherwise a graceful.
 
@@ -99,17 +98,17 @@ static void completion (void * tag, OVERLAPPED * _overlapped,
 				// Local network went down (something providing connectivity failed)
 				error == WSAENETDOWN ||
 				// Local network unreachable (no route to other side)
-				error == WSAENETUNREACH ||
+				error == WSAENETUNREACH || error == ERROR_NETWORK_UNREACHABLE ||
 				// Local network was reset, and this connection was closed forcibly; e.g. network adapter reset
 				error == WSAENETRESET ||
+				// Local or remote end aborted their connection
+				error == WSAECONNABORTED || error == ERROR_CONNECTION_ABORTED ||
 				// Remote end reset their connection
-				error == WSAECONNABORTED ||
-				// Remote end reset their connection
-				error == WSAECONNRESET ||
-				// Local socket was shut down via shutdown()/closesocket() call
+				error == WSAECONNRESET || error == ERROR_CONNECTION_UNAVAIL ||
+				// Local socket was shut down via shutdown()/closesocket() call (can also cause connection aborted)
 				error == WSAESHUTDOWN ||
 				// Local socket not connected
-				error == WSAENOTCONN;
+				error == WSAENOTCONN || error == ERROR_PORT_UNREACHABLE;
 			lwp_trace("Closing stream %p, due to error %i. Unreachable: %s.\n", ctx, error, otherEndUnreachable ? "YES" : "NO");
 
 			lw_stream_close ((lw_stream) ctx, otherEndUnreachable);

Lacewing/src/windows/fdstream.c

@@ -56,7 +56,7 @@ lw_timer lw_timer_new (lw_pump pump)
 	  return 0;
 
 	ctx->pump = pump;
-	
+
 	ctx->shutdown_event = CreateEvent (0, TRUE, FALSE, 0);
 	ctx->timer_handle = CreateWaitableTimer (0, FALSE, 0);
 
@@ -112,7 +112,7 @@ void lw_timer_start (lw_timer ctx, long interval)
 	lw_timer_stop (ctx);
 
 	LARGE_INTEGER due_time;
-	due_time.QuadPart = 0 - (interval * 1000 * 10);
+	due_time.QuadPart = 0LL - (interval * 1000LL * 10LL);
 
 	if (!SetWaitableTimer (ctx->timer_handle, &due_time, interval, 0, 0, 0))
 	{