X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=91a10d1f9e3c7a71f042a21729a00ed03dfd7f82;hb=e9808ffb01876ab0ebad383de7861899a17f1a63;hp=7571d14813fa616582052da36d32a4d555833663;hpb=2dffa0a4632d5165c623e4d1e32d1b12f3558694;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index 7571d1481..91a10d1f9 100644 --- a/include/socket.h +++ b/include/socket.h @@ -2,67 +2,154 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#ifndef __INSP_SOCKET_H__ -#define __INSP_SOCKET_H__ +#ifndef INSPIRCD_SOCKET_H +#define INSPIRCD_SOCKET_H + +#ifndef WIN32 +#include +#include +#include #include #include +#include #include -#include -#include -#include +#include +#include +#include + +#else + +#include "inspircd_win32wrapper.h" + +#endif + +#include + +/* Contains irc-specific definitions */ +namespace irc +{ + /** This namespace contains various protocol-independent helper classes. + * It also contains some types which are often used by the core and modules + * in place of inet_* functions and types. + */ + namespace sockets + { + union CoreExport sockaddrs { + struct sockaddr sa; + struct sockaddr_in in4; + struct sockaddr_in6 in6; + /** Return the size of the structure for syscall passing */ + int sa_size() const; + /** Return port number or -1 if invalid */ + int port() const; + /** Return IP only */ + std::string addr() const; + /** Return human-readable IP/port pair */ + std::string str() const; + }; -enum InspSocketState { I_DISCONNECTED, I_CONNECTING, I_CONNECTED, I_LISTENING, I_ERROR }; -enum InspSocketError { I_ERR_TIMEOUT, I_ERR_SOCKET, I_ERR_CONNECT, I_ERR_BIND }; + struct cidr_mask + { + /** Type, AF_INET or AF_INET6 */ + unsigned char type; + /** Length of the mask in bits (0-128) */ + unsigned char length; + /** Raw bits. Unused bits must be zero */ + unsigned char bits[16]; -class InspSocket + cidr_mask() {} + /** Construct a CIDR mask from the string. Will normalize (127.0.0.1/8 => 127.0.0.0/8). */ + cidr_mask(const std::string& mask); + /** Construct a CIDR mask of a given length from the given address */ + cidr_mask(const irc::sockets::sockaddrs& addr, int len); + /** Equality of bits, type, and length */ + bool operator==(const cidr_mask& other) const; + /** Ordering defined for maps */ + bool operator<(const cidr_mask& other) const; + /** Match within this CIDR? */ + bool match(const irc::sockets::sockaddrs& addr) const; + /** Human-readable string */ + std::string str() const; + }; + + /** Match CIDR, including an optional username/nickname part. + * + * This function will compare a human-readable address (plus + * optional username and nickname) against a human-readable + * CIDR mask, for example joe!bloggs\@1.2.3.4 against + * *!bloggs\@1.2.0.0/16. This method supports both IPV4 and + * IPV6 addresses. + * @param address The human readable address, e.g. fred\@1.2.3.4 + * @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 std::string &address, const std::string &cidr_mask, bool match_with_username); + + /** Return the size of the structure for syscall passing */ + inline int sa_size(const irc::sockets::sockaddrs& sa) { return sa.sa_size(); } + + /** 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 bool aptosa(const std::string& 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 bool satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port); + + /** Convert a binary sockaddr to a user-readable string. + * This means IPv6 addresses are written as [::1]:6667, and *:6668 is used for 0.0.0.0:6668 + * @param sa The structure to convert + * @return The string; "" if not a valid address + */ + inline std::string satouser(const irc::sockets::sockaddrs& sa) { return sa.str(); } + } +} + +#include "socketengine.h" +/** This class handles incoming connections on client ports. + * It will create a new User for every valid connection + * and assign it a file descriptor. + */ +class CoreExport ListenSocket : public EventHandler { -private: - int fd; - std::string host; - int port; - InspSocketState state; - sockaddr_in addr; - in_addr addy; - time_t timeout_end; - bool timeout; - pollfd polls; - char ibuf[1024]; - std::string IP; - sockaddr_in client; - sockaddr_in server; - socklen_t length; -public: - InspSocket(); - InspSocket(int newfd, char* ip); - InspSocket(std::string host, int port, bool listening, unsigned long maxtime); - virtual bool OnConnected(); - virtual void OnError(InspSocketError e); - virtual int OnDisconnect(); - virtual bool OnDataReady(); - virtual void OnTimeout(); - virtual void OnClose(); - virtual char* Read(); - std::string GetIP(); - virtual int Write(std::string data); - virtual int OnIncomingConnection(int newfd, char* ip); - void SetState(InspSocketState s); - InspSocketState GetState(); - bool Poll(); - virtual void Close(); - virtual ~InspSocket(); + public: + const reference bind_tag; + std::string bind_addr; + int bind_port; + /** Human-readable bind description */ + std::string bind_desc; + /** Create a new listening socket + */ + ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to); + /** Handle an I/O event + */ + void HandleEvent(EventType et, int errornum = 0); + /** Close the socket + */ + ~ListenSocket(); + + /** Handles sockets internals crap of a connection, convenience wrapper really + */ + void AcceptInternal(); }; #endif +