X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=a42696379a5eaf45c145a0528fcf059d07f58f72;hb=d1ddbd62f91d4b9453447b5d25f5e41e807b0010;hp=2941606a397281885d0cb46df394d2694ccce4d5;hpb=de25d946733f774e3a5b53a58438a9c92af0acbe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index 2941606a3..a42696379 100644 --- a/include/socket.h +++ b/include/socket.h @@ -124,8 +124,6 @@ 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. @@ -133,13 +131,8 @@ namespace irc class CoreExport ListenSocketBase : public EventHandler { protected: - /** Socket description (shown in stats p) */ - std::string desc; - /** Raw address socket is bound to */ std::string bind_addr; - /** Port socket is bound to */ - int bind_port; /** Human-readable address/port socket is bound to */ std::string bind_desc; @@ -155,27 +148,21 @@ class CoreExport ListenSocketBase : public EventHandler static irc::sockets::sockaddrs server; public: + /** Socket type (client/server) */ + const std::string type; + /** Socket hook (plain/gnutls/openssl/zip) */ + const std::string hook; + /** Port socket is bound to */ + const int bind_port; /** Create a new listening socket */ - ListenSocketBase(int port, const std::string &addr); + ListenSocketBase(int port, const std::string &addr, const std::string &type, const std::string &hook); /** Handle an I/O event */ void HandleEvent(EventType et, int errornum = 0); /** Close the socket */ ~ListenSocketBase(); - /** 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() const { return bind_port; } /** Get IP address socket is bound to */ @@ -197,7 +184,8 @@ class CoreExport ClientListenSocket : public ListenSocketBase { virtual void OnAcceptReady(int fd); public: - ClientListenSocket(int port, const std::string &addr) : ListenSocketBase(port, addr) { } + ClientListenSocket(int port, const std::string &addr, const std::string &Type, const std::string &Hook) + : ListenSocketBase(port, addr, Type, Hook) { } }; #endif