X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=24997b93972c2628467e03fc1bb722ea2252ea7f;hb=412ab8a25a442fd49726b9f78c039a622ee09319;hp=f022d48c6e86dd3f758b99f5dba14602e8306bc2;hpb=7804a295387c003e8a8a11e97c0b6eb2915e3ff4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index f022d48c6..24997b939 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -468,6 +468,13 @@ class Link
 ConfigReader *Conf;
 std::vector<Link> LinkBlocks;
 
+template<typename T> inline string ConvToStr(const T &in)
+{
+	stringstream tmp;
+	if (!(tmp << in)) return string();
+	return tmp.str();
+}
+
 /* Yay for fast searches!
  * This is hundreds of times faster than recursion
  * or even scanning a linked list, especially when
@@ -1136,24 +1143,22 @@ class TreeSocket : public InspSocket
 		size_t counter = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age);
 		size_t initial = counter;
 
-		std::map<char*,char*> *ulist = c->GetUsers();
+		CUList *ulist = c->GetUsers();
 		std::vector<userrec*> specific_halfop;
 		std::vector<userrec*> specific_voice;
 
-		for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			char* o = i->second;
-			userrec* otheruser = (userrec*)o;
 			charlcat(list,' ',MAXBUF);
 			counter++;
-			int x = cflags(otheruser,c);
+			int x = cflags(i->second,c);
 			if ((x & UCMODE_HOP) && (x & UCMODE_OP))
 			{
-				specific_halfop.push_back(otheruser);
+				specific_halfop.push_back(i->second);
 			}
 			if (((x & UCMODE_HOP) || (x & UCMODE_OP)) && (x & UCMODE_VOICE))
 			{
-				specific_voice.push_back(otheruser);
+				specific_voice.push_back(i->second);
 			}
 
 			char n = 0;
@@ -1176,7 +1181,7 @@ class TreeSocket : public InspSocket
 				counter++;
 			}
 
-			counter += strlcat(list,otheruser->nick,MAXBUF);
+			counter += strlcat(list,i->second->nick,MAXBUF);
 
 			if (counter > (480-NICKMAX))
 			{
@@ -2264,13 +2269,21 @@ class TreeSocket : public InspSocket
 				}
 				else if (command == "BURST")
 				{
-					time_t THEM = atoi(params[0].c_str());
-					long delta = THEM-time(NULL);
-					if ((delta < -600) || (delta > 600))
+					if (params.size())
 					{
-						WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
-						this->WriteLine("ERROR :Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than ten minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
-						return false;
+						/* If a time stamp is provided, try and check syncronization */
+						time_t THEM = atoi(params[0].c_str());
+						long delta = THEM-time(NULL);
+						if ((delta < -600) || (delta > 600))
+						{
+							WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
+							this->WriteLine("ERROR :Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than ten minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
+							return false;
+						}
+						else if ((delta < -60) || (delta > 60))
+						{
+							WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta));
+						}
 					}
 					this->LinkState = CONNECTED;
 					Node = new TreeServer(InboundServerName,InboundDescription,TreeRoot,this);
@@ -2645,14 +2658,12 @@ void AddThisServer(TreeServer* server, std::deque<TreeServer*> &list)
 // returns a list of DIRECT servernames for a specific channel
 void GetListOfServersForChannel(chanrec* c, std::deque<TreeServer*> &list)
 {
-	std::map<char*,char*> *ulist = c->GetUsers();
-	for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+	CUList *ulist = c->GetUsers();
+	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
-		char* o = i->second;
-		userrec* otheruser = (userrec*)o;
-		if (otheruser->fd < 0)
+		if (i->second->fd < 0)
 		{
-			TreeServer* best = BestRouteTo(otheruser->server);
+			TreeServer* best = BestRouteTo(i->second->server);
 			if (best)
 				AddThisServer(best,list);
 		}
@@ -2959,7 +2970,7 @@ class ModuleSpanningTree : public Module
 		WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount());
 		WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),this->CountLocalServs());
 		WriteServ(user->fd,"265 %s :Current Local Users: %d  Max: %d",user->nick,local_count(),max_local);
-		WriteServ(user->fd,"266 %s :Current Global Users: %d  Max: %d",user->nick,clientlist.size(),max_global);
+		WriteServ(user->fd,"266 %s :Current Global Users: %d  Max: %d",user->nick,usercnt(),max_global);
 		return;
 	}