Merge branch 'insp4' into master.

README.md

@@ -16,7 +16,7 @@ InspIRCd is supported on the following platforms:
 
 - The most recent three major releases of macOS using the AppleClang 12, Clang 10+, or GCC 10+ compilers and the GNU toolchain.
 
-- Windows 10 build 17061 or newer using the MSVC 19.29+ (Visual Studio 16.10 2019) compiler and CMake 3.20 or newer.
+- Windows 10 April 2018 Update or newer using the MSVC 19.29+ (Visual Studio 16.10 2019) compiler and CMake 3.20 or newer.
 
 Other platforms and toolchains may also work but are not officially supported by the InspIRCd team. Generally speaking if you are using a reasonably modern UNIX-like system you should be able to build InspIRCd on it. If you can not and you wish to submit a patch we are happy to accept it as long as it is not extremely large.
 

configure

@@ -416,8 +416,10 @@ security and privacy of your IRC server and is required for linking servers.
 
 Please read the following documentation pages on how to enable TLS support:
 
-GnuTLS (recommended): https://docs.inspircd.org/$version{MAJOR}/modules/ssl_gnutls
-OpenSSL:              https://docs.inspircd.org/$version{MAJOR}/modules/ssl_openssl
+Configuration:  https://docs.inspircd.org/tutorials/enable-tls
+GnuTLS module:  https://docs.inspircd.org/$version{MAJOR}/modules/ssl_gnutls
+OpenSSL module: https://docs.inspircd.org/$version{MAJOR}/modules/ssl_openssl
+
 EOM
 }
 

make/template/inspircd

@@ -146,11 +146,12 @@ sub cmd_status()
 	}
 }
 
-sub cmd_rehash()
+sub signal($)
 {
+	my $sig = shift;
 	if (getstatus() == 1) {
 		my $pid = getprocessid();
-		kill HUP => $pid;
+		kill $sig => $pid;
 		print "InspIRCd rehashed (pid: $pid).\n";
 		exit GENERIC_EXIT_SUCCESS;
 	} else {
@@ -159,6 +160,17 @@ sub cmd_rehash()
 	}
 }
 
+sub cmd_rehash()
+{
+	signal 'HUP';
+}
+
+sub cmd_sslrehash()
+{
+	signal 'USR1';
+}
+
+
 sub cmd_cron()
 {
 	if (getstatus() == 0) { goto &cmd_start(@_); }

src/helperfuncs.cpp

@@ -117,6 +117,7 @@ void InspIRCd::StripColor(std::string& line)
 						break;
 				}
 				line.erase(start, idx - start);
+				idx = start;
 				break;
 			}
 			case '\x04': // Hex Color
@@ -129,6 +130,7 @@ void InspIRCd::StripColor(std::string& line)
 						break;
 				}
 				line.erase(start, idx - start);
+				idx = start;
 				break;
 			}
 

src/socket.cpp

@@ -36,19 +36,19 @@
 
 namespace
 {
+#ifdef IPPROTO_SCTP
 	// Checks whether the system can create SCTP sockets.
 	bool CanCreateSCTPSocket()
 	{
-#ifdef IPPROTO_SCTP
 		int fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP);
 		if (fd >= 0)
 		{
 			SocketEngine::Close(fd);
 			return true;
 		}
-#endif
 		return false;
 	}
+#endif
 }
 
 bool InspIRCd::BindPort(const std::shared_ptr<ConfigTag>& tag, const irc::sockets::sockaddrs& sa, std::vector<ListenSocket*>& old_ports, sa_family_t protocol)

src/socketengine.cpp

@@ -244,9 +244,9 @@ ssize_t SocketEngine::SendTo(EventHandler* eh, const void* buf, size_t len, int
 	return nbSent;
 }
 
-ssize_t SocketEngine::WriteV(EventHandler* eh, const IOVector* iovec, int count)
+ssize_t SocketEngine::WriteV(EventHandler* eh, const IOVector* iov, int count)
 {
-	ssize_t sent = writev(eh->GetFd(), iovec, count);
+	ssize_t sent = writev(eh->GetFd(), iov, count);
 	stats.UpdateWriteCounters(sent);
 	return sent;
 }