X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocketengine.h;h=e54dfca976fa30f45814274a1f4c9dfbba0b0237;hb=aa692dc1039b63deef7886e914ec499abe7facaf;hp=34dd306ba45d5766501ade3a80c4dd075beab9f8;hpb=b1098712771ab823042fcf8614a706c76c2ff401;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socketengine.h b/include/socketengine.h
index 34dd306ba..e54dfca97 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013-2014 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008, 2017 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 burlex <burlex@e03df62e-2008-0410-955e-edbf42e46eb7>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -164,6 +170,12 @@ class CoreExport EventHandler : public classbase
 	 * registered with the SocketEngine
 	 */
 	int fd;
+
+	/** Swaps the internals of this EventHandler with another one.
+	 * @param other A EventHandler to swap internals with.
+	 */
+	void SwapInternals(EventHandler& other);
+
  public:
 	/** Get the current file descriptor
 	 * @return The file descriptor of this handler
@@ -283,6 +295,9 @@ class CoreExport SocketEngine
 	/** Look up the fd limit using rlimit. */
 	static void LookupMaxFds();
 
+	/** Terminates the program when the socket engine fails to initialize. */
+	static void InitError();
+
 	static void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
 
 	/** Add an event handler to the base socket engine. AddFd(EventHandler*, int) should call this.
@@ -295,7 +310,7 @@ class CoreExport SocketEngine
 	static void ResizeDouble(std::vector<T>& vect)
 	{
 		if (SocketEngine::CurrentSetSize > vect.size())
-			vect.resize(vect.size() * 2);
+			vect.resize(SocketEngine::CurrentSetSize * 2);
 	}
 
 public:
@@ -481,20 +496,18 @@ public:
 	 * @param buf The buffer in which the data that is sent is stored.
 	 * @param len The size of the buffer.
 	 * @param flags A flag value that controls the sending of the data.
-	 * @param to The remote IP address and port.
-	 * @param tolen The size of the to parameter.
+	 * @param address The remote IP address and port.
 	 * @return This method should return exactly the same values as the system call it emulates.
 	 */
-	static int SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen);
+	static int SendTo(EventHandler* fd, const void* buf, size_t len, int flags, const irc::sockets::sockaddrs& address);
 
 	/** Abstraction for BSD sockets connect(2).
 	 * This function should emulate its namesake system call exactly.
 	 * @param fd This version of the call takes an EventHandler instead of a bare file descriptor.
-	 * @param serv_addr The server IP address and port.
-	 * @param addrlen The size of the sockaddr parameter.
+	 * @param address The server IP address and port.
 	 * @return This method should return exactly the same values as the system call it emulates.
 	 */
-	static int Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen);
+	static int Connect(EventHandler* fd, const irc::sockets::sockaddrs& address);
 
 	/** Make a file descriptor blocking.
 	 * @param fd a file descriptor to set to blocking mode