Remove calls to strdup() in core, it is not better than std::string

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

diff --git a/include/socket.h b/include/socket.h
index 4a91404e52419a6291de5609e95e94006830c0f3..5935500180637128f0ad06c17aa771e3badfd693 100644 (file)
--- a/include/socket.h
+++ b/include/socket.h
@@ -52,28 +52,6 @@ namespace irc
                        struct sockaddr_in6 in6;
                } sockaddrs;
 
-       /* macros to the relevant system address description structs */
-#ifdef IPV6
-               /** insp_sockaddr for ipv6
-                */
-               typedef struct sockaddr_in6 insp_sockaddr;
-               /** insp_inaddr for ipv6
-                */
-               typedef struct in6_addr     insp_inaddr;
-#define AF_FAMILY AF_INET6
-#define PF_PROTOCOL PF_INET6
-
-#else
-               /** insp_sockaddr for ipv4
-                */
-               typedef struct sockaddr_in  insp_sockaddr;
-               /** insp_inaddr for ipv4
-                */
-               typedef struct in_addr      insp_inaddr;
-#define AF_FAMILY AF_INET
-#define PF_PROTOCOL PF_INET
-
-#endif
                /** Match raw binary data using CIDR rules.
                 *
                 * This function will use binary comparison to compare the
@@ -113,29 +91,6 @@ namespace irc
                 */
                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.
-                */
-               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.
-                * @return This method will return a negative value if address
-                * does not contain a valid address family. 0 if the address is
-                * does not contain a valid string representing a valid network
-                * address. A positive value is returned if the network address
-                * was successfully converted.
-
-                * or any other number upon failure.
-                */
-               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
@@ -152,14 +107,14 @@ namespace irc
                 * @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);
+               CoreExport bool 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);
+               CoreExport bool satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port);
        }
 }
 
@@ -193,6 +148,7 @@ class CoreExport ListenSocketBase : public EventHandler
         * The address family will always match that of "client"
         */
        static irc::sockets::sockaddrs server;
+
  public:
        /** Create a new listening socket
         */
@@ -228,16 +184,14 @@ class CoreExport ListenSocketBase : public EventHandler
        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
-        * @param incomingip The IP from which the connection was made
         */
-       virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip) = 0;
+       virtual void OnAcceptReady(int fd) = 0;
 };
 
 class CoreExport ClientListenSocket : public ListenSocketBase
 {
-       virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip);
+       virtual void OnAcceptReady(int fd);
  public:
        ClientListenSocket(InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { }
 };