X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=9d69b5d22cf8e70267e9764888bcb4e9bb26e035;hb=dad754237bf28b9cb7733f7607e128569897eb10;hp=7fa58f8ad992bfe444fafe3bd9d618a7dabd2a16;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index 7fa58f8ad..9d69b5d22 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>
@@ -105,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
@@ -127,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
@@ -145,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;
+
+	/** The IOHook provider which handles connections on this socket,
+	 * NULL if there is none.
+	 */
+	dynamic_reference_nocheck<IOHookProvider> iohookprov;
+
 	/** 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.
+	 * @return True if the IO hook provider was found or none was given, false otherwise.
+	 */
+	bool ResetIOHookProvider();
+};