Allow ulines to still notice the channel regardless of +T

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 4e8c88663ac5604e99811fb93e160cf2d7954b8c..160f0f652dd04a8c6774a3f13d4546c7ecf6c67a 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -32,19 +32,15 @@ using namespace std;
 #include "socket.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "socketengine.h"
 
-extern SocketEngine* SE;
 
-extern FILE *log_file;
-extern int boundPortCount;
-extern int openSockfd[MAXSOCKS];
+extern InspIRCd* ServerInstance;
 extern time_t TIME;
-extern bool unlimitcore;
-extern int MaxConn;
+
+InspSocket* socket_ref[MAX_DESCRIPTORS];
 
 InspSocket::InspSocket()
 {
@@ -56,7 +52,8 @@ InspSocket::InspSocket(int newfd, char* ip)
        this->fd = newfd;
        this->state = I_CONNECTED;
        this->IP = ip;
-       SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+       ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+       socket_ref[this->fd] = this;
 }
 
 InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
@@ -84,7 +81,8 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                        else
                        {
                                this->state = I_LISTENING;
-                               SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+                               ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+                               socket_ref[this->fd] = this;
                                log(DEBUG,"New socket now in I_LISTENING state");
                                return;
                        }
@@ -131,7 +129,8 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                         }
                 }
                 this->state = I_CONNECTING;
-               SE->AddFd(this->fd,false,X_ESTAB_MODULE);
+               ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
+               socket_ref[this->fd] = this;
                 return;
        }
 }
@@ -143,6 +142,7 @@ void InspSocket::Close()
                this->OnClose();
                shutdown(this->fd,2);
                close(this->fd);
+               socket_ref[this->fd] = NULL;
                this->fd = -1;
        }
 }
@@ -162,8 +162,15 @@ char* InspSocket::Read()
        }
        else
        {
-               log(DEBUG,"EOF or error on socket");
-               return NULL;
+               if (n == EAGAIN)
+               {
+                       return "";
+               }
+               else
+               {
+                       log(DEBUG,"EOF or error on socket");
+                       return NULL;
+               }
        }
 }
 
@@ -173,30 +180,30 @@ char* InspSocket::Read()
 // and should be aborted.
 int InspSocket::Write(std::string data)
 {
-       char* d = (char*)data.c_str();
-       unsigned int written = 0;
-       int n = 0;
-       int s = data.length();
-       while ((written < data.length()) && (n >= 0))
+       this->Buffer = this->Buffer + data;
+       this->FlushWriteBuffer();
+       return data.length();
+}
+
+void InspSocket::FlushWriteBuffer()
+{
+       int result = 0;
+       if (this->Buffer.length())
        {
-               n = send(this->fd,d,s,0);
-               if (n > 0)
+               result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
+               if (result > 0)
                {
-                       // If we didnt write everything, advance
-                       // the pointers so that when we retry
-                       // the next time around the loop, we try
-                       // to write what we failed to write before.
-                       written += n;
-                       s -= n;
-                       d += n;
+                       /* If we wrote some, advance the buffer forwards */
+                       char* n = (char*)this->Buffer.c_str();
+                       n += result;
+                       this->Buffer = n;
                }
        }
-       return written;
 }
 
-bool InspSocket::Poll()
+bool InspSocket::Timeout(time_t current)
 {
-       if ((time(NULL) > timeout_end) && (this->state == I_CONNECTING))
+       if ((this->state == I_CONNECTING) && (current > timeout_end))
        {
                // for non-listening sockets, the timeout can occur
                // which causes termination of the connection after
@@ -204,11 +211,17 @@ bool InspSocket::Poll()
                // connection.
                this->OnTimeout();
                this->OnError(I_ERR_TIMEOUT);
-               timeout = true;
+               timeout = true;
                this->state = I_ERROR;
-               return false;
+               return true;
        }
+       if (this->Buffer.length())
+               this->FlushWriteBuffer();
+       return false;
+}
 
+bool InspSocket::Poll()
+{
        int incoming = -1;
        
        switch (this->state)
@@ -218,8 +231,8 @@ bool InspSocket::Poll()
                        /* Our socket was in write-state, so delete it and re-add it
                         * in read-state.
                         */
-                       SE->DelFd(this->fd);
-                       SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+                       ServerInstance->SE->DelFd(this->fd);
+                       ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
                        return this->OnConnected();
                break;
                case I_LISTENING:
@@ -235,6 +248,9 @@ bool InspSocket::Poll()
                break;
        }
 
+       if (this->Buffer.length())
+               this->FlushWriteBuffer();
+
        return true;
 }
 
@@ -267,7 +283,3 @@ InspSocket::~InspSocket()
        this->Close();
 }
 
-/*
-int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr)
-int OpenTCPSocket (void)
-*/