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 cb019a3c2dbd1e255e4de882cb9fb828e360e18a..420c29f6ff6700789edc8f006728073d9595bb62 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -35,22 +35,61 @@ 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()
 {
        this->state = I_DISCONNECTED;
 }
 
+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)
 {
        if (listening) {
+               if ((this->fd = OpenTCPSocket()) == ERROR)
+               {
+                       this->fd = -1;
+                       this->state = I_ERROR;
+                       this->OnError(I_ERR_SOCKET);
+                       log(DEBUG,"OpenTCPSocket() error");
+                        return;
+               }
+               else
+               {
+                       if (BindSocket(this->fd,this->client,this->server,port,(char*)host.c_str()) == ERROR)
+                       {
+                               this->Close();
+                               this->fd = -1;
+                               this->state = I_ERROR;
+                               this->OnError(I_ERR_BIND);
+                               log(DEBUG,"BindSocket() error %s",strerror(errno));
+                               return;
+                       }
+                       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;
+                       }
+               }                       
        } else {
                char* ip;
                this->host = host;
@@ -62,6 +101,8 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                        ip = inet_ntoa(*ia);
                }
 
+               this->IP = ip;
+
                 timeout_end = time(NULL)+maxtime;
                 timeout = false;
                 if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
@@ -91,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;
        }
 }
@@ -102,19 +145,27 @@ void InspSocket::Close()
                this->OnClose();
                shutdown(this->fd,2);
                close(this->fd);
+               socket_ref[this->fd] = NULL;
                this->fd = -1;
        }
 }
 
+std::string InspSocket::GetIP()
+{
+       return this->IP;
+}
+
 char* InspSocket::Read()
 {
        int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
        if (n > 0)
        {
+               ibuf[n] = 0;
                return ibuf;
        }
        else
        {
+               log(DEBUG,"EOF or error on socket");
                return NULL;
        }
 }
@@ -146,37 +197,49 @@ int InspSocket::Write(std::string data)
        return written;
 }
 
-bool InspSocket::Poll()
+bool InspSocket::Timeout(time_t current)
 {
-       if (time(NULL) > timeout_end)
+       if ((this->state == I_CONNECTING) && (current > timeout_end))
        {
+               // for non-listening sockets, the timeout can occur
+               // which causes termination of the connection after
+               // the given number of seconds without a successful
+               // connection.
                this->OnTimeout();
-               this->Close();
                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)
        {
-               switch (this->state)
-               {
-                       case I_CONNECTING:
-                               return this->OnConnected();
-                       break;
-                       case I_LISTENING:
-                               this->OnIncomingConnection();
-                       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;
@@ -184,13 +247,24 @@ bool InspSocket::Poll()
 
 void InspSocket::SetState(InspSocketState s)
 {
+       log(DEBUG,"Socket state change");
        this->state = s;
 }
 
+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; }
-int InspSocket::OnIncomingConnection() { return 0; }
+int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
 bool InspSocket::OnDataReady() { return true; }
 void InspSocket::OnTimeout() { return; }
 void InspSocket::OnClose() { return; }