X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=556ee1a9045a4495b868b88d22ac9426dd44cdcd;hb=77b7c4300472ff1ba5c643b75ead4be75625f96f;hp=57725b95fedc0edcc4168c73c3126e18b05b9c90;hpb=455d6fac2e047a9d544e455e0cced8fe94a9d95b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index 57725b95f..556ee1a90 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -33,27 +33,9 @@
 
 #endif
 
-#include <errno.h>
-#include "inspircd_config.h"
+#include <cerrno>
 #include "socketengine.h"
 
-/* Accept Define */
-#ifdef CONFIG_USE_IOCP
-/* IOCP wrapper for accept() */
-#define _accept(s, addr, addrlen) __accept_socket(s, addr, addrlen, m_acceptEvent)
-/* IOCP wrapper for getsockname() */
-#define _getsockname(fd, sockptr, socklen) __getsockname(fd, sockptr, socklen, m_acceptEvent)
-/* IOCP wrapper for recvfrom() */
-#define _recvfrom(s, buf, len, flags, from, fromlen) __recvfrom(s, buf, len, flags, from, fromlen, ((IOCPEngine*)ServerInstance->SE)->udp_ov)
-#else
-/* No wrapper for recvfrom() */
-#define _recvfrom recvfrom
-/* No wrapper for accept() */
-#define _accept accept
-/* No wrapper for getsockname() */
-#define _getsockname getsockname
-#endif
-
 /* Contains irc-specific definitions */
 namespace irc
 {
@@ -87,7 +69,7 @@ namespace irc
 
 #endif
 		/** Match raw binary data using CIDR rules.
-		 * 
+		 *
 		 * This function will use binary comparison to compare the
 		 * two bit sequences, address and mask, up to mask_bits
 		 * bits in size. If they match, it will return true.
@@ -99,7 +81,7 @@ namespace irc
 		 * @returns True if the first mask_bits of address matches the first
 		 * mask_bits of mask.
 		 */
-		CoreExport bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits);
+		CoreExport bool MatchCIDRBits(const unsigned char* address, const unsigned char* mask, unsigned int mask_bits);
 
 		/** Match CIDR, without matching username/nickname parts.
 		 *
@@ -110,7 +92,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
 		 */
-		CoreExport bool MatchCIDR(const char* address, const char* cidr_mask);
+		CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask);
 
 		/** Match CIDR, including an optional username/nickname part.
 		 *
@@ -123,10 +105,10 @@ namespace irc
 		 * @param cidr_mask The human readable mask, e.g. *\@1.2.0.0/16
 		 * @return True if the mask matches the address
 		 */
-		CoreExport bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username);
+		CoreExport bool MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username);
 
 		/** Convert an insp_inaddr into human readable form.
-		 * 
+		 *
 		 * @param n An insp_inaddr (IP address) structure
 		 * @return A human-readable address. IPV6 addresses
 		 * will be shortened to remove fields which are 0.
@@ -134,7 +116,7 @@ namespace irc
 		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.
@@ -148,16 +130,6 @@ namespace irc
 		 */
 		CoreExport int insp_aton(const char* a, insp_inaddr* n);
 
-		/** Make a socket file descriptor a blocking socket
-		 * @param s A valid file descriptor
-		 */
-		CoreExport void Blocking(int s);
-
-		/** Make a socket file descriptor into a nonblocking socket
-		 * @param s A valid file descriptor
-		 */
-		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
@@ -167,8 +139,10 @@ namespace irc
 	}
 }
 
+
+
 /** This class handles incoming connections on client ports.
- * It will create a new userrec for every valid connection
+ * It will create a new User for every valid connection
  * and assign it a file descriptor.
  */
 class CoreExport ListenSocket : public EventHandler
@@ -185,6 +159,15 @@ class CoreExport ListenSocket : public EventHandler
 	std::string bind_addr;
 	/** Port socket is bound to */
 	int bind_port;
+
+	static sockaddr *sock_us;
+
+	static sockaddr *client;
+
+	static sockaddr *raddr;
+
+	static unsigned int socketcount;
+
  public:
 	/** Create a new listening socket
 	 */
@@ -219,7 +202,22 @@ class CoreExport ListenSocket : public EventHandler
 	{
 		return bind_addr;
 	}
+
+	/** Handles sockets internals crap of a connection, convenience wrapper really
+	 */
+	void AcceptInternal();
+
+	/** Called when a new connection has successfully been accepted on this listener.
+	 * @param ipconnectedto The IP address the connection arrived on
+	 * @param fd The file descriptor of the new connection
+	 */
+	virtual void OnAcceptReady(const std::string &ipconnectedto, int fd);
 };
 
+//class CoreExport ListenSocketClient : public ListenSocket
+//{
+//
+//}
+
 #endif