Inspire -> InspIRCd

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 9bc2f09e38772b885c6b724dd2c57565edc44688..550783aed5a7154a580ff8a0e5744c5ce351ce1e 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -38,6 +38,7 @@ using namespace std;
 
 
 extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
 extern time_t TIME;
 
 InspSocket* socket_ref[MAX_DESCRIPTORS];
@@ -91,34 +92,53 @@ InspSocket::InspSocket(std::string host, int port, bool listening, unsigned long
        else
        {
                this->host = host;
+               this->port = port;
 
                if (!inet_aton(host.c_str(),&addy))
                {
+                       log(DEBUG,"Attempting to resolve %s",this->host.c_str());
                        /* Its not an ip, spawn the resolver */
+                       this->dns.SetNS(std::string(Config->DNSServer));
                        this->dns.ForwardLookupWithFD(host,fd);
-                       timeout_end = time(NULL)+maxtime;
+                       timeout_end = time(NULL)+maxtime;
                        timeout = false;
                        this->state = I_RESOLVING;
+                       socket_ref[this->fd] = this;
                }
                else
                {
+                       log(DEBUG,"No need to resolve %s",this->host.c_str());
                        this->IP = host;
                        this->DoConnect();
                }
        }
 }
 
+void InspSocket::SetQueues(int nfd)
+{
+        // attempt to increase socket sendq and recvq as high as its possible
+       int sendbuf = 32768;
+       int recvbuf = 32768;
+       setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const void *)&sendbuf,sizeof(sendbuf));
+       setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf));
+}
+
 bool InspSocket::DoResolve()
 {
+       log(DEBUG,"In DoResolve(), trying to resolve IP");
        if (this->dns.HasResult())
        {
+               log(DEBUG,"Socket has result");
                std::string res_ip = dns.GetResultIP();
                if (res_ip != "")
                {
+                       log(DEBUG,"Socket result set to %s",res_ip.c_str());
                        this->IP = res_ip;
+                       socket_ref[this->fd] = NULL;
                }
                else
                {
+                       log(DEBUG,"Socket DNS failure");
                        this->Close();
                        this->state = I_ERROR;
                        this->OnError(I_ERR_RESOLVE);
@@ -126,19 +146,22 @@ bool InspSocket::DoResolve()
                }
                return this->DoConnect();
        }
-       else return true;
+       log(DEBUG,"No result for socket yet!");
+       return true;
 }
 
 bool InspSocket::DoConnect()
 {
+       log(DEBUG,"In DoConnect()");
        if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
        {
+               log(DEBUG,"Cant socket()");
                this->state = I_ERROR;
                this->OnError(I_ERR_SOCKET);
                return false;
        }
 
-       this->port = port;
+       log(DEBUG,"Part 2 DoConnect() %s",this->IP.c_str());
        inet_aton(this->IP.c_str(),&addy);
        addr.sin_family = AF_INET;
        addr.sin_addr = addy;
@@ -152,15 +175,17 @@ bool InspSocket::DoConnect()
        {
                if (errno != EINPROGRESS)
                {
-                       this->Close();
+                       log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
                        this->OnError(I_ERR_CONNECT);
                        this->state = I_ERROR;
+                       this->Close();
                        return false;
                }
        }
        this->state = I_CONNECTING;
        ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
        socket_ref[this->fd] = this;
+       this->SetQueues(this->fd);
        return true;
 }
 
@@ -210,8 +235,7 @@ char* InspSocket::Read()
 // and should be aborted.
 int InspSocket::Write(std::string data)
 {
-       this->Buffer = this->Buffer + data;
-       this->FlushWriteBuffer();
+       this->Buffer.append(data);
        return data.length();
 }
 
@@ -223,10 +247,17 @@ void InspSocket::FlushWriteBuffer()
                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;
+                       if (result == (int)this->Buffer.length())
+                       {
+                               this->Buffer = "";
+                       }
+                       else
+                       {
+                               /* If we wrote some, advance the buffer forwards */
+                               char* n = (char*)this->Buffer.c_str();
+                               n += result;
+                               this->Buffer = n;
+                       }
                }
        }
 }
@@ -245,21 +276,23 @@ bool InspSocket::Timeout(time_t current)
                this->state = I_ERROR;
                return true;
        }
-       if (this->Buffer.length())
-               this->FlushWriteBuffer();
+       this->FlushWriteBuffer();
        return false;
 }
 
 bool InspSocket::Poll()
 {
        int incoming = -1;
+       bool n = true;
        
        switch (this->state)
        {
                case I_RESOLVING:
+                       log(DEBUG,"State = I_RESOLVING, calling DoResolve()");
                        return this->DoResolve();
                break;
                case I_CONNECTING:
+                       log(DEBUG,"State = I_CONNECTED");
                        this->SetState(I_CONNECTED);
                        /* Our socket was in write-state, so delete it and re-add it
                         * in read-state.
@@ -271,19 +304,20 @@ bool InspSocket::Poll()
                case I_LISTENING:
                        length = sizeof (client);
                        incoming = accept (this->fd, (sockaddr*)&client,&length);
+                       this->SetQueues(incoming);
                        this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr));
                        return true;
                break;
                case I_CONNECTED:
-                       return this->OnDataReady();
+                       n = this->OnDataReady();
+                       /* Flush any pending, but not till after theyre done with the event
+                        * so there are less write calls involved. */
+                       this->FlushWriteBuffer();
+                       return n;
                break;
                default:
                break;
        }
-
-       if (this->Buffer.length())
-               this->FlushWriteBuffer();
-
        return true;
 }