X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fsocket.h;h=3abbeef32a1054135cf741d5253600e0174b6b92;hb=f2dcf19923c4b60b268899c93b8deb3e6f30c6fe;hp=f79d9166e50d1450750c99cdb4510236df6f77dc;hpb=800f02e7599d5f90d1c16f02cb1c28901d354140;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/socket.h b/include/socket.h
index f79d9166e..3abbeef32 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -1,20 +1,30 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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>
@@ -44,7 +54,8 @@ namespace irc
 	 */
 	namespace sockets
 	{
-		union CoreExport sockaddrs {
+		union CoreExport sockaddrs
+		{
 			struct sockaddr sa;
 			struct sockaddr_in in4;
 			struct sockaddr_in6 in6;
@@ -56,9 +67,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;
@@ -91,13 +104,11 @@ namespace irc
 		 * 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 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
@@ -131,14 +142,14 @@ namespace irc
 class CoreExport ListenSocket : public EventHandler
 {
  public:
-	const reference<ConfigTag> bind_tag;
+	reference<ConfigTag> 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 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);
@@ -150,6 +161,3 @@ class CoreExport ListenSocket : public EventHandler
 	 */
 	void AcceptInternal();
 };
-
-#endif
-