X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=4d0c170776d9c7b4d1bfe47fd7878c669b71214c;hb=7892c8a0313c50d8138942ff3b112691caf05a2f;hp=3b5baae59f844db6906d382fe821e769575c9f08;hpb=4c6b7c70ce61cb431df07780eba935eca529a65b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index 3b5baae59..4d0c17077 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -2,73 +2,28 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #include "inspircd_config.h"
 #include "base.h"
 #include <time.h>
-#include <map>
-#include <deque>
-#include <string>
 #include "inspircd.h"
-#include "modules.h"
-#include "helperfuncs.h"
 
 const int bitfields[]           =       {1,2,4,8,16,32,64,128};
 const int inverted_bitfields[]  =       {~1,~2,~4,~8,~16,~32,~64,~128};
+std::map<std::string, ExtensionItem*> Extensible::extension_types;
 
-extern time_t TIME;
-
-bool Extensible::Extend(std::string key, char* p)
-{
-	// only add an item if it doesnt already exist
-	if (this->Extension_Items.find(key) == this->Extension_Items.end())
-	{
-		this->Extension_Items[key] = p;
-		log(DEBUG,"Extending object with item %s",key.c_str());
-		return true;
-	}
-	// item already exists, return false
-	return false;
-}
-
-bool Extensible::Shrink(std::string key)
+classbase::classbase()
 {
-	// only attempt to remove a map item that exists
-	if (this->Extension_Items.find(key) != this->Extension_Items.end())
-	{
-		this->Extension_Items.erase(this->Extension_Items.find(key));
-		log(DEBUG,"Shrinking object with item %s",key.c_str());
-		return true;
-	}
-	return false;
-}
-
-char* Extensible::GetExt(std::string key)
-{
-	if (this->Extension_Items.find(key) != this->Extension_Items.end())
-	{
-		return (this->Extension_Items.find(key))->second;
-	}
-	return NULL;
-}
-
-void Extensible::GetExtList(std::deque<std::string> &list)
-{
-	for (std::map<std::string,char*>::iterator u = Extension_Items.begin(); u != Extension_Items.end(); u++)
-	{
-		list.push_back(u->first);
-	}
 }
 
 void BoolSet::Set(int number)
@@ -120,6 +75,143 @@ BoolSet::BoolSet(char bitmask)
 
 bool BoolSet::operator=(BoolSet other)
 {
-        this->bits = other.bits;
-        return true;
+	this->bits = other.bits;
+	return true;
+}
+
+ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : key(Key), owner(mod)
+{
+}
+
+void* ExtensionItem::get_raw(const Extensible* container)
+{
+	ExtensibleStore::const_iterator i = container->extensions.find(key);
+	if (i == container->extensions.end())
+		return NULL;
+	return i->second;
+}
+
+void* ExtensionItem::set_raw(Extensible* container, void* value)
+{
+	std::pair<ExtensibleStore::iterator,bool> rv = 
+		container->extensions.insert(std::make_pair(key, value));
+	if (rv.second)
+	{
+		return NULL;
+	}
+	else
+	{
+		void* old = rv.first->second;
+		rv.first->second = value;
+		return old;
+	}
+}
+
+void* ExtensionItem::unset_raw(Extensible* container)
+{
+	ExtensibleStore::iterator i = container->extensions.find(key);
+	if (i == container->extensions.end())
+		return NULL;
+	void* rv = i->second;
+	container->extensions.erase(i);
+	return rv;
+}
+
+bool Extensible::Register(ExtensionItem* item)
+{
+	return Extensible::extension_types.insert(std::make_pair(item->key, item)).second;
+}
+
+void Extensible::UnRegister(Module* module)
+{
+	ExtensibleTypes::iterator i = extension_types.begin();
+	while (i != extension_types.end())
+	{
+		ExtensibleTypes::iterator c = i++;
+		if (c->second->owner == module)
+			extension_types.erase(c);
+	}
+}
+
+Extensible::~Extensible()
+{
+	for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
+	{
+		ExtensionItem* type = extension_types[i->first];
+		if (type)
+			type->free(i->second);	
+	}
+}
+
+LocalExtItem::LocalExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod)
+{
+}
+
+std::string LocalExtItem::serialize(Module* requestor, const Extensible* container, void* item)
+{
+	return "";
+}
+
+void LocalExtItem::unserialize(Module* requestor, Extensible* container, const std::string& value)
+{
+}
+
+LocalIntExt::LocalIntExt(const std::string& Key, Module* mod) : LocalExtItem(Key, mod)
+{
+}
+
+intptr_t LocalIntExt::get(const Extensible* container)
+{
+	return reinterpret_cast<intptr_t>(get_raw(container));
+}
+
+intptr_t LocalIntExt::set(Extensible* container, intptr_t value)
+{
+	if (value)
+		return reinterpret_cast<intptr_t>(set_raw(container, reinterpret_cast<void*>(value)));
+	else
+		return reinterpret_cast<intptr_t>(unset_raw(container));
+}
+
+void LocalIntExt::free(void*)
+{
+}
+
+StringExtItem::StringExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod)
+{
+}
+
+std::string* StringExtItem::get(const Extensible* container)
+{
+	return static_cast<std::string*>(get_raw(container));
+}
+
+std::string StringExtItem::serialize(Module* requestor, const Extensible* container, void* item)
+{
+	return item ? *static_cast<std::string*>(item) : "";
+}
+
+void StringExtItem::unserialize(Module* requestor, Extensible* container, const std::string& value)
+{
+	if (value.empty())
+		unset(container);
+	else
+		set(container, value);
+}
+
+void StringExtItem::set(Extensible* container, const std::string& value)
+{
+	void* old = set_raw(container, new std::string(value));
+	delete static_cast<std::string*>(old);
+}
+
+void StringExtItem::unset(Extensible* container)
+{
+	void* old = unset_raw(container);
+	delete static_cast<std::string*>(old);
+}
+
+void StringExtItem::free(void* item)
+{
+	delete static_cast<std::string*>(item);
 }