* Note: If m_sha256.so is not loaded, we MUST fall back to plaintext with no
* HMAC challenge/response.
*/
- Module* sha256 = Instance->FindModule("m_sha256.so");
+ Module* sha256 = Instance->Modules->Find("m_sha256.so");
if (Utils->ChallengeResponse && sha256 && !challenge.empty())
{
/* XXX: This is how HMAC is supposed to be done:
{
std::vector<std::string> modlist;
std::string capabilities;
- for (int i = 0; i <= this->Instance->GetModuleCount(); i++)
+ for (int i = 0; i <= this->Instance->Modules->GetCount(); i++)
{
- if (this->Instance->modules[i]->GetVersion().Flags & VF_COMMON)
+ if (this->Instance->Modules->modules[i]->GetVersion().Flags & VF_COMMON)
modlist.push_back(this->Instance->Config->module_names[i]);
}
sort(modlist.begin(),modlist.end());
#endif
std::string extra;
/* Do we have sha256 available? If so, we send a challenge */
- if (Utils->ChallengeResponse && (Instance->FindModule("m_sha256.so")))
+ if (Utils->ChallengeResponse && (Instance->Modules->Find("m_sha256.so")))
{
this->SetOurChallenge(RandString(20));
extra = " CHALLENGE=" + this->GetOurChallenge();
}
- this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support)+" PROTOCOL="+ConvToStr(ProtocolVersion)+extra+" PREFIX="+Instance->Modes->BuildPrefixes()+" CHANMODES="+Instance->Modes->ChanModes());
+ this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support)+" PROTOCOL="+ConvToStr(ProtocolVersion)+extra+" PREFIX="+Instance->Modes->BuildPrefixes()+" CHANMODES="+Instance->Modes->ChanModes()+" SVSPART=1");
this->WriteLine("CAPAB END");
}
void TreeSocket::SendError(const std::string &errormessage)
{
/* Display the error locally as well as sending it remotely */
- this->WriteLine("ERROR :"+errormessage);
Utils->Creator->RemoteMessage(NULL, "Sent \2ERROR\2 to %s: %s", (this->InboundServerName.empty() ? "<unknown>" : this->InboundServerName.c_str()), errormessage.c_str());
+ this->WriteLine("ERROR :"+errormessage);
/* One last attempt to make sure the error reaches its target */
this->FlushWriteBuffer();
}
/* Challenge response, store their challenge for our password */
std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");
- if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (Instance->FindModule("m_sha256.so")))
+ if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (Instance->Modules->Find("m_sha256.so")))
{
/* Challenge-response is on now */
this->SetTheirChallenge(n->second);
bool smode = false;
std::string sourceserv;
/* Are we dealing with an FMODE from a user, or from a server? */
- userrec* who = this->Instance->FindNick(source);
+ User* who = this->Instance->FindNick(source);
if (who)
{
/* FMODE from a user, set sourceserv to the users server name */
{
/* FMODE from a server, use a fake user to receive mode feedback */
who = this->Instance->FakeClient;
- smode = true; /* Setting this flag tells us we should free the userrec later */
+ smode = true; /* Setting this flag tells us we should free the User later */
sourceserv = source; /* Set sourceserv to the actual source string */
}
const char* modelist[64];
}
}
- /* Extract the TS value of the object, either userrec or chanrec */
- userrec* dst = this->Instance->FindNick(params[0]);
- chanrec* chan = NULL;
+ /* Extract the TS value of the object, either User or Channel */
+ User* dst = this->Instance->FindNick(params[0]);
+ Channel* chan = NULL;
time_t ourTS = 0;
if (dst)
{
return true;
time_t ts = atoi(params[1].c_str());
std::string nsource = source;
- chanrec* c = this->Instance->FindChan(params[0]);
+ Channel* c = this->Instance->FindChan(params[0]);
if (c)
{
if ((ts >= c->topicset) || (!*c->topic))
*/
if (oldtopic != params[3])
{
- userrec* user = this->Instance->FindNick(source);
+ User* user = this->Instance->FindNick(source);
if (!user)
{
c->WriteChannelWithServ(Instance->Config->ServerName, "TOPIC %s :%s", c->name, c->topic);
return true;
irc::modestacker modestack(true); /* Modes to apply from the users in the user list */
- userrec* who = NULL; /* User we are currently checking */
+ User* who = NULL; /* User we are currently checking */
std::string channel = params[0]; /* Channel name, as a string */
time_t TS = atoi(params[1].c_str()); /* Timestamp given to us for remote side */
irc::tokenstream users(params[2]); /* Users from the user list */
bool apply_other_sides_modes = true; /* True if we are accepting the other side's modes */
- chanrec* chan = this->Instance->FindChan(channel); /* The channel we're sending joins to */
+ Channel* chan = this->Instance->FindChan(channel); /* The channel we're sending joins to */
time_t ourTS = chan ? chan->age : Instance->Time(true)+600; /* The TS of our side of the link */
bool created = !chan; /* True if the channel doesnt exist here yet */
std::string item; /* One item in the list of nicks */
for (std::string::iterator x = modes.begin(); x != modes.end(); ++x)
modestack.Push(*x, who->nick);
- chanrec::JoinUser(this->Instance, who, channel.c_str(), true, "", TS);
+ Channel::JoinUser(this->Instance, who, channel.c_str(), true, "", TS);
}
else
{
/*
* Yes, this function looks a little ugly.
- * However, in some circumstances we may not have a userrec, so we need to do things this way.
+ * However, in some circumstances we may not have a User, so we need to do things this way.
* Returns 1 if colliding local client, 2 if colliding remote, 3 if colliding both.
* Sends SVSNICKs as appropriate and forces nickchanges too.
*/
-int TreeSocket::DoCollision(userrec *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid)
+int TreeSocket::DoCollision(User *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid)
{
/*
* Under old protocol rules, we would have had to kill both clients.
bool bChangeLocal = true;
bool bChangeRemote = true;
- /* for brevity, don't use the userrec */
+ /* for brevity, don't use the User */
time_t localts = u->age;
const char *localident = u->ident;
const char *localip = u->GetIPString();
* have 928AAAB's nick set to that.
* -- w00t
*/
- userrec *remote = this->Instance->FindUUID(remoteuid);
+ User *remote = this->Instance->FindUUID(remoteuid);
if (remote)
{
/** Do we have enough parameters:
* UID uuid age nick host dhost ident +modestr ip.string :gecos
*/
- if (params.size() != 9)
+ if (params.size() != 10)
{
- this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+"?)");
+ this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+
+ ConvToStr(params.size())+" of 10 parameters?)");
return true;
}
time_t age = ConvToInt(params[1]);
+ time_t signon = ConvToInt(params[8]);
const char* tempnick = params[2].c_str();
std::string empty;
/* XXX probably validate UID length too -- w00t */
- cmd_validation valid[] = { {"Nickname", 2, NICKMAX}, {"Hostname", 3, 64}, {"Displayed hostname", 4, 64}, {"Ident", 5, IDENTMAX}, {"GECOS", 7, MAXGECOS}, {"", 0, 0} };
+ cmd_validation valid[] = { {"Nickname", 2, NICKMAX}, {"Hostname", 3, 64}, {"Displayed hostname", 4, 64}, {"Ident", 5, IDENTMAX}, {"GECOS", 9, MAXGECOS}, {"", 0, 0} };
TreeServer* remoteserver = Utils->FindServer(source);
/* IMPORTANT NOTE: For remote users, we pass the UUID in the constructor. This automatically
* sets it up in the UUID hash for us.
*/
- userrec* _new = NULL;
+ User* _new = NULL;
try
{
- _new = new userrec(this->Instance, params[0]);
+ _new = new User(this->Instance, params[0]);
}
- catch (CoreException &e)
+ catch (...)
{
- /** TODO: SQUIT the server here, the remote server is fucking with us
- * and has sent us the same UID twice!
- */
+ SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
+ return false;
}
(*(this->Instance->clientlist))[tempnick] = _new;
_new->SetFd(FD_MAGIC_NUMBER);
strlcpy(_new->nick, tempnick, NICKMAX - 1);
strlcpy(_new->host, params[3].c_str(),64);
strlcpy(_new->dhost, params[4].c_str(),64);
- _new->server = this->Instance->FindServerNamePtr(source.c_str());
+ _new->server = this->Instance->FindServerNamePtr(remoteserver->GetName().c_str());
strlcpy(_new->ident, params[5].c_str(),IDENTMAX);
- strlcpy(_new->fullname, params[8].c_str(),MAXGECOS);
+ strlcpy(_new->fullname, params[9].c_str(),MAXGECOS);
_new->registered = REG_ALL;
- _new->signon = age;
+ _new->signon = signon;
_new->age = age;
/* we need to remove the + from the modestring, so we can do our stuff */
if (dosend)
this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString(), _new->fullname);
- params[8] = ":" + params[8];
+ params[9] = ":" + params[9];
Utils->DoOneToAllButSender(source, "UID", params, source);
// Increment the Source Servers User Count..
* If the length of a single line is more than 480-NICKMAX
* in length, it is split over multiple lines.
*/
-void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
+void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
{
std::string buffer;
char list[MAXBUF];
TreeServer* theirserver = Utils->FindServer(u->second->server);
if (theirserver)
{
- snprintf(data,MAXBUF,":%s UID %s %lu %s %s %s %s +%s %s :%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(),u->second->fullname);
+ 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);
this->WriteLine(data);
if (*u->second->oper)
{
this->WriteLine(data);
}
}
- }
- }
- for (user_hash::iterator u = this->Instance->clientlist->begin(); u != this->Instance->clientlist->end(); u++)
- {
- FOREACH_MOD_I(this->Instance,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->Instance,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]));
+ }
}
}
}
*/
return (data && !*data);
}
-
projects / user / henk / code / inspircd.git / blobdiff