X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=ebd5214dbfee6d3738dfb6b31d15e68a3999f0fe;hb=6a0155101e09ecf48858d73dab17400777cbe668;hp=b007a109863b34587d26b0c389b4871f70b92562;hpb=cdb764f2de7ee27c97708dfe44f1e6b905c571db;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index b007a1098..ebd5214db 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -95,6 +95,10 @@ ServiceProvider::~ServiceProvider()
 {
 }
 
+void ServiceProvider::RegisterService()
+{
+}
+
 ExtensionItem::ExtensionItem(const std::string& Key, ExtensibleType exttype, Module* mod)
 	: ServiceProvider(mod, Key, SERVICE_METADATA)
 	, type(exttype)
@@ -140,6 +144,12 @@ void* ExtensionItem::unset_raw(Extensible* container)
 	return rv;
 }
 
+void ExtensionItem::RegisterService()
+{
+	if (!ServerInstance->Extensions.Register(this))
+		throw ModuleException("Extension already exists: " + name);
+}
+
 bool ExtensionManager::Register(ExtensionItem* item)
 {
 	return types.insert(std::make_pair(item->name, item)).second;
@@ -176,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);
 		}
 	}
@@ -198,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();
 }
@@ -209,22 +219,69 @@ Extensible::~Extensible()
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Extensible destructor called without cull @%p", (void*)this);
 }
 
-LocalExtItem::LocalExtItem(const std::string& Key, ExtensibleType exttype, Module* mod)
-	: ExtensionItem(Key, exttype, mod)
+void ExtensionItem::FromInternal(Extensible* container, const std::string& value)
+{
+	FromNetwork(container, value);
+}
+
+void ExtensionItem::FromNetwork(Extensible* container, const std::string& value)
+{
+}
+
+std::string ExtensionItem::ToHuman(const Extensible* container, void* item) const
 {
+	// Try to use the network form by default.
+	std::string ret = ToNetwork(container, item);
+
+	// If there's no network form then fall back to the internal form.
+	if (ret.empty())
+		ret = ToInternal(container, item);
+
+	return ret;
 }
 
-LocalExtItem::~LocalExtItem()
+std::string ExtensionItem::ToInternal(const Extensible* container, void* item) const
 {
+	return ToNetwork(container, item);
 }
 
-std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const
+std::string ExtensionItem::ToNetwork(const Extensible* container, void* item) const
 {
+	return std::string();
+}
+
+std::string ExtensionItem::serialize(SerializeFormat format, const Extensible* container, void* item) const
+{
+	// Wrap the deprecated API with the new API.
+	switch (format)
+	{
+		case FORMAT_USER:
+			return ToHuman(container, item);
+		case FORMAT_INTERNAL:
+		case FORMAT_PERSIST:
+			return ToInternal(container, item);
+		case FORMAT_NETWORK:
+			return ToNetwork(container, item);
+	}
 	return "";
 }
 
-void LocalExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+
+void ExtensionItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 {
+	// Wrap the deprecated API with the new API.
+	switch (format)
+	{
+		case FORMAT_USER:
+			break;
+		case FORMAT_INTERNAL:
+		case FORMAT_PERSIST:
+			FromInternal(container, value);
+			break;
+		case FORMAT_NETWORK:
+			FromNetwork(container, value);
+			break;
+	}
 }
 
 LocalStringExt::LocalStringExt(const std::string& Key, ExtensibleType exttype, Module* Owner)
@@ -236,15 +293,18 @@ LocalStringExt::~LocalStringExt()
 {
 }
 
-std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
+std::string LocalStringExt::ToInternal(const Extensible* container, void* item) const
 {
-	if ((item) && (format != FORMAT_NETWORK))
-		return *static_cast<std::string*>(item);
-	return "";
+	return item ? *static_cast<std::string*>(item) : std::string();	
+}
+
+void LocalStringExt::FromInternal(Extensible* container, const std::string& value)
+{
+	set(container, value);
 }
 
 LocalIntExt::LocalIntExt(const std::string& Key, ExtensibleType exttype, Module* mod)
-	: LocalExtItem(Key, exttype, mod)
+	: ExtensionItem(Key, exttype, mod)
 {
 }
 
@@ -252,13 +312,16 @@ LocalIntExt::~LocalIntExt()
 {
 }
 
-std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
+std::string LocalIntExt::ToInternal(const Extensible* container, void* item) const
 {
-	if (format == FORMAT_NETWORK)
-		return "";
 	return ConvToStr(reinterpret_cast<intptr_t>(item));
 }
 
+void LocalIntExt::FromInternal(Extensible* container, const std::string& value)
+{
+	set(container, ConvToNum<intptr_t>(value));
+}
+
 intptr_t LocalIntExt::get(const Extensible* container) const
 {
 	return reinterpret_cast<intptr_t>(get_raw(container));
@@ -272,7 +335,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)
 {
 }
 
@@ -290,12 +353,12 @@ std::string* StringExtItem::get(const Extensible* container) const
 	return static_cast<std::string*>(get_raw(container));
 }
 
-std::string StringExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const
+std::string StringExtItem::ToNetwork(const Extensible* container, void* item) const
 {
-	return item ? *static_cast<std::string*>(item) : "";
+	return item ? *static_cast<std::string*>(item) : std::string();
 }
 
-void StringExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+void StringExtItem::FromNetwork(Extensible* container, const std::string& value)
 {
 	if (value.empty())
 		unset(container);
@@ -306,16 +369,16 @@ void StringExtItem::unserialize(SerializeFormat format, Extensible* container, c
 void StringExtItem::set(Extensible* container, const std::string& value)
 {
 	void* old = set_raw(container, new std::string(value));
-	delete static_cast<std::string*>(old);
+	free(container, old);
 }
 
 void StringExtItem::unset(Extensible* container)
 {
 	void* old = unset_raw(container);
-	delete static_cast<std::string*>(old);
+	free(container, old);
 }
 
-void StringExtItem::free(void* item)
+void StringExtItem::free(Extensible* container, void* item)
 {
 	delete static_cast<std::string*>(item);
 }