m_spanningtree Return const references from several TreeServer getter functions

[user/henk/code/inspircd.git] / src / dynamic.cpp

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index b1c84e874eeaca703c06568530b29cdebd6930d9..27662a3516bccbc704fec1655e83a6692c7e611b 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,17 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Core: libIRCDdynamic */
 
 #include "inspircd.h"
 #include "dynamic.h"
@@ -19,21 +27,19 @@
 #include <dlfcn.h>
 #endif
 
-DLLManager::DLLManager(InspIRCd*, const char *fname)
+DLLManager::DLLManager(const char *fname)
 {
-       err = NULL;
-
        if (!strstr(fname,".so"))
        {
                err = "This doesn't look like a module file to me...";
+               h = NULL;
                return;
        }
 
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-               err = (char*)dlerror();
-               return;
+               err = dlerror();
        }
 }
 
@@ -44,24 +50,34 @@ DLLManager::~DLLManager()
                dlclose(h);
 }
 
+union init_t {
+       void* vptr;
+       Module* (*fptr)();
+};
 
-
-bool DLLManager::GetSymbol(void** v, const char* sym_name)
+Module* DLLManager::CallInit()
 {
-       /*
-        * try extract a symbol from the library
-        * get any error message is there is any
-        */
-       
-       if (h)
+       if (!h)
+               return NULL;
+
+       init_t initfn;
+       initfn.vptr = dlsym(h, MODULE_INIT_STR);
+       if (!initfn.vptr)
        {
-               dlerror(); // clear value
-               *v = dlsym(h, sym_name);
-               err = (char*)dlerror();
-               if (!*v || err)
-                       return false;
+               err = dlerror();
+               return NULL;
        }
-       
-       /* succeeded :) */
-       return true;
+
+       return (*initfn.fptr)();
+}
+
+std::string DLLManager::GetVersion()
+{
+       if (!h)
+               return "";
+
+       const char* srcver = (char*)dlsym(h, "inspircd_src_version");
+       if (srcver)
+               return srcver;
+       return "Unversioned module";
 }