Remove unused ProtocolInterface::SendTopic()

[user/henk/code/inspircd.git] / include / socket.h

diff --git a/include/socket.h b/include/socket.h
index cad14499e9f68757476c7cf817e439cfde4c0241..9d69b5d22cf8e70267e9764888bcb4e9bb26e035 100644 (file)
--- a/include/socket.h
+++ b/include/socket.h
@@ -1,20 +1,30 @@
-/*       +------------------------------------+
- *       | 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 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006 William Pitcock <nenolod@dereferenced.org>
  *
- * 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/>.
  */
 
-#ifndef INSPIRCD_SOCKET_H
-#define INSPIRCD_SOCKET_H
 
-#ifndef WIN32
+#pragma once
+
+#ifndef _WIN32
 
 #include <arpa/inet.h>
 #include <sys/time.h>
@@ -44,7 +54,8 @@ namespace irc
         */
        namespace sockets
        {
-               union CoreExport sockaddrs {
+               union CoreExport sockaddrs
+               {
                        struct sockaddr sa;
                        struct sockaddr_in in4;
                        struct sockaddr_in6 in6;
@@ -56,9 +67,11 @@ namespace irc
                        std::string addr() const;
                        /** Return human-readable IP/port pair */
                        std::string str() const;
+                       bool operator==(const sockaddrs& other) const;
+                       inline bool operator!=(const sockaddrs& other) const { return !(*this == other); }
                };
 
-               struct cidr_mask
+               struct CoreExport cidr_mask
                {
                        /** Type, AF_INET or AF_INET6 */
                        unsigned char type;
@@ -91,13 +104,11 @@ namespace irc
                 * IPV6 addresses.
                 * @param address The human readable address, e.g. fred\@1.2.3.4
                 * @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16
+                * @param match_with_username Does the  mask include a nickname segment?
                 * @return True if the mask matches the address
                 */
                CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username);
 
-               /** Return the size of the structure for syscall passing */
-               inline int sa_size(const irc::sockets::sockaddrs& sa) { return sa.sa_size(); }
-
                /** Convert an address-port pair into a binary sockaddr
                 * @param addr The IP address, IPv4 or IPv6
                 * @param port The port, 0 for unspecified
@@ -113,16 +124,10 @@ namespace irc
                 * @return true if the conversion was successful, false if unknown address family
                 */
                CoreExport bool satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port);
-
-               /** Convert a binary sockaddr to a user-readable string.
-                * This means IPv6 addresses are written as [::1]:6667, and *:6668 is used for 0.0.0.0:6668
-                * @param sa The structure to convert
-                * @return The string; "<unknown>" if not a valid address
-                */
-               inline std::string satouser(const irc::sockets::sockaddrs& sa) { return sa.str(); }
        }
 }
 
+#include "iohook.h"
 #include "socketengine.h"
 /** This class handles incoming connections on client ports.
  * It will create a new User for every valid connection
@@ -131,25 +136,31 @@ namespace irc
 class CoreExport ListenSocket : public EventHandler
 {
  public:
-       const reference<ConfigTag> bind_tag;
+       reference<ConfigTag> bind_tag;
        std::string bind_addr;
        int bind_port;
        /** Human-readable bind description */
        std::string bind_desc;
-       /** Create a new listening socket
+
+       /** The IOHook provider which handles connections on this socket,
+        * NULL if there is none.
         */
-       ListenSocket(ConfigTag* tag, const std::string& addr, int port);
-       /** Handle an I/O event
+       dynamic_reference_nocheck<IOHookProvider> iohookprov;
+
+       /** Create a new listening socket
         */
-       void HandleEvent(EventType et, int errornum = 0);
+       ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to);
        /** Close the socket
         */
        ~ListenSocket();
 
-       /** Handles sockets internals crap of a connection, convenience wrapper really
+       /** Handles new connections, called by the socket engine
         */
-       void AcceptInternal();
-};
-
-#endif
+       void OnEventHandlerRead() CXX11_OVERRIDE;
 
+       /** Inspects the bind block belonging to this socket to set the name of the IO hook
+        * provider which this socket will use for incoming connections.
+        * @return True if the IO hook provider was found or none was given, false otherwise.
+        */
+       bool ResetIOHookProvider();
+};