X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=6ced44c9f7ce2ba0ee5c634981a838ee30a30f6b;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=34d1c7091806e4f1e3f38797a3fbdc85fb31a4cd;hpb=f486290d078fe7df68c96d23cb6c1098260f2784;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 34d1c7091..6ced44c9f 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -330,7 +330,7 @@ class TreeServer : public classbase
userrec* a = (userrec*)*n;
log(DEBUG,"Kill %s fd=%d",a->nick,a->fd);
if (!IS_LOCAL(a))
- kill_link(a,reason_s);
+ userrec::QuitUser(a,reason_s);
}
return time_to_die.size();
}
@@ -614,7 +614,7 @@ class cmd_rconnect : public command_t
void Handle (const char** parameters, int pcnt, userrec *user)
{
- WriteServ(user->fd,"NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]);
+ user->WriteServ("NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]);
/* Is this aimed at our server? */
if (Srv->MatchText(Srv->GetServerName(),parameters[0]))
{
@@ -1338,11 +1338,11 @@ class TreeSocket : public InspSocket
userrec* user = Srv->FindNick(source);
if (!user)
{
- WriteChannelWithServ(source.c_str(), c, "TOPIC %s :%s", c->name, c->topic);
+ c->WriteChannelWithServ(source.c_str(), "TOPIC %s :%s", c->name, c->topic);
}
else
{
- WriteChannel(c, user, "TOPIC %s :%s", c->name, c->topic);
+ c->WriteChannel(user, "TOPIC %s :%s", c->name, c->topic);
nsource = user->server;
}
/* all done, send it on its way */
@@ -1430,7 +1430,7 @@ class TreeSocket : public InspSocket
who = Srv->FindNick(usr);
if (who)
{
- Srv->JoinUserToChannel(who,channel,key);
+ chanrec::JoinUser(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
@@ -1445,6 +1445,7 @@ class TreeSocket : public InspSocket
{
log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
us->age = TS;
+ ourTS = TS;
}
}
else
@@ -1475,7 +1476,7 @@ class TreeSocket : public InspSocket
/* there werent enough modes built up to flush it during FJOIN,
* or, there are a number left over. flush them out.
*/
- if ((modectr > 2) && (who))
+ if ((modectr > 2) && (who) && (us))
{
if (ourTS >= TS)
{
@@ -1485,6 +1486,7 @@ class TreeSocket : public InspSocket
{
log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS);
us->age = TS;
+ ourTS = TS;
}
}
else
@@ -2012,7 +2014,11 @@ class TreeSocket : public InspSocket
/* This is not required as one is sent in OnUserPostNick below
*/
//DoOneToMany(u->nick,"NICK",par);
- Srv->ChangeUserNick(u,params[1]);
+ if (!u->ForceNickChange(params[1].c_str()))
+ {
+ userrec::QuitUser(u, "Nickname collision");
+ return true;
+ }
u->age = atoi(params[2].c_str());
}
}
@@ -2028,7 +2034,7 @@ class TreeSocket : public InspSocket
if (u)
{
- Srv->JoinUserToChannel(u,params[1],"");
+ chanrec::JoinUser(u, params[1].c_str(), false);
DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
}
return true;
@@ -2075,8 +2081,8 @@ class TreeSocket : public InspSocket
std::string reason = params[1];
params[1] = ":" + params[1];
DoOneToAllButSender(prefix,"KILL",params,sourceserv);
- ::Write(who->fd, ":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str());
- Srv->QuitUser(who,reason);
+ who->Write(":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str());
+ userrec::QuitUser(who,reason);
}
return true;
}
@@ -2109,7 +2115,7 @@ class TreeSocket : public InspSocket
if (u)
{
- WriteServ(u->fd,"PONG %s %s",params[0].c_str(),params[1].c_str());
+ u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str());
}
}
else
@@ -2335,7 +2341,7 @@ class TreeSocket : public InspSocket
if (IS_LOCAL(u))
{
- ::Write(u->fd,"%s",params[1].c_str());
+ u->Write(params[1]);
}
else
{
@@ -2385,7 +2391,7 @@ class TreeSocket : public InspSocket
char tms[26];
snprintf(tms,26,"%s",asctime(timeinfo));
tms[24] = 0;
- WriteServ(u->fd,"391 %s %s :%s",u->nick,prefix.c_str(),tms);
+ u->WriteServ("391 %s %s :%s",u->nick,prefix.c_str(),tms);
}
else
{
@@ -2894,7 +2900,9 @@ class TreeSocket : public InspSocket
chanrec* chan = Srv->FindChannel(params[0]);
if (user && chan)
{
- server_kick_channel(user,chan,(char*)params[2].c_str(),false);
+ if (!chan->ServerKickUser(user, params[2].c_str(), false))
+ /* Yikes, the channels gone! */
+ delete chan;
}
}
if (this->InboundServerName != "")
@@ -2961,11 +2969,11 @@ class TreeSocket : public InspSocket
p.push_back(prefix);
p.push_back("Nickname collision");
DoOneToMany(Srv->GetServerName(),"KILL",p);
- Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
+ userrec::QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")");
userrec* y = Srv->FindNick(prefix);
if (y)
{
- Srv->QuitUser(y,"Nickname collision");
+ userrec::QuitUser(y,"Nickname collision");
}
return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
}
@@ -3048,13 +3056,20 @@ class TreeSocket : public InspSocket
* IPs for which we don't have a link block.
*/
bool found = false;
- vector::iterator i;
+
found = (std::find(ValidIPs.begin(), ValidIPs.end(), ip) != ValidIPs.end());
if (!found)
{
- WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip);
- close(newsock);
- return false;
+ for (vector::iterator i = ValidIPs.begin(); i != ValidIPs.end(); i++)
+ if (MatchCIDR(ip, (*i).c_str()))
+ found = true;
+
+ if (!found)
+ {
+ WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip);
+ close(newsock);
+ return false;
+ }
}
TreeSocket* s = new TreeSocket(newsock, ip);
Srv->AddSocket(s);
@@ -3343,6 +3358,7 @@ void ReadConfiguration(bool rebind)
for (int j =0; j < Conf->Enumerate("link"); j++)
{
Link L;
+ std::string Allow = Conf->ReadValue("link","allowmask",j);
L.Name = (Conf->ReadValue("link","name",j)).c_str();
L.IPAddr = Conf->ReadValue("link","ipaddr",j);
L.Port = Conf->ReadInteger("link","port",j,true);
@@ -3357,6 +3373,9 @@ void ReadConfiguration(bool rebind)
{
ValidIPs.push_back(L.IPAddr);
+ if (Allow.length())
+ ValidIPs.push_back(Allow);
+
/* Needs resolving */
insp_inaddr binip;
if (insp_aton(L.IPAddr.c_str(), &binip) < 1)
@@ -3453,7 +3472,7 @@ class ModuleSpanningTree : public Module
/* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
if ((HideULines) && (Srv->IsUlined(Current->GetName())) && (!*user->oper))
return;
- WriteServ(user->fd,"364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str());
+ user->WriteServ("364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str());
}
int CountLocalServs()
@@ -3469,7 +3488,7 @@ class ModuleSpanningTree : public Module
void HandleLinks(const char** parameters, int pcnt, userrec* user)
{
ShowLinks(TreeRoot,user,0);
- WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick);
+ user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
return;
}
@@ -3483,16 +3502,16 @@ class ModuleSpanningTree : public Module
if (n_users > max_global)
max_global = n_users;
- WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-usercount_invisible(),usercount_invisible(),this->CountServs());
+ user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-usercount_invisible(),usercount_invisible(),this->CountServs());
if (usercount_opers())
- WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers());
+ user->WriteServ("252 %s %d :operator(s) online",user->nick,usercount_opers());
if (usercount_unknown())
- WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown());
+ user->WriteServ("253 %s %d :unknown connections",user->nick,usercount_unknown());
if (chancount())
- 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,n_users,max_global);
+ user->WriteServ("254 %s %d :channels formed",user->nick,chancount());
+ user->WriteServ("254 %s :I have %d clients and %d servers",user->nick,local_count(),this->CountLocalServs());
+ user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,local_count(),max_local);
+ user->WriteServ("266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global);
return;
}
@@ -3567,6 +3586,10 @@ class ModuleSpanningTree : public Module
params[1] = s->GetName();
DoOneToOne(user->nick, "STATS", params, s->GetName());
}
+ else
+ {
+ user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
+ }
return 1;
}
return 0;
@@ -3629,11 +3652,11 @@ class ModuleSpanningTree : public Module
// dump the whole lot to the user. This is the easy bit, honest.
for (int t = 0; t < line; t++)
{
- WriteServ(user->fd,"006 %s :%s",user->nick,&matrix[t][0]);
+ user->WriteServ("006 %s :%s",user->nick,&matrix[t][0]);
}
float avg_users = totusers / totservers;
- WriteServ(user->fd,"270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users);
- WriteServ(user->fd,"007 %s :End of /MAP",user->nick);
+ user->WriteServ("270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users);
+ user->WriteServ("007 %s :End of /MAP",user->nick);
return;
}
@@ -3644,7 +3667,7 @@ class ModuleSpanningTree : public Module
{
if (s == TreeRoot)
{
- WriteServ(user->fd,"NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]);
return 1;
}
TreeSocket* sock = s->GetSocket();
@@ -3657,12 +3680,12 @@ class ModuleSpanningTree : public Module
}
else
{
- WriteServ(user->fd,"NOTICE %s :*** SQUIT: The server \002%s\002 is not directly connected.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 is not directly connected.",user->nick,parameters[0]);
}
}
else
{
- WriteServ(user->fd,"NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]);
}
return 1;
}
@@ -3685,7 +3708,7 @@ class ModuleSpanningTree : public Module
}
else
{
- WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]);
+ user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
}
}
return 1;
@@ -3705,8 +3728,8 @@ class ModuleSpanningTree : public Module
}
else if (!remote)
{
- WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
- WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
+ user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
+ user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
return 1;
}
}
@@ -3796,7 +3819,7 @@ class ModuleSpanningTree : public Module
if (found)
{
std::string Version = found->GetVersion();
- WriteServ(user->fd,"351 %s :%s",user->nick,Version.c_str());
+ user->WriteServ("351 %s :%s",user->nick,Version.c_str());
if (found == TreeRoot)
{
std::stringstream out(Config->data005);
@@ -3812,7 +3835,7 @@ class ModuleSpanningTree : public Module
if ((token_counter >= 13) || (out.eof() == true))
{
- WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str());
+ user->WriteServ("005 %s %s:are supported by this server",user->nick,line5.c_str());
line5 = "";
token_counter = 0;
}
@@ -3821,7 +3844,7 @@ class ModuleSpanningTree : public Module
}
else
{
- WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]);
+ user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
}
return 1;
}
@@ -3835,7 +3858,7 @@ class ModuleSpanningTree : public Module
TreeServer* CheckDupe = FindServer(x->Name.c_str());
if (!CheckDupe)
{
- WriteServ(user->fd,"NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port);
+ user->WriteServ("NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port);
insp_inaddr binip;
/* Do we already have an IP? If so, no need to resolve it. */
@@ -3868,12 +3891,12 @@ class ModuleSpanningTree : public Module
}
else
{
- WriteServ(user->fd,"NOTICE %s :*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",user->nick,x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
+ user->WriteServ("NOTICE %s :*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",user->nick,x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
return 1;
}
}
}
- WriteServ(user->fd,"NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]);
+ user->WriteServ("NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]);
return 1;
}