]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/socket.cpp
Allow ulines to still notice the channel regardless of +T
[user/henk/code/inspircd.git] / src / socket.cpp
index 2b6f84cd35d3637856008c35d4d08ad56a29e0b9..160f0f652dd04a8c6774a3f13d4546c7ecf6c67a 100644 (file)
@@ -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>
@@ -25,31 +25,68 @@ using namespace std;
 #include <string>
 #include <unistd.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <sstream>
 #include <iostream>
 #include <fstream>
 #include "socket.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
+#include "socketengine.h"
 
-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()
 {
        this->state = I_DISCONNECTED;
 }
 
+InspSocket::InspSocket(int newfd, char* ip)
+{
+       this->fd = newfd;
+       this->state = I_CONNECTED;
+       this->IP = ip;
+       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)
 {
        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;
+                               ServerInstance->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;
@@ -61,11 +98,14 @@ 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)
                {
                        this->state = I_ERROR;
+                       this->OnError(I_ERR_SOCKET);
                         return;
                }
                this->port = port;
@@ -82,52 +122,164 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
                 {
                         if (errno != EINPROGRESS)
                         {
-                                shutdown(this->fd,2);
-                                close(this->fd);
-                                this->fd = -1;
+                               this->Close();
+                               this->OnError(I_ERR_CONNECT);
                                this->state = I_ERROR;
                                 return;
                         }
                 }
                 this->state = I_CONNECTING;
+               ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
+               socket_ref[this->fd] = this;
                 return;
        }
 }
 
-void InspSocket::EngineTrigger()
+void InspSocket::Close()
+{
+       if (this->fd != -1)
+       {
+               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
+       {
+               if (n == EAGAIN)
+               {
+                       return "";
+               }
+               else
+               {
+                       log(DEBUG,"EOF or error on socket");
+                       return NULL;
+               }
+       }
+}
+
+// There are two possible outcomes to this function.
+// It will either write all of the data, or an undefined amount.
+// If an undefined amount is written the connection has failed
+// and should be aborted.
+int InspSocket::Write(std::string data)
+{
+       this->Buffer = this->Buffer + data;
+       this->FlushWriteBuffer();
+       return data.length();
+}
+
+void InspSocket::FlushWriteBuffer()
+{
+       int result = 0;
+       if (this->Buffer.length())
+       {
+               result = send(this->fd,this->Buffer.c_str(),this->Buffer.length(),0);
+               if (result > 0)
+               {
+                       /* If we wrote some, advance the buffer forwards */
+                       char* n = (char*)this->Buffer.c_str();
+                       n += result;
+                       this->Buffer = n;
+               }
+       }
+}
+
+bool InspSocket::Timeout(time_t current)
 {
+       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->OnError(I_ERR_TIMEOUT);
+               timeout = true;
+               this->state = I_ERROR;
+               return true;
+       }
+       if (this->Buffer.length())
+               this->FlushWriteBuffer();
+       return false;
+}
+
+bool InspSocket::Poll()
+{
+       int incoming = -1;
+       
        switch (this->state)
        {
                case I_CONNECTING:
-                       this->OnConnected();
+                       this->SetState(I_CONNECTED);
+                       /* Our socket was in write-state, so delete it and re-add it
+                        * in read-state.
+                        */
+                       ServerInstance->SE->DelFd(this->fd);
+                       ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE);
+                       return this->OnConnected();
                break;
                case I_LISTENING:
-                       this->OnIncomingConnection();
+                       length = sizeof (client);
+                       incoming = accept (this->fd, (sockaddr*)&client,&length);
+                       this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
+                       return true;
                break;
                case I_CONNECTED:
-                       this->OnDataReady();
+                       return this->OnDataReady();
                break;
                default:
                break;
        }
+
+       if (this->Buffer.length())
+               this->FlushWriteBuffer();
+
+       return true;
 }
 
 void InspSocket::SetState(InspSocketState s)
 {
+       log(DEBUG,"Socket state change");
        this->state = s;
 }
 
-int InspSocket::OnConnected() { return 0; }
-int InspSocket::OnError() { return 0; }
+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::OnDataReady() { return 0; }
+int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
+bool InspSocket::OnDataReady() { return true; }
+void InspSocket::OnTimeout() { return; }
+void InspSocket::OnClose() { return; }
 
 InspSocket::~InspSocket()
 {
+       this->Close();
 }
 
-/*
-int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server, int port, char* addr)
-int OpenTCPSocket (void)
-*/