m_namedmodes Only show chan key to members and opers with channels/auspex

[user/henk/code/inspircd.git] / src / threadengines / threadengine_pthread.cpp

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index 29a4b1a96618cb46560d8864bffcf5813705476a..40205da3118533479382f8f7f8dba2b5e182ffe1 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
@@ -73,6 +80,8 @@ class ThreadSignalSocket : public EventHandler
 
        ~ThreadSignalSocket()
        {
+               ServerInstance->SE->DelFd(this);
+               ServerInstance->SE->Close(GetFd());
        }
 
        void Notify()
@@ -97,9 +106,10 @@ class ThreadSignalSocket : public EventHandler
 
 SocketThread::SocketThread()
 {
+       signal.sock = NULL;
        int fd = eventfd(0, EFD_NONBLOCK);
        if (fd < 0)
-               throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+               throw CoreException("Could not create pipe " + std::string(strerror(errno)));
        signal.sock = new ThreadSignalSocket(this, fd);
 }
 #else
@@ -120,6 +130,8 @@ class ThreadSignalSocket : public EventHandler
        ~ThreadSignalSocket()
        {
                close(send_fd);
+               ServerInstance->SE->DelFd(this);
+               ServerInstance->SE->Close(GetFd());
        }
 
        void Notify()
@@ -145,9 +157,10 @@ class ThreadSignalSocket : public EventHandler
 
 SocketThread::SocketThread()
 {
+       signal.sock = NULL;
        int fds[2];
        if (pipe(fds))
-               throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+               throw CoreException("Could not create pipe " + std::string(strerror(errno)));
        signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
 }
 #endif
@@ -159,4 +172,9 @@ void SocketThread::NotifyParent()
 
 SocketThread::~SocketThread()
 {
+       if (signal.sock)
+       {
+               signal.sock->cull();
+               delete signal.sock;
+       }
 }