Strip SUPPORT_IP6LINKS #define

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / addline.cpp

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index ec518376f68b316b66ca042373fd3375a3abee32..304a230010817a69ea675ba0e2efe28c3ad067b4 100644 (file)
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
@@ -24,41 +24,61 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
 {
        if (params.size() < 6)
        {
-               this->Instance->SNO->WriteToSnoMask('x',"%s sent me a malformed ADDLINE of type %s.",prefix.c_str(),params[0].c_str());
+               this->ServerInstance->SNO->WriteToSnoMask('x',"%s sent me a malformed ADDLINE of type %s.",prefix.c_str(),params[0].c_str());
                return true;
        }
 
-       XLineFactory* xlf = Instance->XLines->GetFactory(params[0]);
+       XLineFactory* xlf = ServerInstance->XLines->GetFactory(params[0]);
+
+       std::string setter = "<unknown>";
+       User* usr = ServerInstance->FindNick(prefix);
+       if (usr)
+               setter = usr->nick;
+       else
+       {
+               TreeServer* t = Utils->FindServer(prefix);
+               if (t)
+                       setter = t->GetName().c_str();
+       }
 
        if (!xlf)
        {
-               this->Instance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",prefix.c_str(),params[0].c_str());
+               this->ServerInstance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
                return true;
        }
 
-       XLine* xl = xlf->Generate(Instance->Time(), atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+       XLine* xl = NULL;
+       try
+       {
+               xl = xlf->Generate(ServerInstance->Time(), atoi(params[4].c_str()), params[2].c_str(), params[5].c_str(), params[1].c_str());
+       }
+       catch (ModuleException &e)
+       {
+               this->ServerInstance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason());
+               return true;
+       }
        xl->SetCreateTime(atoi(params[3].c_str()));
-       if (Instance->XLines->AddLine(xl,NULL))
+       if (ServerInstance->XLines->AddLine(xl, NULL))
        {
                if (xl->duration)
                {
-                       this->Instance->SNO->WriteToSnoMask('x',"%s added %s%s on %s to expire on %s (%s).",prefix.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
-                                       params[1].c_str(),Instance->TimeString(xl->expiry).c_str(),params[5].c_str());
+                       this->ServerInstance->SNO->WriteToSnoMask('x',"%s added %s%s on %s to expire on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+                                       params[1].c_str(),ServerInstance->TimeString(xl->expiry).c_str(),params[5].c_str());
                }
                else
                {
-                       this->Instance->SNO->WriteToSnoMask('x',"%s added permanent %s%s on %s (%s).",prefix.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
+                       this->ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent %s%s on %s (%s).",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "LINE" : "",
                                        params[1].c_str(),params[5].c_str());
                }
                params[5] = ":" + params[5];
 
-               User* u = Instance->FindNick(prefix);
+               User* u = ServerInstance->FindNick(prefix);
                Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
                TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
-               
+
                if (!remoteserver->bursting)
                {
-                       Instance->XLines->ApplyLines();
+                       ServerInstance->XLines->ApplyLines();
                }
        }
        else