X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=17c619fbe28e99a2ae0d6b4b15360cc0f6256d14;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=0ff3fbe4c303256865110bd050492abdeb7c6de2;hpb=35b70631f0532a5828b04a8e0c02092a285f331a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/base.cpp b/src/base.cpp index 0ff3fbe4c..17c619fbe 100644 --- a/src/base.cpp +++ b/src/base.cpp @@ -1,10 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2013, 2018-2019 Sadie Powell + * Copyright (C) 2012, 2014-2015 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2004-2006 Craig Edwards - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2006 Oliver Lupton * * 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 @@ -22,33 +25,34 @@ #include "inspircd.h" #include "base.h" -#include + #ifdef INSPIRCD_ENABLE_RTTI #include #endif classbase::classbase() { +#ifdef INSPIRCD_ENABLE_RTTI if (ServerInstance) - ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::+ @%p", (void*)this); + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::+%s @%p", typeid(*this).name(), (void*)this); +#endif } CullResult classbase::cull() { - if (ServerInstance) #ifdef INSPIRCD_ENABLE_RTTI - ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p", - typeid(*this).name(), (void*)this); -#else - ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::- @%p", (void*)this); + if (ServerInstance) + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p", typeid(*this).name(), (void*)this); #endif return CullResult(); } classbase::~classbase() { +#ifdef INSPIRCD_ENABLE_RTTI if (ServerInstance) - ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~ @%p", (void*)this); + ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~%s @%p", typeid(*this).name(), (void*)this); +#endif } CullResult::CullResult() @@ -186,7 +190,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); } } @@ -208,7 +212,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(); } @@ -219,22 +223,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); } -LocalExtItem::~LocalExtItem() +void ExtensionItem::FromNetwork(Extensible* container, const std::string& value) { } -std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const +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); +} + +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) @@ -246,21 +297,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(item); - return ""; + return item ? *static_cast(item) : std::string(); } -void LocalStringExt::unserialize(SerializeFormat format, Extensible* container, const std::string& value) +void LocalStringExt::FromInternal(Extensible* container, const std::string& value) { - if (format != FORMAT_NETWORK) - set(container, value); + set(container, value); } LocalIntExt::LocalIntExt(const std::string& Key, ExtensibleType exttype, Module* mod) - : LocalExtItem(Key, exttype, mod) + : ExtensionItem(Key, exttype, mod) { } @@ -268,17 +316,14 @@ 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(item)); } -void LocalIntExt::unserialize(SerializeFormat format, Extensible* container, const std::string& value) +void LocalIntExt::FromInternal(Extensible* container, const std::string& value) { - if (format != FORMAT_NETWORK) - set(container, ConvToInt(value)); + set(container, ConvToNum(value)); } intptr_t LocalIntExt::get(const Extensible* container) const @@ -294,7 +339,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) { } @@ -312,12 +357,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); @@ -328,16 +373,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); }