X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=bc8e94b1df20f0f4163d117e3a14015340286f9a;hb=fca345d6b5bc453d3e0b914a1c7a1865991ea220;hp=21209ab6a45f4e85c13ad672de380d010b089a85;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 21209ab6a..bc8e94b1d 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -228,7 +228,7 @@ class TreeServer : public classbase
 		ServerDesc = "";
 		VersionString = "";
 		UserCount = OperCount = 0;
-		VersionString = Srv->GetVersion();
+		VersionString = ServerInstance->GetVersionString();
 	}
 
 	/* We use this constructor only to create the 'root' item, TreeRoot, which
@@ -240,7 +240,7 @@ class TreeServer : public classbase
 		Parent = NULL;
 		VersionString = "";
 		UserCount = OperCount = 0;
-		VersionString = Srv->GetVersion();
+		VersionString = ServerInstance->GetVersionString();
 		Route = NULL;
 		Socket = NULL; /* Fix by brain */
 		AddHashEntry();
@@ -756,7 +756,7 @@ class TreeSocket : public InspSocket
 						}
 					}
 					/* found who we're supposed to be connecting to, send the neccessary gubbins. */
-					this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription());
+					this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+ServerInstance->Config->ServerDesc);
 					return true;
 				}
 			}
@@ -1616,7 +1616,7 @@ class TreeSocket : public InspSocket
 
 		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			int x = cflags(i->second,c);
+			int x = c->GetStatusFlags(i->second);
 			if ((x & UCMODE_HOP) && (x & UCMODE_OP))
 			{
 				specific_halfop.push_back(i->second);
@@ -1817,7 +1817,7 @@ class TreeSocket : public InspSocket
 		ServerInstance->WriteOpers("*** Bursting to \2"+name+"\2.");
 		this->WriteLine(burst);
 		/* send our version string */
-		this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion());
+		this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+this->Instance->GetVersionString());
 		/* Send server tree */
 		this->SendServers(TreeRoot,s,1);
 		/* Send users and their oper status */
@@ -2548,7 +2548,7 @@ class TreeSocket : public InspSocket
 				this->InboundDescription = description;
 				// this is good. Send our details: Our server name and description and hopcount of 0,
 				// along with the sendpass from this block.
-				this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription());
+				this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+ServerInstance->Config->ServerDesc);
 				// move to the next state, we are now waiting for THEM.
 				this->LinkState = WAIT_AUTH_2;
 				return true;
@@ -3432,7 +3432,7 @@ class ModuleSpanningTree : public Module
 		Bindings.clear();
 
 		// Create the root of the tree
-		TreeRoot = new TreeServer(Srv->GetServerName(),Srv->GetServerDescription());
+		TreeRoot = new TreeServer(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
 
 		ReadConfiguration(true);