summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-03-07 09:19:20 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-03-07 09:19:20 +0000
commit3b7216d69b6de51cd9530ca9a468b0276f49ce53 (patch)
treedca5ae4ad036e193d2b321a6f18c699b35aa0e88 /src
parent272ba5d111681dba0a3d3a26c239039d91826769 (diff)
Different way of displaying squit server group
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3504 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_spanningtree.cpp10
-rwxr-xr-xsrc/svn-rev.sh2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 5257d563d..2ecfdc696 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -802,7 +802,7 @@ class TreeSocket : public InspSocket
* is having a REAL bad hair day, this function shouldnt be called
* too many times a month ;-)
*/
- void SquitServer(TreeServer* Current, CullList* Goners)
+ void SquitServer(std::string &from, TreeServer* Current, CullList* Goners)
{
/* recursively squit the servers attached to 'Current'.
* We're going backwards so we don't remove users
@@ -811,7 +811,7 @@ class TreeSocket : public InspSocket
for (unsigned int q = 0; q < Current->ChildCount(); q++)
{
TreeServer* recursive_server = Current->GetChild(q);
- this->SquitServer(recursive_server,Goners);
+ this->SquitServer(from,recursive_server,Goners);
}
/* Now we've whacked the kids, whack self */
num_lost_servers++;
@@ -819,8 +819,7 @@ class TreeSocket : public InspSocket
{
if (!strcasecmp(u->second->server,Current->GetName().c_str()))
{
- std::string qreason = Current->GetName()+" "+std::string(Srv->GetServerName());
- Goners->AddItem(u->second,qreason);
+ Goners->AddItem(u->second,from);
num_lost_users++;
}
}
@@ -849,7 +848,8 @@ class TreeSocket : public InspSocket
num_lost_servers = 0;
num_lost_users = 0;
CullList* Goners = new CullList();
- SquitServer(Current, Goners);
+ std::string from = Current->GetParent()->GetName()+" "+Current->GetName();
+ SquitServer(from, Current, Goners);
Goners->Apply();
Current->Tidy();
Current->GetParent()->DelChild(Current);
diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index 92df33bf7..ea5e71ac2 100755
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-echo 3500
+echo 3502