void TreeSocket::DoBurst(TreeServer* s)
{
std::string name = s->GetName();
- std::string burst = ":" + this->Instance->Config->GetSID() + " BURST " +ConvToStr(Instance->Time(true));
- std::string endburst = ":" + this->Instance->Config->GetSID() + " ENDBURST";
- this->Instance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s).", name.c_str(), this->GetTheirChallenge().empty() ? "plaintext password" : "SHA256-HMAC challenge-response");
+ std::string burst = ":" + this->ServerInstance->Config->GetSID() + " BURST " +ConvToStr(ServerInstance->Time());
+ std::string endburst = ":" + this->ServerInstance->Config->GetSID() + " ENDBURST";
+ this->ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s).", name.c_str(), this->GetTheirChallenge().empty() ? "plaintext password" : "SHA256-HMAC challenge-response");
this->WriteLine(burst);
/* send our version string */
- this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" VERSION :"+this->Instance->GetVersionString());
+ this->WriteLine(std::string(":")+this->ServerInstance->Config->GetSID()+" VERSION :"+this->ServerInstance->GetVersionString());
/* Send server tree */
this->SendServers(Utils->TreeRoot,s,1);
/* Send users and their oper status */
/* Send everything else (channel modes, xlines etc) */
this->SendChannelModes(s);
this->SendXLines(s);
- FOREACH_MOD_I(this->Instance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)Utils->Creator,(void*)this));
+ FOREACH_MOD_I(this->ServerInstance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)Utils->Creator,(void*)this));
this->WriteLine(endburst);
- this->Instance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
+ this->ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
}
/** Recursively send the server tree with distances as hops.
{
std::string buffer;
char list[MAXBUF];
- std::string individual_halfops = std::string(":")+this->Instance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age);
size_t dlen, curlen;
- dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->GetSID().c_str(),c->name,(unsigned long)c->age);
- int numusers = 1;
+ dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu +%s", this->ServerInstance->Config->GetSID().c_str(), c->name.c_str(),(unsigned long)c->age, c->ChanModes(true));
+ int numusers = 0;
char* ptr = list + dlen;
+ bool looped_once = false;
CUList *ulist = c->GetUsers();
std::string modes;
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- // The first parameter gets a : before it
- size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->uuid);
-
- curlen += ptrlen;
- ptr += ptrlen;
-
- numusers++;
+ size_t ptrlen = 0;
+ std::string modestr = this->ServerInstance->Modes->ModeString(i->first, c, false);
- if (curlen > (480-NICKMAX))
+ if ((curlen + modestr.length() + i->first->uuid.length() + 4) > 480)
{
buffer.append(list).append("\r\n");
- dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",this->Instance->Config->GetSID().c_str(),c->name,(unsigned long)c->age);
+ dlen = curlen = snprintf(list, MAXBUF, ":%s FJOIN %s %lu +%s", this->ServerInstance->Config->GetSID().c_str(), c->name.c_str(), (unsigned long)c->age, c->ChanModes(true));
ptr = list + dlen;
- ptrlen = 0;
numusers = 0;
}
+
+ // The first parameter gets a : before it
+ ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", modestr.c_str(), i->first->uuid.c_str());
+
+ looped_once = true;
+
+ curlen += ptrlen;
+ ptr += ptrlen;
+
+ numusers++;
}
- if (numusers)
+ // Okay, permanent channels will (of course) need this \r\n anyway, numusers check is if there
+ // actually were people in the channel (looped_once == true)
+ if (!looped_once || numusers > 0)
buffer.append(list).append("\r\n");
- buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(c->ChanModes(true)).append("\r\n");
-
int linesize = 1;
for (BanList::iterator b = c->bans.begin(); b != c->bans.end(); b++)
{
- int size = strlen(b->data) + 2;
+ int size = b->data.length() + 2;
int currsize = linesize + size;
if (currsize <= 350)
{
modes.append("b");
params.append(" ").append(b->data);
- linesize += size;
+ linesize += size;
}
- if ((params.length() >= MAXMODES) || (currsize > 350))
+ if ((params.length() >= ServerInstance->Config->Limits.MaxModes) || (currsize > 350))
{
/* Wrap at MAXMODES */
- buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params).append("\r\n");
+ buffer.append(":").append(this->ServerInstance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params).append("\r\n");
modes.clear();
params.clear();
linesize = 1;
/* Only send these if there are any */
if (!modes.empty())
- buffer.append(":").append(this->Instance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params);
+ buffer.append(":").append(this->ServerInstance->Config->GetSID()).append(" FMODE ").append(c->name).append(" ").append(ConvToStr(c->age)).append(" +").append(modes).append(params);
this->WriteLine(buffer);
}
void TreeSocket::SendXLines(TreeServer* Current)
{
char data[MAXBUF];
- std::string buffer;
- std::string n = this->Instance->Config->GetSID();
+ std::string n = this->ServerInstance->Config->GetSID();
const char* sn = n.c_str();
- std::vector<std::string> types = Instance->XLines->GetAllTypes();
+ std::vector<std::string> types = ServerInstance->XLines->GetAllTypes();
+ time_t current = ServerInstance->Time();
for (std::vector<std::string>::iterator it = types.begin(); it != types.end(); ++it)
{
- XLineLookup* lookup = Instance->XLines->GetAll(*it);
+ XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
if (lookup)
{
for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
{
- snprintf(data,MAXBUF,":%s ADDLINE %s %s %s %lu %lu :%s\r\n",sn, it->c_str(), i->second->Displayable(),
+ /* Is it burstable? this is better than an explicit check for type 'K'.
+ * We break the loop as NONE of the items in this group are worth iterating.
+ */
+ if (!i->second->IsBurstable())
+ break;
+
+ /* If it's expired, don't bother to burst it
+ */
+ if (i->second->duration && current > i->second->expiry)
+ continue;
+
+ snprintf(data,MAXBUF,":%s ADDLINE %s %s %s %lu %lu :%s",sn, it->c_str(), i->second->Displayable(),
i->second->source,
(unsigned long)i->second->set_time,
(unsigned long)i->second->duration,
i->second->reason);
- buffer.append(data);
+ this->WriteLine(data);
}
}
}
-
- if (!buffer.empty())
- this->WriteLine(buffer);
}
/** Send channel modes and topics */
{
char data[MAXBUF];
std::deque<std::string> list;
- std::string n = this->Instance->Config->GetSID();
+ std::string n = this->ServerInstance->Config->GetSID();
const char* sn = n.c_str();
- Instance->Log(DEBUG,"Sending channels and modes, %d to send", this->Instance->chanlist->size());
- for (chan_hash::iterator c = this->Instance->chanlist->begin(); c != this->Instance->chanlist->end(); c++)
+ for (chan_hash::iterator c = this->ServerInstance->chanlist->begin(); c != this->ServerInstance->chanlist->end(); c++)
{
SendFJoins(Current, c->second);
- if (*c->second->topic)
+ if (!c->second->topic.empty())
{
- snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s",sn,c->second->name,(unsigned long)c->second->topicset,c->second->setby,c->second->topic);
+ snprintf(data,MAXBUF,":%s FTOPIC %s %lu %s :%s", sn, c->second->name.c_str(), (unsigned long)c->second->topicset, c->second->setby.c_str(), c->second->topic.c_str());
this->WriteLine(data);
}
- FOREACH_MOD_I(this->Instance,I_OnSyncChannel,OnSyncChannel(c->second,(Module*)Utils->Creator,(void*)this));
+ FOREACH_MOD_I(this->ServerInstance,I_OnSyncChannel,OnSyncChannel(c->second,(Module*)Utils->Creator,(void*)this));
list.clear();
c->second->GetExtList(list);
for (unsigned int j = 0; j < list.size(); j++)
{
- FOREACH_MOD_I(this->Instance,I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)Utils->Creator,(void*)this,list[j]));
+ FOREACH_MOD_I(this->ServerInstance,I_OnSyncChannelMetaData,OnSyncChannelMetaData(c->second,(Module*)Utils->Creator,(void*)this,list[j]));
}
}
}
char data[MAXBUF];
std::deque<std::string> list;
std::string dataline;
- for (user_hash::iterator u = this->Instance->Users->clientlist->begin(); u != this->Instance->Users->clientlist->end(); u++)
+ for (user_hash::iterator u = this->ServerInstance->Users->clientlist->begin(); u != this->ServerInstance->Users->clientlist->end(); u++)
{
if (u->second->registered == REG_ALL)
{
TreeServer* theirserver = Utils->FindServer(u->second->server);
if (theirserver)
{
- snprintf(data,MAXBUF,":%s UID %s %lu %s %s %s %s +%s %s %lu :%s", theirserver->GetID().c_str(), u->second->uuid,
- (unsigned long)u->second->age, u->second->nick, u->second->host, u->second->dhost,
- u->second->ident, u->second->FormatModes(), u->second->GetIPString(),
- (unsigned long)u->second->signon, u->second->fullname);
+ snprintf(data,MAXBUF,":%s UID %s %lu %s %s %s %s %s %lu +%s :%s",
+ theirserver->GetID().c_str(), /* Prefix: SID */
+ u->second->uuid.c_str(), /* 0: UUID */
+ (unsigned long)u->second->age, /* 1: TS */
+ u->second->nick.c_str(), /* 2: Nick */
+ u->second->host.c_str(), /* 3: Displayed Host */
+ u->second->dhost.c_str(), /* 4: Real host */
+ u->second->ident.c_str(), /* 5: Ident */
+ u->second->GetIPString(), /* 6: IP string */
+ (unsigned long)u->second->signon, /* 7: Signon time for WHOWAS */
+ u->second->FormatModes(true), /* 8...n: Modes and params */
+ u->second->fullname.c_str()); /* size-1: GECOS */
this->WriteLine(data);
if (IS_OPER(u->second))
{
- snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->uuid, u->second->oper);
+ snprintf(data,MAXBUF,":%s OPERTYPE %s", u->second->uuid.c_str(), u->second->oper.c_str());
this->WriteLine(data);
}
if (IS_AWAY(u->second))
{
- snprintf(data,MAXBUF,":%s AWAY :%s", u->second->uuid, u->second->awaymsg);
+ snprintf(data,MAXBUF,":%s AWAY :%s", u->second->uuid.c_str(), u->second->awaymsg.c_str());
this->WriteLine(data);
}
}
- FOREACH_MOD_I(this->Instance,I_OnSyncUser,OnSyncUser(u->second,(Module*)Utils->Creator,(void*)this));
+ FOREACH_MOD_I(this->ServerInstance,I_OnSyncUser,OnSyncUser(u->second,(Module*)Utils->Creator,(void*)this));
list.clear();
u->second->GetExtList(list);
for (unsigned int j = 0; j < list.size(); j++)
{
- FOREACH_MOD_I(this->Instance,I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)Utils->Creator,(void*)this,list[j]));
+ FOREACH_MOD_I(this->ServerInstance,I_OnSyncUserMetaData,OnSyncUserMetaData(u->second,(Module*)Utils->Creator,(void*)this,list[j]));
}
}
}
projects / user / henk / code / inspircd.git / blobdiff