X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=ebd5214dbfee6d3738dfb6b31d15e68a3999f0fe;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=63b14256e0437acdf013e160791adb1dfbfd039a;hpb=820f229a9efe2678d1e85578aa086a1efdd73a30;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/base.cpp b/src/base.cpp index 63b14256e..ebd5214db 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -144,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; @@ -151,10 +157,10 @@ bool ExtensionManager::Register(ExtensionItem* item) void ExtensionManager::BeginUnregister(Module* module, std::vector >& list) { - std::map >::iterator i = types.begin(); + ExtMap::iterator i = types.begin(); while (i != types.end()) { - std::map >::iterator me = i++; + ExtMap::iterator me = i++; ExtensionItem* item = me->second; if (item->creator == module) { @@ -166,7 +172,7 @@ void ExtensionManager::BeginUnregister(Module* module, std::vector >::iterator i = types.find(name); + ExtMap::iterator i = types.find(name); if (i == types.end()) return NULL; return i->second; @@ -180,7 +186,7 @@ void Extensible::doUnhookExtensions(const std::vector > ExtensibleStore::iterator e = extensions.find(item); if (e != extensions.end()) { - item->free(e->second); + item->free(this, e->second); extensions.erase(e); } } @@ -202,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(); } @@ -213,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; +} + +std::string ExtensionItem::ToInternal(const Extensible* container, void* item) const { + return ToNetwork(container, item); } -LocalExtItem::~LocalExtItem() +std::string ExtensionItem::ToNetwork(const Extensible* container, void* item) const { + return std::string(); } -std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const +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) @@ -240,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_USER) - return *static_cast(item); - return ""; + return item ? *static_cast(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) { } @@ -256,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_USER) - return ""; return ConvToStr(reinterpret_cast(item)); } +void LocalIntExt::FromInternal(Extensible* container, const std::string& value) +{ + set(container, ConvToNum(value)); +} + intptr_t LocalIntExt::get(const Extensible* container) const { return reinterpret_cast(get_raw(container)); @@ -276,7 +335,7 @@ intptr_t LocalIntExt::set(Extensible* container, intptr_t value) return reinterpret_cast(unset_raw(container)); } -void LocalIntExt::free(void*) +void LocalIntExt::free(Extensible* container, void* item) { } @@ -294,12 +353,12 @@ std::string* StringExtItem::get(const Extensible* container) const return static_cast(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(item) : ""; + return item ? *static_cast(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); @@ -310,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(old); + free(container, old); } void StringExtItem::unset(Extensible* container) { void* old = unset_raw(container); - delete static_cast(old); + free(container, old); } -void StringExtItem::free(void* item) +void StringExtItem::free(Extensible* container, void* item) { delete static_cast(item); }