[ViewVC] Diff of: svn/ircd-hybrid/trunk/src/modules.c

Comparing:
ircd-hybrid/src/modules.c (file contents), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs.
ircd-hybrid-8/src/modules.c (file contents), Revision 1238 by michael, Thu Sep 29 11:37:31 2011 UTC

+ *  $Id$
+ */
-+
+#include "ltdl.h"
-+
+#include "stdinc.h"
+#include "list.h"
+#include "modules.h"
+#include "memory.h"
-<
+dlink_list mod_list = { NULL, NULL, 0 };
->
+static dlink_list modules_list = { NULL, NULL, 0 };
->
->
+static const char *unknown_ver = "<unknown>";
+static const char *core_module_table[] =
+};
-+
+int
-+
+modules_valid_suffix(const char *name)
-+
+{
-+
+  return ((name = strrchr(name, '.'))) && !strcmp(name, ".la");
-+
+}
-+
-+
+/* unload_one_module()
-+
+ *
-+
+ * inputs       - name of module to unload
-+
+ *              - 1 to say modules unloaded, 0 to not
-+
+ * output       - 0 if successful, -1 if error
-+
+ * side effects - module is unloaded
-+
+ */
-+
+int
-+
+unload_one_module(const char *name, int warn)
-+
+{
-+
+  struct module *modp = NULL;
-+
-+
+  if ((modp = findmodule_byname(name)) == NULL)
-+
+    return -1;
-+
-+
+  if (modp->modexit)
-+
+   modp->modexit();
-+
-+
+  assert(dlink_list_length(&modules_list) > 0);
-+
+  dlinkDelete(&modp->node, &modules_list);
-+
+  MyFree(modp->name);
-+
-+
+  lt_dlclose(modp->handle);
-+
-+
+  if (warn == 1)
-+
+  {
-+
+    ilog(L_INFO, "Module %s unloaded", name);
-+
+    sendto_realops_flags(UMODE_ALL, L_ALL, "Module %s unloaded", name);
-+
+  }
-+
-+
+  return 0;
-+
+}
-+
-+
+/* load_a_module()
-+
+ *
-+
+ * inputs       - path name of module, int to notice, int of core
-+
+ * output       - -1 if error 0 if success
-+
+ * side effects - loads a module if successful
-+
+ */
-+
+int
-+
+load_a_module(const char *path, int warn, int core)
-+
+{
-+
+  lt_dlhandle tmpptr = NULL;
-+
+  const char *mod_basename = NULL;
-+
+  struct module *modp = NULL;
-+
-+
+  if (findmodule_byname((mod_basename = libio_basename(path))))
-+
+    return 1;
-+
-+
+  if (!(tmpptr = lt_dlopen(path))) {
-+
+    const char *err = ((err = lt_dlerror())) ? err : "<unknown>";
-+
-+
+    sendto_realops_flags(UMODE_ALL, L_ALL, "Error loading module %s: %s",
-+
+                         mod_basename, err);
-+
+    ilog(L_WARN, "Error loading module %s: %s", mod_basename, err);
-+
+    return -1;
-+
+  }
-+
-+
+  if ((modp = lt_dlsym(tmpptr, "module_entry")) == NULL)
-+
+  {
-+
+    sendto_realops_flags(UMODE_ALL, L_ALL, "Module %s has no module_entry export",
-+
+                         mod_basename);
-+
+    ilog(L_WARN, "Module %s has no module_entry export", mod_basename);
-+
+    lt_dlclose(tmpptr);
-+
+    return -1;
-+
+  }
-+
-+
+  modp->handle = tmpptr;
-+
-+
+  if (EmptyString(modp->version))
-+
+    modp->version = unknown_ver;
-+
-+
+  if (core)
-+
+    modp->flags |= MODULE_FLAG_CORE;
-+
-+
+  DupString(modp->name, mod_basename);
-+
+  dlinkAdd(modp, &modp->node, &modules_list);
-+
-+
+  if (modp->modinit)
-+
+    modp->modinit();
-+
-+
+  if (warn == 1)
-+
+  {
-+
+    sendto_realops_flags(UMODE_ALL, L_ALL,
-+
+                         "Module %s [version: %s handle: %p] loaded.",
-+
+                         modp->name, modp->version, tmpptr);
-+
+    ilog(L_WARN, "Module %s [version: %s handle: %p] loaded.",
-+
+         modp->name, modp->version, tmpptr);
-+
+  }
-+
-+
+  return 0;
-+
+}
-+
+/*
+ * modules_init
+void
+modules_init(void)
-<
+  dynlink_init();
->
+  if (lt_dlinit())
->
+  {
->
+    ilog(L_ERROR, "Couldn't initialize the libltdl run time dynamic"
->
+         " link library. Exiting.");
->
+    exit(0);
->
+  }
+  mod_add_cmd(&modload_msgtab);
+  mod_add_cmd(&modunload_msgtab);
+void
+mod_clear_paths(void)
-<
+  struct module_path *pathst;
-<
+  dlink_node *ptr;
-<
+  dlink_node *next_ptr;
->
+  struct module_path *pathst = NULL;
->
+  dlink_node *ptr = NULL, *next_ptr = NULL;
+  DLINK_FOREACH_SAFE(ptr, next_ptr, mod_paths.head)
+ * output       - NULL if not found or pointer to module
+ * side effects - NONE
+ */
-<
+dlink_node *
->
+struct module *
+findmodule_byname(const char *name)
-<
+  dlink_node *ptr;
-<
+  struct module *modp;
->
+  dlink_node *ptr = NULL;
-<
+  DLINK_FOREACH(ptr, mod_list.head)
->
+  DLINK_FOREACH(ptr, modules_list.head)
-<
+    modp = ptr->data;
->
+    struct module *modp = ptr->data;
+    if (strcmp(modp->name, name) == 0)
-<
+      return ptr;
->
+      return modp;
+  return NULL;
+  const char *m_bn = NULL;
-<
+  if (!IsAdmin(source_p))
->
+  if (!HasOFlag(source_p, OPER_FLAG_MODULE))
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               me.name, source_p->name);
+             int parc, char *parv[])
+  const char *m_bn = NULL;
-<
+  dlink_node *ptr;
-<
+  struct module *modp;
->
+  struct module *modp = NULL;
-<
+  if (!IsAdmin(source_p))
->
+  if (!HasOFlag(source_p, OPER_FLAG_MODULE))
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               me.name, source_p->name);
+  m_bn = libio_basename(parv[1]);
-<
+  if ((ptr = findmodule_byname(m_bn)) == NULL)
->
+  if ((modp = findmodule_byname(m_bn)) == NULL)
+    sendto_one(source_p, ":%s NOTICE %s :Module %s is not loaded",
+               me.name, source_p->name, m_bn);
+    return;
-<
+  modp = ptr->data;
-<
-<
+  if (modp->core == 1)
->
+  if (modp->flags & MODULE_FLAG_CORE)
+    sendto_one(source_p,
+               ":%s NOTICE %s :Module %s is a core module and may not be unloaded",
+    return;
-–
+  /* XXX might want to simply un dlink it here */
-–
+  if (unload_one_module(m_bn, 1) == -1)
+    sendto_one(source_p, ":%s NOTICE %s :Module %s is not loaded",
+             int parc, char *parv[])
+  const char *m_bn = NULL;
-<
+  dlink_node *ptr;
-<
+  struct module *modp;
->
+  struct module *modp = NULL;
+  int check_core;
-<
+  if (!IsAdmin(source_p))
->
+  if (!HasOFlag(source_p, OPER_FLAG_MODULE))
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               me.name, source_p->name);
+  m_bn = libio_basename(parv[1]);
-<
+  if ((ptr = findmodule_byname(m_bn)) == NULL)
->
+  if ((modp = findmodule_byname(m_bn)) == NULL)
+    sendto_one(source_p, ":%s NOTICE %s :Module %s is not loaded",
+               me.name, source_p->name, m_bn);
+    return;
-<
+  modp = ptr->data;
-<
+  check_core = modp->core;
->
+  check_core = (modp->flags & MODULE_FLAG_CORE) != 0;
+  if (unload_one_module(m_bn, 1) == -1)
+  const dlink_node *ptr = NULL;
-<
+  if (!IsAdmin(source_p))
->
+  if (!HasOFlag(source_p, OPER_FLAG_MODULE))
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               me.name, source_p->name);
+    return;
-<
+  DLINK_FOREACH(ptr, mod_list.head)
->
+  DLINK_FOREACH(ptr, modules_list.head)
+    const struct module *modp = ptr->data;
+    if (parc > 1 && !match(parv[1], modp->name))
+      continue;
-<
+    sendto_one(source_p, form_str(RPL_MODLIST), me.name, parv[0],
->
+    sendto_one(source_p, form_str(RPL_MODLIST), me.name, source_p->name,
+               modp->name, modp->handle,
-<
+               modp->version, modp->core?"(core)":"");
->
+               modp->version, (modp->flags & MODULE_FLAG_CORE) ?"(core)":"");
+  sendto_one(source_p, form_str(RPL_ENDOFMODLIST),
+  unsigned int modnum = 0;
+  dlink_node *ptr = NULL, *ptr_next = NULL;
-<
+  if (!IsAdmin(source_p))
->
+  if (!HasOFlag(source_p, OPER_FLAG_MODULE))
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
+               me.name, source_p->name);
+  sendto_one(source_p, ":%s NOTICE %s :Reloading all modules",
+             me.name, source_p->name);
-<
+  modnum = dlink_list_length(&mod_list);
->
+  modnum = dlink_list_length(&modules_list);
-<
+  DLINK_FOREACH_SAFE(ptr, ptr_next, mod_list.head)
->
+  DLINK_FOREACH_SAFE(ptr, ptr_next, modules_list.head)
+    struct module *modp = ptr->data;
+    unload_one_module(modp->name, 0);
+  sendto_realops_flags(UMODE_ALL, L_ALL,
+              "Module Restart: %u modules unloaded, %u modules loaded",
-<
+                        modnum, dlink_list_length(&mod_list));
->
+                        modnum, dlink_list_length(&modules_list));
+  ilog(L_WARN, "Module Restart: %u modules unloaded, %u modules loaded",
-<
+       modnum, dlink_list_length(&mod_list));
->
+       modnum, dlink_list_length(&modules_list));

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing: ircd-hybrid/src/modules.c (file contents), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs. ircd-hybrid-8/src/modules.c (file contents), Revision 1238 by michael, Thu Sep 29 11:37:31 2011 UTC

Diff Legend

Comparing:
ircd-hybrid/src/modules.c (file contents), Revision 1155 by michael, Tue Aug 9 20:27:45 2011 UTC vs.
ircd-hybrid-8/src/modules.c (file contents), Revision 1238 by michael, Thu Sep 29 11:37:31 2011 UTC