X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=1ea1332e277eab80ea2a231fc5d649127e325ec8;hb=c05f81cac83e80c7727594e3929e0709eccca689;hp=9d69b5d22cf8e70267e9764888bcb4e9bb26e035;hpb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index 9d69b5d22..1ea1332e2 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -1,12 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013, 2015-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012-2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2012 Adam <Adam@anope.org>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   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>
+ *   Copyright (C) 2006, 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -32,6 +36,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 +64,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 +92,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 */
@@ -117,18 +125,46 @@ namespace irc
 		 */
 		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
+		/** Convert a UNIX socket path to a binary sockaddr.
+		 * @param path The path to the UNIX socket.
+		 * @param sa The structure to place the result in. Will be zeroed prior to conversion.
+		 * @return True if the conversion was successful; otherwise, false.
 		 */
-		CoreExport bool satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port);
+		CoreExport bool untosa(const std::string& path, irc::sockets::sockaddrs& sa);
+
+		/** Determines whether the specified file is a UNIX socket.
+		 * @param file The path to the file to check.
+		 * @return True if the file is a UNIX socket; otherwise, false.
+		 */
+		CoreExport bool isunix(const std::string& file);
 	}
 }
 
-#include "iohook.h"
+/** Represents information about a failed port binding. */
+struct CoreExport FailedPort
+{
+	/** The error which happened during binding. */
+	int error;
+
+	/** The endpoint on which we were attempting to bind. */
+	irc::sockets::sockaddrs sa;
+
+	/** The config tag that the listener was created from. */
+	ConfigTag* tag;
+
+	FailedPort(int err, irc::sockets::sockaddrs& ep, ConfigTag* cfg)
+		: error(err)
+		, sa(ep)
+		, tag(cfg)
+	{
+	}
+};
+
+/** A list of failed port bindings, used for informational purposes on startup */
+typedef std::vector<FailedPort> FailedPortList;
+
 #include "socketengine.h"
+
 /** This class handles incoming connections on client ports.
  * It will create a new User for every valid connection
  * and assign it a file descriptor.
@@ -137,15 +173,23 @@ 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;
 
-	/** The IOHook provider which handles connections on this socket,
-	 * NULL if there is none.
+	/** IOHook providers for handling connections on this socket,
+	 * may be empty.
 	 */
-	dynamic_reference_nocheck<IOHookProvider> iohookprov;
+	IOHookProvList iohookprovs;
 
 	/** Create a new listening socket
 	 */
@@ -160,7 +204,6 @@ class CoreExport ListenSocket : public EventHandler
 
 	/** 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();
 };