Add contents of LDFLAGS in addition to CXXFLAGS

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

diff --git a/include/socket.h b/include/socket.h
index 1f699dbd7ad6f06502470683ffa90edeade4919b..4a91404e52419a6291de5609e95e94006830c0f3 100644 (file)
--- a/include/socket.h
+++ b/include/socket.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -46,6 +46,12 @@ namespace irc
        namespace sockets
        {
 
+               typedef union {
+                       struct sockaddr sa;
+                       struct sockaddr_in in4;
+                       struct sockaddr_in6 in6;
+               } sockaddrs;
+
        /* macros to the relevant system address description structs */
 #ifdef IPV6
                /** insp_sockaddr for ipv6
@@ -135,7 +141,25 @@ namespace irc
                 * or a negative value upon failure (negative values are invalid file
                 * descriptors)
                 */
-               CoreExport int OpenTCPSocket(char* addr, int socktype = SOCK_STREAM);
+               CoreExport int OpenTCPSocket(const char* addr, int socktype = SOCK_STREAM);
+
+               /** Return the size of the structure for syscall passing */
+               CoreExport int sa_size(irc::sockets::sockaddrs& sa);
+
+               /** Convert an address-port pair into a binary sockaddr
+                * @param addr The IP address, IPv4 or IPv6
+                * @param port The port, 0 for unspecified
+                * @param sa The structure to place the result in. Will be zeroed prior to conversion
+                * @return true if the conversion was successful, false if not.
+                */
+               CoreExport int aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa);
+               /** Convert a binary sockaddr to an address-port pair
+                * @param sa The structure to convert
+                * @param addr the IP address
+                * @param port the port
+                * @return true if the conversion was successful, false if unknown address family
+                */
+               CoreExport int satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port);
        }
 }
 
@@ -145,7 +169,7 @@ namespace irc
  * It will create a new User for every valid connection
  * and assign it a file descriptor.
  */
-class CoreExport ListenSocket : public EventHandler
+class CoreExport ListenSocketBase : public EventHandler
 {
  protected:
        /** The creator/owner of this object
@@ -153,31 +177,32 @@ class CoreExport ListenSocket : public EventHandler
        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;
 
-       static sockaddr *sock_us;
-
-       static sockaddr *client;
-
-       static sockaddr *raddr;
-
-       static unsigned int socketcount;
-
+       /** The client address if the most recently connected client.
+        * Should only be used when accepting a new client.
+        */
+       static irc::sockets::sockaddrs client;
+       /** The server address used by the most recently connected client.
+        * This may differ from the bind address by having a nonzero address,
+        * if the port is wildcard bound, or being IPv4 on a 6to4 IPv6 port.
+        * The address family will always match that of "client"
+        */
+       static irc::sockets::sockaddrs server;
  public:
        /** Create a new listening socket
         */
-       ListenSocket(InspIRCd* Instance, int port, char* addr);
+       ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr);
        /** Handle an I/O event
         */
        void HandleEvent(EventType et, int errornum = 0);
        /** Close the socket
         */
-       ~ListenSocket();
+       ~ListenSocketBase();
        /** Set descriptive text
         */
        void SetDescription(const std::string &description)
@@ -192,16 +217,11 @@ class CoreExport ListenSocket : public EventHandler
        }
        /** Get port number for socket
         */
-       int GetPort()
-       {
-               return bind_port;
-       }
+       int GetPort() { return bind_port; }
+
        /** Get IP address socket is bound to
         */
-       std::string &GetIP()
-       {
-               return bind_addr;
-       }
+       const std::string &GetIP() { return bind_addr; }
 
        /** Handles sockets internals crap of a connection, convenience wrapper really
         */
@@ -212,13 +232,15 @@ class CoreExport ListenSocket : public EventHandler
         * @param fd The file descriptor of the new connection
         * @param incomingip The IP from which the connection was made
         */
-       virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip);
+       virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip) = 0;
 };
 
-//class CoreExport ListenSocketClient : public ListenSocket
-//{
-//
-//}
+class CoreExport ClientListenSocket : public ListenSocketBase
+{
+       virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip);
+ public:
+       ClientListenSocket(InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { }
+};
 
 #endif