X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ftypedefs.h;h=8733829999819a39379ec6b5dd04bec75ce3ca15;hb=e191f0ed6cdca421407ebc67c28fafabc6cc63f7;hp=a40e6cfc246e81b10a69274c6282f01ea6659b3f;hpb=01ce98f2746be837a64f5f9ed2c36eeaabae7462;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/typedefs.h b/include/typedefs.h
index a40e6cfc2..873382999 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -1,39 +1,119 @@
-/*       +------------------------------------+
- *       | 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, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.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 __TYPEDEF_H__
-#define __TYPEDEF_H__
 
-#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
-	typedef nspace::hash_map<std::string, User*, nspace::hash_compare<std::string, std::less<std::string> > > user_hash;
-	typedef nspace::hash_map<std::string, Channel*, nspace::hash_compare<std::string, std::less<std::string> > > chan_hash;
-#else
-	#ifdef HASHMAP_DEPRECATED
-		typedef nspace::hash_map<std::string, User*, nspace::insensitive, irc::StrHashComp> user_hash;
-		typedef nspace::hash_map<std::string, Channel*, nspace::insensitive, irc::StrHashComp> chan_hash;
-	#else
-		typedef nspace::hash_map<std::string, User*, nspace::hash<std::string>, irc::StrHashComp> user_hash;
-		typedef nspace::hash_map<std::string, Channel*, nspace::hash<std::string>, irc::StrHashComp> chan_hash;
-	#endif
-#endif
+#pragma once
+
+class BanCacheManager;
+class BufferedSocket;
+class Channel;
+class Command;
+class ConfigStatus;
+class ConfigTag;
+class Extensible;
+class FakeUser;
+class InspIRCd;
+class Invitation;
+class IOHookProvider;
+class LocalUser;
+class Membership;
+class Module;
+class OperInfo;
+class ProtocolServer;
+class RemoteUser;
+class Server;
+class ServerConfig;
+class ServerLimits;
+class Thread;
+class User;
+class XLine;
+class XLineManager;
+class XLineFactory;
+struct ConnectClass;
+struct ModResult;
+
+#include "hashcomp.h"
+#include "base.h"
+
+typedef TR1NS::unordered_map<std::string, User*, irc::insensitive, irc::StrHashComp> user_hash;
+typedef TR1NS::unordered_map<std::string, Channel*, irc::insensitive, irc::StrHashComp> chan_hash;
+
+/** A list of failed port bindings, used for informational purposes on startup */
+typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
+
+/** List of channels to consider when building the neighbor list of a user
+ */
+typedef std::vector<Membership*> IncludeChanList;
 
-/** Server name cache
+/** A cached text file stored with its contents as lines
  */
-typedef std::vector<std::string*> servernamelist;
+typedef std::vector<std::string> file_cache;
 
-/** A cached text file stored line by line.
+/** A mapping of configuration keys to their assigned values.
  */
-typedef std::deque<std::string> file_cache;
+typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> ConfigItems;
 
-#endif
+/** The entire configuration
+ */
+typedef std::multimap<std::string, reference<ConfigTag>, irc::insensitive_swo> ConfigDataHash;
+
+/** Iterator of ConfigDataHash */
+typedef ConfigDataHash::const_iterator ConfigIter;
+/** Iterator pair, used for tag-name ranges */
+typedef std::pair<ConfigIter,ConfigIter> ConfigTagList;
+
+/** Files read by the configuration */
+typedef std::map<std::string, file_cache> ConfigFileCache;
+
+/** Generic user list, used for exceptions */
+typedef std::set<User*> CUList;
+
+/** A set of strings.
+ */
+typedef std::vector<std::string> string_list;
+
+/** Contains an ident and host split into two strings
+ */
+typedef std::pair<std::string, std::string> IdentHostPair;
+
+/** A map of xline factories
+ */
+typedef std::map<std::string, XLineFactory*> XLineFactMap;
+
+/** A map of XLines indexed by string
+ */
+typedef std::map<std::string, XLine*, irc::insensitive_swo> XLineLookup;
+
+/** A map of XLineLookup maps indexed by string
+ */
+typedef std::map<std::string, XLineLookup > XLineContainer;
+
+/** An iterator in an XLineContainer
+ */
+typedef XLineContainer::iterator ContainerIter;
+
+/** An interator in an XLineLookup
+ */
+typedef XLineLookup::iterator LookupIter;
 
+namespace Stats
+{
+	class Context;
+}