X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=861acc1f10c8fb8e5b9d04c508f65dea5e4af369;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=cf2b9bf5bcab1a680d5af5b1a7704b1db2245965;hpb=81c26039d5b27f039cbaae53f56fe6eca4123467;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index cf2b9bf5b..861acc1f1 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -14,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>
@@ -24,10 +26,18 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <netdb.h>
+
+#else
+
+#include "inspircd_win32wrapper.h"
+
+#endif
+
 #include <errno.h>
 #include "inspircd_config.h"
 #include "socketengine.h"
 
+/* Contains irc-specific definitions */
 namespace irc
 {
 	/** This namespace contains various protocol-independent helper classes.
@@ -72,7 +82,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.
 		 *
@@ -83,7 +93,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.
 		 *
@@ -96,7 +106,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.
 		 * 
@@ -104,7 +114,7 @@ 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.
 		 * 
@@ -119,47 +129,70 @@ namespace irc
 
 		 * or any other number upon failure.
 		 */
-		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);
-
-		/** Make a socket file descriptor into a nonblocking socket
-		 * @param s A valid file descriptor
-		 */
-		void NonBlocking(int s);
+		CoreExport int insp_aton(const char* a, insp_inaddr* n);
 
 		/** 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 ListenSocket : public EventHandler
+class CoreExport ListenSocket : public EventHandler
 {
  protected:
 	/** The creator/owner of this object
 	 */
 	InspIRCd* ServerInstance;
+	/** Socket description (shown in stats p) */
+	std::string desc;
+	/** Socket address family */
+	int family;
+	/** Address socket is bound to */
+	std::string bind_addr;
+	/** Port socket is bound to */
+	int bind_port;
  public:
 	/** Create a new listening socket
 	 */
-	ListenSocket(InspIRCd* Instance, int sockfd, irc::sockets::insp_sockaddr client, irc::sockets::insp_sockaddr server, int port, char* addr);
+	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;
+	}
+	/** Get description for socket
+	 */
+	const std::string& GetDescription()
+	{
+		return desc;
+	}
+	/** Get port number for socket
+	 */
+	int GetPort()
+	{
+		return bind_port;
+	}
+	/** Get IP address socket is bound to
+	 */
+	std::string &GetIP()
+	{
+		return bind_addr;
+	}
 };
 
 #endif
+