Tidy up some of the internals a bit, making things a bit more extensible and future...

[user/henk/code/inspircd.git] / include / socket.h

diff --git a/include/socket.h b/include/socket.h
index 53bad88f045f3d5dea3eed6a2d5db035f509d02d..556ee1a9045a4495b868b88d22ac9426dd44cdcd 100644 (file)
--- a/include/socket.h
+++ b/include/socket.h
@@ -33,7 +33,7 @@
 
 #endif
 
-#include <errno.h>
+#include <cerrno>
 #include "socketengine.h"
 
 /* Contains irc-specific definitions */
@@ -69,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.
@@ -81,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.
                 *
@@ -92,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.
                 *
@@ -105,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.
@@ -116,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.
@@ -139,6 +139,8 @@ namespace irc
        }
 }
 
+
+
 /** This class handles incoming connections on client ports.
  * It will create a new User for every valid connection
  * and assign it a file descriptor.
@@ -157,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
         */
@@ -191,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