Moved some other stuff into ServerConfig

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 36b6d1d1e52d1793e3e087e719f5bece70e31a44..420c29f6ff6700789edc8f006728073d9595bb62 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -35,13 +35,15 @@ using namespace std;
 #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 time_t TIME;
-extern bool unlimitcore;
-extern int MaxConn;
+
+InspSocket* socket_ref[65535];
 
 InspSocket::InspSocket()
 {
@@ -53,6 +55,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);
+       socket_ref[this->fd] = this;
 }
 
 InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
@@ -80,6 +84,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);
+                               socket_ref[this->fd] = this;
                                log(DEBUG,"New socket now in I_LISTENING state");
                                return;
                        }
@@ -126,6 +132,8 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                         }
                 }
                 this->state = I_CONNECTING;
+               SE->AddFd(this->fd,false,X_ESTAB_MODULE);
+               socket_ref[this->fd] = this;
                 return;
        }
 }
@@ -137,6 +145,7 @@ void InspSocket::Close()
                this->OnClose();
                shutdown(this->fd,2);
                close(this->fd);
+               socket_ref[this->fd] = NULL;
                this->fd = -1;
        }
 }
@@ -188,9 +197,9 @@ int InspSocket::Write(std::string data)
        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
@@ -198,37 +207,41 @@ bool InspSocket::Poll()
                // connection.
                this->OnTimeout();
                this->OnError(I_ERR_TIMEOUT);
-               timeout = true;
+               timeout = true;
                this->state = I_ERROR;
-               return false;
+               return true;
        }
-        polls.fd = this->fd;
-       state == I_CONNECTING ? polls.events = POLLOUT : polls.events = POLLIN;
-       int ret = poll(&polls,1,1);
+       return false;
+}
 
-        if (ret > 0)
+bool InspSocket::Poll()
+{
+       int incoming = -1;
+       
+       switch (this->state)
        {
-               int incoming = -1;
-               
-               switch (this->state)
-               {
-                       case I_CONNECTING:
-                               this->SetState(I_CONNECTED);
-                               return this->OnConnected();
-                       break;
-                       case I_LISTENING:
-                               length = sizeof (client);
-                               incoming = accept (this->fd, (sockaddr*)&client,&length);
-                               this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
-                               return true;
-                       break;
-                       case I_CONNECTED:
-                               return this->OnDataReady();
-                       break;
-                       default:
-                       break;
-               }
+               case I_CONNECTING:
+                       this->SetState(I_CONNECTED);
+                       /* 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);
+                       return this->OnConnected();
+               break;
+               case I_LISTENING:
+                       length = sizeof (client);
+                       incoming = accept (this->fd, (sockaddr*)&client,&length);
+                       this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
+                       return true;
+               break;
+               case I_CONNECTED:
+                       return this->OnDataReady();
+               break;
+               default:
+               break;
        }
+
        return true;
 }
 
@@ -243,6 +256,11 @@ InspSocketState InspSocket::GetState()
        return this->state;
 }
 
+int InspSocket::GetFd()
+{
+       return this->fd;
+}
+
 bool InspSocket::OnConnected() { return true; }
 void InspSocket::OnError(InspSocketError e) { return; }
 int InspSocket::OnDisconnect() { return 0; }