extern userrec* fd_ref_table[MAX_DESCRIPTORS];
extern ServerConfig *Config;
extern user_hash clientlist;
-extern whowas_hash whowas;
+
+whowas_users whowas;
+
extern std::vector<userrec*> local_users;
std::vector<userrec*> all_opers;
server = (char*)FindServerNamePtr(Config->ServerName);
reset_due = TIME;
lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
- timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+ modebits = timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
haspassed = dns_done = false;
recvq = "";
sendq = "";
chans.clear();
invites.clear();
+ chans.resize(MAXCHANS);
+ for (unsigned int n = 0; n < MAXCHANS; n++)
+ {
+ ucrec* x = new ucrec();
+ chans[n] = x;
+ x->channel = NULL;
+ x->uc_modes = 0;
+ }
}
userrec::~userrec()
{
+ for (std::vector<ucrec*>::iterator n = chans.begin(); n != chans.end(); n++)
+ {
+ ucrec* x = (ucrec*)*n;
+ delete x;
+ }
}
void userrec::MakeHost(char* nhost)
}
}
-bool userrec::HasPermission(std::string &command)
+bool userrec::HasPermission(const std::string &command)
{
char* mycmd;
char* savept;
}
-bool userrec::AddBuffer(std::string a)
+bool userrec::AddBuffer(const std::string &a)
{
std::string b = "";
char* n = (char*)a.c_str();
return ret;
}
-void userrec::AddWriteBuf(std::string data)
+void userrec::AddWriteBuf(const std::string &data)
{
- if (this->GetWriteError() != "")
+ if (*this->GetWriteError())
return;
if (sendq.length() + data.length() > (unsigned)this->sendqmax)
{
}
}
-void userrec::SetWriteError(std::string error)
+void userrec::SetWriteError(const std::string &error)
{
log(DEBUG,"Setting error string for %s to '%s'",this->nick,error.c_str());
// don't try to set the error twice, its already set take the first string.
this->WriteError = error;
}
-std::string userrec::GetWriteError()
+const char* userrec::GetWriteError()
{
- return this->WriteError;
+ return this->WriteError.c_str();
}
void AddOper(userrec* user)
char reason[MAXBUF];
- strlcpy(reason,r,MAXBUF-1);
-
- if (strlen(reason)>MAXQUIT)
- {
- reason[MAXQUIT-1] = '\0';
- }
+ strlcpy(reason,r,MAXQUIT-1);
log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
delete user;
}
+WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
+{
+ this->host = strdup(user->host);
+ this->dhost = strdup(user->dhost);
+ this->ident = strdup(user->ident);
+ this->server = user->server;
+ this->gecos = strdup(user->fullname);
+}
+
+WhoWasGroup::~WhoWasGroup()
+{
+ if (host)
+ free(host);
+ if (dhost)
+ free(dhost);
+ if (ident)
+ free(ident);
+ if (gecos)
+ free(gecos);
+}
+
/* adds or updates an entry in the whowas list */
void AddWhoWas(userrec* u)
{
- whowas_hash::iterator iter = whowas.find(u->nick);
- WhoWasUser *a = new WhoWasUser();
- strlcpy(a->nick,u->nick,NICKMAX-1);
- strlcpy(a->ident,u->ident,IDENTMAX);
- strlcpy(a->dhost,u->dhost,63);
- strlcpy(a->host,u->host,63);
- strlcpy(a->fullname,u->fullname,MAXGECOS);
- if (u->server)
- strlcpy(a->server,u->server,256);
- a->signon = u->signon;
-
- /* MAX_WHOWAS: max number of /WHOWAS items
- * WHOWAS_STALE: number of hours before a WHOWAS item is marked as stale and
- * can be replaced by a newer one
- */
-
- if (iter == whowas.end())
- {
- if (whowas.size() >= (unsigned)WHOWAS_MAX)
- {
- for (whowas_hash::iterator i = whowas.begin(); i != whowas.end(); i++)
- {
- // 3600 seconds in an hour ;)
- if ((i->second->signon)<(TIME-(WHOWAS_STALE*3600)))
- {
- // delete an old one
- if (i->second) delete i->second;
- whowas.erase(i);
- // replace with new one
- whowas[a->nick] = a;
- log(DEBUG,"added WHOWAS entry, purged an old record");
- return;
- }
- }
- // no space left and user doesnt exist. Don't leave ram in use!
- delete a;
- }
- else
- {
- log(DEBUG,"added fresh WHOWAS entry");
- whowas[a->nick] = a;
- }
- }
- else
- {
- log(DEBUG,"updated WHOWAS entry");
- if (iter->second) delete iter->second;
- iter->second = a;
- }
+ whowas_users::iterator iter = whowas.find(u->nick);
+ if (iter == whowas.end())
+ {
+ whowas_set* n = new whowas_set;
+ WhoWasGroup *a = new WhoWasGroup(u);
+ n->push_back(a);
+ whowas[u->nick] = n;
+ }
+ else
+ {
+ whowas_set* group = (whowas_set*)iter->second;
+ if (group->size() > 10)
+ {
+ WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
+ delete a;
+ group->pop_front();
+ }
+ WhoWasGroup *a = new WhoWasGroup(u);
+ group->push_back(a);
+ }
+}
+
+/* every hour, run this function which removes all entries over 3 days */
+void MaintainWhoWas(time_t TIME)
+{
+ for (whowas_users::iterator iter = whowas.begin(); iter != whowas.end(); iter++)
+ {
+ whowas_set* n = (whowas_set*)iter->second;
+ if (n->size())
+ {
+ while ((n->begin() != n->end()) && ((*n->begin())->signon < TIME - 259200)) // 3 days
+ {
+ WhoWasGroup *a = *(n->begin());
+ delete a;
+ n->erase(n->begin());
+ }
+ }
+ }
}
/* add a client connection to the sockets list */
clientlist[tempnick]->sendqmax = class_sqmax;
clientlist[tempnick]->recvqmax = class_rqmax;
- ucrec a;
- a.channel = NULL;
- a.uc_modes = 0;
- for (int i = 0; i < MAXCHANS; i++)
- clientlist[tempnick]->chans.push_back(a);
-
fd_ref_table[socket] = clientlist[tempnick];
local_users.push_back(clientlist[tempnick]);
}
}
}
-
projects / user / henk / code / inspircd.git / blobdiff