X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=8749aee8ea983b2df55788c1c4744f35c651184d;hb=f37590259eeb5cb9634773c000ea8f0fa083683a;hp=4111451f8893a2b11b29b1ddbeaad5f356498c00;hpb=f3667d995e439a1d75fd9b56b29b610f3d877d8b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index 4111451f8..8749aee8e 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -157,10 +157,10 @@ bool ExtensionManager::Register(ExtensionItem* item)
 
 void ExtensionManager::BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list)
 {
-	std::map<std::string, reference<ExtensionItem> >::iterator i = types.begin();
+	ExtMap::iterator i = types.begin();
 	while (i != types.end())
 	{
-		std::map<std::string, reference<ExtensionItem> >::iterator me = i++;
+		ExtMap::iterator me = i++;
 		ExtensionItem* item = me->second;
 		if (item->creator == module)
 		{
@@ -172,7 +172,7 @@ void ExtensionManager::BeginUnregister(Module* module, std::vector<reference<Ext
 
 ExtensionItem* ExtensionManager::GetItem(const std::string& name)
 {
-	std::map<std::string, reference<ExtensionItem> >::iterator i = types.find(name);
+	ExtMap::iterator i = types.find(name);
 	if (i == types.end())
 		return NULL;
 	return i->second;
@@ -186,7 +186,7 @@ void Extensible::doUnhookExtensions(const std::vector<reference<ExtensionItem> >
 		ExtensibleStore::iterator e = extensions.find(item);
 		if (e != extensions.end())
 		{
-			item->free(e->second);
+			item->free(this, e->second);
 			extensions.erase(e);
 		}
 	}
@@ -208,7 +208,7 @@ void Extensible::FreeAllExtItems()
 {
 	for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
 	{
-		i->first->free(i->second);
+		i->first->free(this, i->second);
 	}
 	extensions.clear();
 }
@@ -248,11 +248,17 @@ LocalStringExt::~LocalStringExt()
 
 std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
 {
-	if (item && format == FORMAT_USER)
+	if ((item) && (format != FORMAT_NETWORK))
 		return *static_cast<std::string*>(item);
 	return "";
 }
 
+void LocalStringExt::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+{
+	if (format != FORMAT_NETWORK)
+		set(container, value);
+}
+
 LocalIntExt::LocalIntExt(const std::string& Key, ExtensibleType exttype, Module* mod)
 	: LocalExtItem(Key, exttype, mod)
 {
@@ -264,11 +270,17 @@ LocalIntExt::~LocalIntExt()
 
 std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
 {
-	if (format != FORMAT_USER)
+	if (format == FORMAT_NETWORK)
 		return "";
 	return ConvToStr(reinterpret_cast<intptr_t>(item));
 }
 
+void LocalIntExt::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+{
+	if (format != FORMAT_NETWORK)
+		set(container, ConvToNum<intptr_t>(value));
+}
+
 intptr_t LocalIntExt::get(const Extensible* container) const
 {
 	return reinterpret_cast<intptr_t>(get_raw(container));
@@ -282,7 +294,7 @@ intptr_t LocalIntExt::set(Extensible* container, intptr_t value)
 		return reinterpret_cast<intptr_t>(unset_raw(container));
 }
 
-void LocalIntExt::free(void*)
+void LocalIntExt::free(Extensible* container, void* item)
 {
 }
 
@@ -325,7 +337,7 @@ void StringExtItem::unset(Extensible* container)
 	delete static_cast<std::string*>(old);
 }
 
-void StringExtItem::free(void* item)
+void StringExtItem::free(Extensible* container, void* item)
 {
 	delete static_cast<std::string*>(item);
 }