Check tag list after checking if the message-tag cap is enabled.

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 59d9558a4ecd25a83930ff9a2935e853080d39b3..ef1ba7ee2fdef8ed3a6c9da8e4578d91b20fdfe1 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -1,12 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 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
@@ -95,6 +100,10 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 void StreamSocket::Close()
 {
+       if (closing)
+               return;
+
+       closing = true;
        if (this->fd > -1)
        {
                // final chance, dump as much of the sendq as we can
@@ -114,6 +123,14 @@ void StreamSocket::Close()
        }
 }
 
+void StreamSocket::Close(bool writeblock)
+{
+       if (getSendQSize() != 0 && writeblock)
+               closeonempty = true;
+       else
+               Close();
+}
+
 CullResult StreamSocket::cull()
 {
        Close();
@@ -206,7 +223,12 @@ static const int MYIOV_MAX = IOV_MAX < 128 ? IOV_MAX : 128;
 void StreamSocket::DoWrite()
 {
        if (getSendQSize() == 0)
+       {
+               if (closeonempty)
+                       Close();
+
                return;
+       }
        if (!error.empty() || fd < 0)
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DoWrite on errored or closed socket");
@@ -242,6 +264,9 @@ void StreamSocket::DoWrite()
 
        if (psendq)
                FlushSendQ(*psendq);
+
+       if (getSendQSize() == 0 && closeonempty)
+               Close();
 }
 
 void StreamSocket::FlushSendQ(SendQueue& sq)
@@ -521,3 +546,17 @@ size_t StreamSocket::getSendQSize() const
        }
        return ret;
 }
+
+void StreamSocket::SwapInternals(StreamSocket& other)
+{
+       if (type != other.type)
+               return;
+
+       EventHandler::SwapInternals(other);
+       std::swap(closeonempty, other.closeonempty);
+       std::swap(closing, other.closing);
+       std::swap(error, other.error);
+       std::swap(iohook, other.iohook);
+       std::swap(recvq, other.recvq);
+       std::swap(sendq, other.sendq);
+}