Add support for blocking tag messages with the deaf mode.

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 10a0e51a2387398076f2a7199bfa21ebfb17de5e..9186f2c8c9ce88b78b0314a6357ccf763c39fcd0 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -1,11 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007 Burlex <???@???>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014 Adam <Adam@anope.org>
+ *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2017 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 burlex <burlex@e03df62e-2008-0410-955e-edbf42e46eb7>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -50,6 +55,12 @@ EventHandler::EventHandler()
        event_mask = 0;
 }
 
+void EventHandler::SwapInternals(EventHandler& other)
+{
+       std::swap(fd, other.fd);
+       std::swap(event_mask, other.event_mask);
+}
+
 void EventHandler::SetFd(int FD)
 {
        this->fd = FD;
@@ -71,6 +82,9 @@ void SocketEngine::InitError()
 
 void SocketEngine::LookupMaxFds()
 {
+#if defined _WIN32
+       MaxSetSize = FD_SETSIZE;
+#else
        struct rlimit limits;
        if (!getrlimit(RLIMIT_NOFILE, &limits))
                MaxSetSize = limits.rlim_cur;
@@ -82,6 +96,7 @@ void SocketEngine::LookupMaxFds()
 #endif
        if (!setrlimit(RLIMIT_NOFILE, &limits))
                MaxSetSize = limits.rlim_cur;
+#endif
 }
 
 void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
@@ -165,11 +180,7 @@ EventHandler* SocketEngine::GetRef(int fd)
 
 bool SocketEngine::BoundsCheckFd(EventHandler* eh)
 {
-       if (!eh)
-               return false;
-       if (eh->GetFd() < 0)
-               return false;
-       return true;
+       return eh && eh->HasFd();
 }