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 a4e9cf43b9d94dd75659202c37ff07ecfb771edd..4a91404e52419a6291de5609e95e94006830c0f3 100644 (file)
--- a/include/socket.h
+++ b/include/socket.h
@@ -143,6 +143,9 @@ namespace irc
                 */
                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
@@ -174,21 +177,22 @@ class CoreExport ListenSocketBase : 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
         */
@@ -213,16 +217,11 @@ class CoreExport ListenSocketBase : 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
         */