ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-12 12:09:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tidyups, remove of ifdefs

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7597 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2007-07-27 18:11:03 +00:00
parent f017306e4e
commit d59b89205e
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/inspsocket.cpp
View File

@ -552,19 +552,16 @@ void SocketTimeout::Tick(time_t now)
bool InspSocket::Poll()
{
#ifdef WINDOWS
if(Instance->SE->GetRef(this->fd) != this)
return false;
int incoming = -1;
#else
if (this->Instance->SE->GetRef(this->fd) != this)
return false;
int incoming = -1;
if ((fd < 0) || (fd > MAX_DESCRIPTORS))
#ifndef WINDOWS
if (!Instance->SE->BoundsCheckFd(this))
return false;
#endif
if (Instance->SE->GetRef(this->fd) != this)
return false;
switch (this->state)
{
case I_CONNECTING:
@ -575,14 +572,12 @@ bool InspSocket::Poll()
if (this->fd > -1)
{
this->Instance->SE->DelFd(this);
this->SetState(I_CONNECTED);
if (!this->Instance->SE->AddFd(this))
return false;
}
#else
this->SetState(I_CONNECTED);
#endif
Instance->Log(DEBUG,"Inspsocket I_CONNECTING state");
this->SetState(I_CONNECTED);
if (Instance->Config->GetIOHook(this))
{
Instance->Log(DEBUG,"Hook for raw connect");

3
src/users.cpp
View File

@ -1036,7 +1036,6 @@ void userrec::CheckClass()
void userrec::FullConnect()
{
ServerInstance->Log(DEBUG,"FullConnect");
ServerInstance->stats->statsConnects++;
this->idle_lastmsg = ServerInstance->Time();
@ -1117,8 +1116,6 @@ void userrec::FullConnect()
FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString(), this->fullname);
ServerInstance->Log(DEBUG,"Exit FullConnect");
}
/** userrec::UpdateNick()