X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=aec06b526e53c849120747e3a2c90b0dea7276b9;hb=4aa27e75af8da0a5bc2e35f931f0165339f5f289;hp=3abbeef32a1054135cf741d5253600e0174b6b92;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index 3abbeef32..aec06b526 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -60,7 +60,7 @@ namespace irc
 			struct sockaddr_in in4;
 			struct sockaddr_in6 in6;
 			/** Return the size of the structure for syscall passing */
-			int sa_size() const;
+			socklen_t sa_size() const;
 			/** Return port number or -1 if invalid */
 			int port() const;
 			/** Return IP only */
@@ -84,7 +84,7 @@ namespace irc
 			/** Construct a CIDR mask from the string. Will normalize (127.0.0.1/8 => 127.0.0.0/8). */
 			cidr_mask(const std::string& mask);
 			/** Construct a CIDR mask of a given length from the given address */
-			cidr_mask(const irc::sockets::sockaddrs& addr, int len);
+			cidr_mask(const irc::sockets::sockaddrs& addr, unsigned char len);
 			/** Equality of bits, type, and length */
 			bool operator==(const cidr_mask& other) const;
 			/** Ordering defined for maps */
@@ -116,24 +116,12 @@ namespace irc
 		 * @return true if the conversion was successful, false if not.
 		 */
 		CoreExport bool aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa);
-
-		/** Convert a binary sockaddr to an address-port pair
-		 * @param sa The structure to convert
-		 * @param addr the IP address
-		 * @param port the port
-		 * @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(); }
 	}
 }
 
+/** A list of failed port bindings, used for informational purposes on startup */
+typedef std::vector<std::pair<irc::sockets::sockaddrs, int> > FailedPortList;
+
 #include "socketengine.h"
 /** This class handles incoming connections on client ports.
  * It will create a new User for every valid connection
@@ -143,21 +131,37 @@ class CoreExport ListenSocket : public EventHandler
 {
  public:
 	reference<ConfigTag> bind_tag;
-	std::string bind_addr;
-	int bind_port;
-	/** Human-readable bind description */
-	std::string bind_desc;
+	const irc::sockets::sockaddrs bind_sa;
+
+	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 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 AcceptInternal();
+	void ResetIOHookProvider();
 };