X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=427ee9fe7e3f7823aad489f5b253ba81523a9149;hb=8dbd80610aee01b8064ca813e1dd7ca44ab3f7b6;hp=16809c3f81988bd75da2dcae0819348d5fc56f4a;hpb=def08e968b2ed922d7ee69d92d6754f858d00f57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index 16809c3f8..427ee9fe7 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -22,10 +22,9 @@
  */
 
 
-#ifndef INSPIRCD_SOCKET_H
-#define INSPIRCD_SOCKET_H
+#pragma once
 
-#ifndef WIN32
+#ifndef _WIN32
 
 #include <arpa/inet.h>
 #include <sys/time.h>
@@ -110,9 +109,6 @@ namespace irc
 		 */
 		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
@@ -128,13 +124,6 @@ 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(); }
 	}
 }
 
@@ -146,25 +135,41 @@ 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;
+
+	class IOHookProvRef : public dynamic_reference_nocheck<IOHookProvider>
+	{
+	 public:
+		IOHookProvRef()
+			: dynamic_reference_nocheck<IOHookProvider>(NULL, std::string())
+		{
+		}
+	};
+
+	typedef TR1NS::array<IOHookProvRef, 2> IOHookProvList;
+
+	/** IOHook providers for handling connections on this socket,
+	 * may be empty.
+	 */
+	IOHookProvList iohookprovs;
+
 	/** Create a new listening socket
 	 */
 	ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to);
-	/** Handle an I/O event
-	 */
-	void HandleEvent(EventType et, int errornum = 0);
 	/** 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.
+	 */
+	void ResetIOHookProvider();
+};