-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2005-2007 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ * Copyright (C) 2006 William Pitcock <nenolod@dereferenced.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INSPIRCD_SOCKET_H
-#define INSPIRCD_SOCKET_H
-#ifndef WIN32
+#pragma once
+
+#ifndef _WIN32
#include <arpa/inet.h>
#include <sys/time.h>
#endif
-#include <errno.h>
-#include "inspircd_config.h"
-#include "socketengine.h"
+#include <cerrno>
/* Contains irc-specific definitions */
namespace irc
*/
namespace sockets
{
-
- /* 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
- * two bit sequences, address and mask, up to mask_bits
- * bits in size. If they match, it will return true.
- * @param address The whole address, of 4 or 16 bytes in length
- * @param mask The mask, from 1 to 16 bytes in length, anything
- * from 1 to 128 bits of which is significant
- * @param mask_Bits How many bits of the mask parameter are significant
- * for this comparison.
- * @returns True if the first mask_bits of address matches the first
- * mask_bits of mask.
- */
- CoreExport bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits);
-
- /** Match CIDR, without matching username/nickname parts.
- *
- * This function will compare a human-readable address against a human-
- * readable CIDR mask, for example 1.2.3.4 against 1.2.0.0/16. This
- * method supports both IPV4 and IPV6 addresses.
- * @param address The human readable address, e.g. 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 char* address, const char* cidr_mask);
+ 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;
+ bool operator==(const sockaddrs& other) const;
+ inline bool operator!=(const sockaddrs& other) const { return !(*this == other); }
+ };
+
+ struct CoreExport 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];
+
+ 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.
*
* 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
+ * @param match_with_username Does the mask include a nickname segment?
* @return True if the mask matches the address
*/
- CoreExport bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username);
+ 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.
+ /** 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 int insp_aton(const char* a, insp_inaddr* n);
+ CoreExport bool aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa);
- /** 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
- * descriptors)
+ /** 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 OpenTCPSocket(char* addr, int socktype = SOCK_STREAM);
+ CoreExport bool satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port);
}
}
+#include "iohook.h"
+#include "socketengine.h"
/** This class handles incoming connections on client ports.
- * It will create a new userrec for every valid connection
+ * It will create a new User for every valid connection
* and assign it a file descriptor.
*/
class CoreExport ListenSocket : public EventHandler
{
- protected:
- /** The creator/owner of this object
- */
- InspIRCd* ServerInstance;
- /** Socket description (shown in stats p) */
- std::string desc;
- /** Socket address family */
- int family;
- /** Address socket is bound to */
+ public:
+ reference<ConfigTag> bind_tag;
std::string bind_addr;
- /** Port socket is bound to */
int bind_port;
- public:
+ /** Human-readable bind description */
+ std::string bind_desc;
+
+ /** The IOHook provider which handles connections on this socket,
+ * NULL if there is none.
+ */
+ dynamic_reference_nocheck<IOHookProvider> iohookprov;
+
/** Create a new listening socket
*/
- ListenSocket(InspIRCd* Instance, int port, char* addr);
+ 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();
- /** 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
+
+ /** Handles sockets internals crap of a connection, convenience wrapper really
*/
- int GetPort()
- {
- return bind_port;
- }
- /** Get IP address socket is bound to
+ void AcceptInternal();
+
+ /** 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.
+ * @return True if the IO hook provider was found or none was given, false otherwise.
*/
- std::string &GetIP()
- {
- return bind_addr;
- }
+ bool ResetIOHookProvider();
};
-
-#endif
-