X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=de0b0510bf67d8998f715c3e41de92b230b691b7;hb=17d91b065e98963451e595d7697357a40a1c4425;hp=8fd2df0df62832884e8c27ed1935e783773be90e;hpb=8ef6da00a7b4aa32adbf7e19161bc6b8b59b7f7a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index 8fd2df0df..de0b0510b 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -17,6 +14,8 @@
 #ifndef INSPIRCD_SOCKET_H
 #define INSPIRCD_SOCKET_H
 
+#ifndef WIN32
+
 #include <arpa/inet.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -26,10 +25,26 @@
 #include <netinet/in.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <netdb.h>
+
+#else
+
+#include "inspircd_win32wrapper.h"
+
+#endif
+
 #include <errno.h>
 #include "inspircd_config.h"
+#include "socketengine.h"
+
+/* Accept Define */
+#ifdef CONFIG_USE_IOCP
+#define _accept(s, addr, addrlen) __accept_socket(s, addr, addrlen, m_acceptEvent)
+#define _getsockname(fd, sockptr, socklen) __getsockname(fd, sockptr, socklen, m_acceptEvent)
+#else
+#define _accept accept
+#define _getsockname getsockname
+#endif
 
 namespace irc
 {
@@ -75,7 +90,7 @@ namespace irc
 		 * @returns True if the first mask_bits of address matches the first
 		 * mask_bits of mask.
 		 */
-		bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits);
+		CoreExport bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits);
 
 		/** Match CIDR, without matching username/nickname parts.
 		 *
@@ -86,7 +101,7 @@ namespace irc
 		 * @param cidr_mask The human readable mask, e.g. 1.2.0.0/16
 		 * @return True if the mask matches the address
 		 */
-		bool MatchCIDR(const char* address, const char* cidr_mask);
+		CoreExport bool MatchCIDR(const char* address, const char* cidr_mask);
 
 		/** Match CIDR, including an optional username/nickname part.
 		 *
@@ -99,7 +114,7 @@ namespace irc
 		 * @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16
 		 * @return True if the mask matches the address
 		 */
-		bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username);
+		CoreExport bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username);
 
 		/** Convert an insp_inaddr into human readable form.
 		 * 
@@ -107,35 +122,87 @@ namespace irc
 		 * @return A human-readable address. IPV6 addresses
 		 * will be shortened to remove fields which are 0.
 		 */
-		const char* insp_ntoa(insp_inaddr n);
+		CoreExport const char* insp_ntoa(insp_inaddr n);
 
 		/** Convert a human-readable address into an insp_inaddr.
 		 * 
 		 * @param a A human-readable address
 		 * @param n An insp_inaddr struct which the result
 		 * will be copied into on success.
-		 * @return This function will return 0 upon success,
+		 * @return This method will return a negative value if address
+		 * does not contain a valid address family. 0 if the address is
+		 * does not contain a valid string representing a valid network
+		 * address. A positive value is returned if the network address
+		 * was successfully converted.
+
 		 * or any other number upon failure.
 		 */
-		int insp_aton(const char* a, insp_inaddr* n);
+		CoreExport int insp_aton(const char* a, insp_inaddr* n);
 
 		/** Make a socket file descriptor a blocking socket
 		 * @param s A valid file descriptor
 		 */
-		void Blocking(int s);
+		CoreExport void Blocking(int s);
 
 		/** Make a socket file descriptor into a nonblocking socket
 		 * @param s A valid file descriptor
 		 */
-		void NonBlocking(int s);
+		CoreExport void NonBlocking(int s);
 
 		/** Create a new valid file descriptor using socket()
 		 * @return On return this function will return a value >= 0 for success,
 		 * or a negative value upon failure (negative values are invalid file
 		 * descriptors)
 		 */
-		int OpenTCPSocket(); 
+		CoreExport int OpenTCPSocket(char* addr, int socktype = SOCK_STREAM);
 	};
 };
 
+/** This class handles incoming connections on client ports.
+ * It will create a new userrec for every valid connection
+ * and assign it a file descriptor.
+ */
+class CoreExport ListenSocket : public EventHandler
+{
+ protected:
+	/** The creator/owner of this object
+	 */
+	InspIRCd* ServerInstance;
+	std::string desc;
+	int family;
+	std::string bind_addr;
+	int bind_port;
+ public:
+	/** Create a new listening socket
+	 */
+	ListenSocket(InspIRCd* Instance, int port, char* addr);
+	/** Handle an I/O event
+	 */
+	void HandleEvent(EventType et, int errornum = 0);
+	/** Close the socket
+	 */
+	~ListenSocket();
+	/** Set descriptive text
+	 */
+	void SetDescription(const std::string &description)
+	{
+		desc = description;
+	}
+
+	const std::string& GetDescription()
+	{
+		return desc;
+	}
+
+	int GetPort()
+	{
+		return bind_port;
+	}
+
+	std::string &GetIP()
+	{
+		return bind_addr;
+	}
+};
+
 #endif