X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=e94209885b51581dcfd247d38fdb6f9b2f9252b0;hb=d4fe0b555c2a04968b50896cd094e65fe559dfd3;hp=d46cd6234f81969ea5b665fd9e0be85a07d829ca;hpb=8fd3aeae0c069390895f53887744fdb37ab6f3ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index d46cd6234..e94209885 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -1585,13 +1585,16 @@ class TreeSocket : public InspSocket
 			{
 				char* permissions = usr;
 				int ntimes = 0;
-				while ((*permissions) && (*permissions != ','))
+				char* nm = new char[MAXBUF];
+				char* tnm = nm;
+
+				while ((*permissions) && (*permissions != ',') && (ntimes < MAXBUF))
 				{
 					ModeHandler* mh = Instance->Modes->FindPrefix(*permissions);
 					if (mh)
 					{
 						ntimes++;
-						charlcat(modestring,mh->GetModeChar(),MAXBUF);
+						*tnm++ = mh->GetModeChar();
 					}
 					else
 					{
@@ -1602,22 +1605,33 @@ class TreeSocket : public InspSocket
 					usr++;
 					permissions++;
 				}
-				usr++;
 
-				/* Did they get any modes? How many times? */
-				for (int k = 0; k < ntimes; k++)
-					mode_users[modectr++] = strdup(usr);
+				*tnm = 0;
+				usr++;
 
 				who = this->Instance->FindNick(usr);
 				if (who)
 				{
+					/* Did they get any modes? How many times? */
+					strlcat(modestring, nm, MAXBUF);
+					for (int k = 0; k < ntimes; k++)
+						mode_users[modectr++] = strdup(usr);
+
+					delete[] nm;
+
+					TreeServer* route_back_again = BestRouteTo(who->server);
+					if ((!route_back_again) || (route_back_again->GetSocket() != this))
+					{
+						Instance->Log(DEBUG,"Fake direction in FJOIN, user '%s'",who->nick);
+						continue;
+					}
 					chanrec::JoinUser(this->Instance, who, channel.c_str(), true, key);
 					if (modectr >= (MAXMODES-1))
 					{
 						/* theres a mode for this user. push them onto the mode queue, and flush it
 						 * if there are more than MAXMODES to go.
 						 */
-						if ((ourTS >= TS) || (this->Instance->ULine(who->server)))
+						if (ourTS >= TS)
 						{
 							/* We also always let u-lined clients win, no matter what the TS value */
 							Instance->Log(DEBUG,"Our our channel newer than theirs, accepting their modes");
@@ -1637,6 +1651,7 @@ class TreeSocket : public InspSocket
 				}
 				else
 				{
+					delete[] nm;
 					Instance->Log(SPARSE,"Warning! Invalid user in FJOIN to channel %s IGNORED", channel.c_str());
 					continue;
 				}
@@ -2616,38 +2631,50 @@ class TreeSocket : public InspSocket
 
 		if (c)
 		{
+			irc::modestacker modestack(false);
 			CUList *ulist = c->GetUsers();
+			const char* y[127];
+			std::deque<std::string> stackresult;
+			std::string x;
+
 			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 			{
 				std::string modesequence = Instance->Modes->ModeString(i->second, c);
 				if (modesequence.length())
 				{
-					modesequence = "-" + modesequence;
-
-					std::deque<std::string> items;
-					const char* y[127];
-					unsigned int z = 0;
-					std::string x = "*";
+					ServerInstance->Log(DEBUG,"Mode sequence = '%s'",modesequence.c_str());
 					irc::spacesepstream sep(modesequence);
+					std::string modeletters = sep.GetToken();
+					ServerInstance->Log(DEBUG,"Mode letters = '%s'",modeletters.c_str());
 					
-					while ((x = sep.GetToken()) != "")
+					while (!modeletters.empty())
 					{
-						if (!z)
-						{
-							y[z++] = c->name;
-							items.push_back(c->name);
-							items.push_back(ConvToStr(c->age));
-						}
-						items.push_back(x);
-						y[z++] = (items.end() - 1)->c_str();
+						char mletter = *(modeletters.begin());
+						modestack.Push(mletter,sep.GetToken());
+						ServerInstance->Log(DEBUG,"Push letter = '%c'",mletter);
+						modeletters.erase(modeletters.begin());
+						ServerInstance->Log(DEBUG,"Mode letters = '%s'",modeletters.c_str());
 					}
+				}
+			}
 
-					DoOneToMany(Instance->Config->ServerName, "FMODE", items);
-					userrec* n = new userrec(Instance);
-					n->SetFd(FD_MAGIC_NUMBER);
-					Instance->SendMode(y,z,n);
-					delete n;
+			while (modestack.GetStackedLine(stackresult))
+			{
+				ServerInstance->Log(DEBUG,"Stacked line size %d",stackresult.size());
+				stackresult.push_front(ConvToStr(c->age));
+				stackresult.push_front(c->name);
+				DoOneToMany(Instance->Config->ServerName, "FMODE", stackresult);
+				stackresult.erase(stackresult.begin() + 1);
+				ServerInstance->Log(DEBUG,"Stacked items:");
+				for (size_t z = 0; z < stackresult.size(); z++)
+				{
+					y[z] = stackresult[z].c_str();
+					ServerInstance->Log(DEBUG,"\tstackresult[%d]='%s'",z,stackresult[z].c_str());
 				}
+				userrec* n = new userrec(Instance);
+				n->SetFd(FD_MAGIC_NUMBER);
+				Instance->SendMode(y, stackresult.size(), n);
+				delete n;
 			}
 		}
 		return true;