X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=47e89070f0fb034dc21f165c3050e2a3501bfbe4;hb=0e6b18ff9180fc7794cea53d0566411b9afb0d7e;hp=c292b7010b915262d3ad03920f39acdfecf39d81;hpb=99f79a4e5c3abbe91a03216824e7659051872054;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index c292b7010..47e89070f 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -32,6 +32,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/un.h>
 #include <netinet/in.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -59,8 +60,11 @@ namespace irc
 			struct sockaddr sa;
 			struct sockaddr_in in4;
 			struct sockaddr_in6 in6;
+			struct sockaddr_un un;
+			/** Return the family of the socket (e.g. AF_INET). */
+			int family() const;
 			/** 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 +88,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,18 +120,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);
 	}
 }
 
-#include "iohook.h"
+/** 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
@@ -137,33 +135,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())
+		{
+		}
+	};
 
-	/** The IOHook provider which handles connections on this socket,
-	 * NULL if there is none.
+	typedef TR1NS::array<IOHookProvRef, 2> IOHookProvList;
+
+	/** IOHook providers for handling connections on this socket,
+	 * may be empty.
 	 */
-	dynamic_reference_nocheck<IOHookProvider> iohookprov;
+	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();
+	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();
+	void ResetIOHookProvider();
 };