Mode +b stuff, probably wont work yet

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 41f1f097c23efcbef079202bc274a2353af999d1..87dfca4abc0c41cc3a5cb88d8c2e5f240433c778 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -416,7 +416,8 @@ void userrec::FlushWriteBuf()
                int n_sent = write(this->fd,tb,this->sendq.length());
                if (n_sent == -1)
                {
-                       this->SetWriteError(strerror(errno));
+                       if (errno != EAGAIN)
+                               this->SetWriteError(strerror(errno));
                }
                else
                {
@@ -480,7 +481,7 @@ void kill_link(userrec *user,const char* r)
        char reason[MAXBUF];
 
        strlcpy(reason,r,MAXQUIT-1);
-       log(DEBUG,"kill_link: %s '%s'",user->nick,reason);
+       log(DEBUG,"kill_link: %s %d '%s'",user->nick,user->fd,reason);
        
        if (IS_LOCAL(user))
                Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
@@ -730,7 +731,10 @@ void AddClient(int socket, int port, bool iscached, in_addr ip4)
                }
        }
 
-       ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
+       if (socket > -1)
+       {
+               ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
+       }
 
        WriteServ(clientlist[tempnick]->fd,"NOTICE Auth :*** Looking up your hostname...");
 }
@@ -807,7 +811,7 @@ void FullConnectUser(userrec* user, CullList* Goners)
                        return;
                }
                
-               r = matches_kline(user->host);
+               r = matches_kline(match_against);
                
                if (r)
                {