X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=7fa58f8ad992bfe444fafe3bd9d618a7dabd2a16;hb=34b2dde776b332116d04cea356843b324ab099fb;hp=cad14499e9f68757476c7cf817e439cfde4c0241;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/socket.h b/include/socket.h index cad14499e..7fa58f8ad 100644 --- a/include/socket.h +++ b/include/socket.h @@ -1,16 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2005-2007 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006 William Pitcock * - * 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 . */ + #ifndef INSPIRCD_SOCKET_H #define INSPIRCD_SOCKET_H @@ -44,7 +55,8 @@ namespace irc */ namespace sockets { - union CoreExport sockaddrs { + union CoreExport sockaddrs + { struct sockaddr sa; struct sockaddr_in in4; struct sockaddr_in6 in6; @@ -56,9 +68,11 @@ namespace irc 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 cidr_mask + struct CoreExport cidr_mask { /** Type, AF_INET or AF_INET6 */ unsigned char type; @@ -138,7 +152,7 @@ class CoreExport ListenSocket : public EventHandler std::string bind_desc; /** Create a new listening socket */ - ListenSocket(ConfigTag* tag, const std::string& addr, int port); + ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to); /** Handle an I/O event */ void HandleEvent(EventType et, int errornum = 0);