Added module sockets to new engine, MAY NOT WORK

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

diff --git a/src/socket.cpp b/src/socket.cpp
index aa028b8a587019d3f24a649dd51eb89eac9c2bd6..f441ddb552d5a6ead6c2852052a0d0441d3bf3c8 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -35,6 +35,9 @@ 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;
@@ -48,10 +51,12 @@ InspSocket::InspSocket()
        this->state = I_DISCONNECTED;
 }
 
-InspSocket::InspSocket(int newfd)
+InspSocket::InspSocket(int newfd, char* ip)
 {
        this->fd = newfd;
        this->state = I_CONNECTED;
+       this->IP = ip;
+       SE->AddFd(this->fd,true,X_ESTAB_MODULE);
 }
 
 InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long maxtime)
@@ -79,6 +84,7 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                        else
                        {
                                this->state = I_LISTENING;
+                               SE->AddFd(this->fd,true,X_ESTAB_MODULE);
                                log(DEBUG,"New socket now in I_LISTENING state");
                                return;
                        }
@@ -125,6 +131,7 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                         }
                 }
                 this->state = I_CONNECTING;
+               SE->AddFd(this->fd,false,X_ESTAB_MODULE);
                 return;
        }
 }
@@ -201,33 +208,33 @@ bool InspSocket::Poll()
                this->state = I_ERROR;
                return false;
        }
-        polls.fd = this->fd;
-       state == I_CONNECTING ? polls.events = POLLOUT : polls.events = POLLIN;
-       int ret = poll(&polls,1,1);
 
-        if (ret > 0)
+       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);
+                       return this->OnConnected();
+                       /* 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);
+               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;
 }
 
@@ -242,6 +249,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; }