X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=1ea1332e277eab80ea2a231fc5d649127e325ec8;hb=635cb9d65f6d7f6758ae8ed874da00c8d94b6e39;hp=16809c3f81988bd75da2dcae0819348d5fc56f4a;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index 16809c3f8..1ea1332e2 100644 --- a/include/socket.h +++ b/include/socket.h @@ -1,12 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2005-2007 Craig Edwards + * Copyright (C) 2013, 2015-2016 Attila Molnar + * Copyright (C) 2012-2013, 2017-2019 Sadie Powell + * Copyright (C) 2012 Robby + * Copyright (C) 2012 ChrisTX + * Copyright (C) 2012 Adam + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007-2008 Robin Burchell * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2007 Robin Burchell - * Copyright (C) 2006 Oliver Lupton - * Copyright (C) 2006 William Pitcock + * Copyright (C) 2006, 2008, 2010 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -22,10 +26,9 @@ */ -#ifndef INSPIRCD_SOCKET_H -#define INSPIRCD_SOCKET_H +#pragma once -#ifndef WIN32 +#ifndef _WIN32 #include #include @@ -33,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -60,8 +64,11 @@ namespace irc struct sockaddr sa; struct sockaddr_in in4; struct sockaddr_in6 in6; + struct sockaddr_un un; + /** Return the family of the socket (e.g. AF_INET). */ + int family() const; /** Return the size of the structure for syscall passing */ - int sa_size() const; + socklen_t sa_size() const; /** Return port number or -1 if invalid */ int port() const; /** Return IP only */ @@ -85,7 +92,7 @@ namespace irc /** 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); + cidr_mask(const irc::sockets::sockaddrs& addr, unsigned char len); /** Equality of bits, type, and length */ bool operator==(const cidr_mask& other) const; /** Ordering defined for maps */ @@ -110,9 +117,6 @@ namespace irc */ 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 @@ -121,24 +125,46 @@ namespace irc */ 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 + /** Convert a UNIX socket path to a binary sockaddr. + * @param path The path to the UNIX socket. + * @param sa The structure to place the result in. Will be zeroed prior to conversion. + * @return True if the conversion was successful; otherwise, false. */ - CoreExport bool satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port); + CoreExport bool untosa(const std::string& path, irc::sockets::sockaddrs& sa); - /** 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 + /** Determines whether the specified file is a UNIX socket. + * @param file The path to the file to check. + * @return True if the file is a UNIX socket; otherwise, false. */ - inline std::string satouser(const irc::sockets::sockaddrs& sa) { return sa.str(); } + CoreExport bool isunix(const std::string& file); } } +/** Represents information about a failed port binding. */ +struct CoreExport FailedPort +{ + /** The error which happened during binding. */ + int error; + + /** The endpoint on which we were attempting to bind. */ + irc::sockets::sockaddrs sa; + + /** The config tag that the listener was created from. */ + ConfigTag* tag; + + FailedPort(int err, irc::sockets::sockaddrs& ep, ConfigTag* cfg) + : error(err) + , sa(ep) + , tag(cfg) + { + } +}; + +/** A list of failed port bindings, used for informational purposes on startup */ +typedef std::vector FailedPortList; + #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. @@ -146,25 +172,38 @@ namespace irc class CoreExport ListenSocket : public EventHandler { public: - const reference bind_tag; - std::string bind_addr; - int bind_port; - /** Human-readable bind description */ - std::string bind_desc; + reference bind_tag; + const irc::sockets::sockaddrs bind_sa; + + class IOHookProvRef : public dynamic_reference_nocheck + { + public: + IOHookProvRef() + : dynamic_reference_nocheck(NULL, std::string()) + { + } + }; + + typedef TR1NS::array IOHookProvList; + + /** IOHook providers for handling connections on this socket, + * may be empty. + */ + IOHookProvList iohookprovs; + /** 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 + /** Handles new connections, called by the socket engine */ - void AcceptInternal(); -}; - -#endif + void OnEventHandlerRead() CXX11_OVERRIDE; + /** Inspects the bind block belonging to this socket to set the name of the IO hook + * provider which this socket will use for incoming connections. + */ + void ResetIOHookProvider(); +};