More fixes

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

diff --git a/src/connection.cpp b/src/connection.cpp
index 33eb405ade0c02f75ce1876bc1c5c8d7076e90ca..3adaf0d08df612eda0db835d8c8bcbb88aec52ca 100644 (file)
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -12,6 +12,9 @@ extern std::vector<ircd_module*> factory;
 
 extern int MODCOUNT;
 
+#define STATE_CLEAR 1
+#define STATE_WAIT_FOR_ACK 2
+
 packet::packet()
 {
        srand(time(NULL));
@@ -26,6 +29,7 @@ connection::connection()
 {
        key = GenKey();
        fd = 0;
+       state = STATE_CLEAR;
 }
 
 
@@ -86,8 +90,7 @@ bool connection::BeginLink(char* targethost, int port, char* password)
        {
                sprintf(connect,"S %s %s :%s",getservername().c_str(),password,getserverdesc().c_str());
                this->haspassed = false;
-               this->SendPacket(connect, targethost, port);
-               return true;
+               return this->SendPacket(connect, targethost, port, 0);
        }
        return false;
 }
@@ -99,7 +102,7 @@ void connection::TerminateLink(char* targethost)
 
 // host: in dot notation a.b.c.d
 // port: host byte order
-bool connection::SendPacket(char *message, char* host, int port)
+bool connection::SendPacket(char *message, char* host, int port, long ourkey)
 {
        sockaddr_in host_address;
        in_addr addy;
@@ -115,17 +118,72 @@ bool connection::SendPacket(char *message, char* host, int port)
 
        strcpy(p.data,message);
        p.type = PT_SYN_WITH_DATA;
-       p.key = key;
+       p.key = ourkey;
+
 
+       FOREACH_MOD OnPacketTransmit(p.data);
 
-    FOREACH_MOD OnPacketTransmit(p.data);
+       log(DEBUG,"main: Connection::SendPacket() sent '%s' to %s:%d",p.data,host,port);
 
        // returns false if the packet could not be sent (e.g. target host down)
-       if (sendto(fd,&p,sizeof(p),0,(sockaddr*)&host_address,sizeof(host_address))<0)
+       if (sendto(this->fd,&p,sizeof(p),0,(sockaddr*)&host_address,sizeof(host_address))<0)
        {
+               log(DEBUG,"sendto() failed for Connection::SendPacket() with a packet of size %d",sizeof(p));
                return false;
        }
-       return true;
+       this->state = STATE_WAIT_FOR_ACK;
+
+
+       // host_address remains unchanged. we only want to receive from where we just sent the packet to.
+       
+       // retry the packet up to 5 times
+       for (int retries = 0; retries < 5; retries++)
+       {
+               socklen_t host_address_size;
+               host_address.sin_family=AF_INET;
+               host_address_size=sizeof(host_address);
+       
+               // wait for ack, or timeout.
+               // if reached a timeout, send again.
+               // the packet id in the ack must match that in the original packet
+               // this MUST operate in lock/step fashion!!!
+               int cycles = 0;
+               packet p2;
+               while ((recvfrom(fd,&p2,sizeof(p2),0,(sockaddr*)&host_address,&host_address_size)<0) && (cycles < 10))
+               {
+                       fd_set sfd;
+                       timeval tval;
+                       tval.tv_usec = 100;
+                       tval.tv_sec = 0;
+                       FD_ZERO(&sfd);
+                       FD_SET(fd,&sfd);
+                       int res = select(65535, &sfd, NULL, NULL, &tval);
+                       cycles++;
+               }
+               if (cycles >= 10)
+               {
+                       log(DEFAULT,"ERROR! connection::SendPacket() waited >1000 nanosecs for an ACK. Will resend up to 5 times");
+               }
+               else
+               {
+                       if (p2.id != p.id)
+                       {
+                               log(DEFAULT,"ERROR! connection::SendPacket() received an ack for a packet it didnt send!");
+                               this->state = STATE_CLEAR;
+                               return false;
+                       }
+                       else
+                       {
+                               log(DEFAULT,"Successfully received ACK");
+                               this->state = STATE_CLEAR;
+                               return true;
+                               break;
+                       }
+               }
+       }
+       log(DEFAULT,"We never received an ack. Something fishy going on, host is dead.");
+       this->state = STATE_CLEAR;
+       return false;
 
 }
 
@@ -178,7 +236,6 @@ bool connection::SendACK(char* host, int port, int reply_id)
        {
                return false;
        }
-       return true;
 
 }
 
@@ -213,7 +270,7 @@ long connection::GenKey()
 
 // host: in dot notation a.b.c.d
 // port: host byte order
-bool connection::RecvPacket(char *message, char* host, int &prt)
+bool connection::RecvPacket(char *message, char* host, int &prt, long &theirkey)
 {
        // returns false if no packet waiting for receive, e.g. EAGAIN or ECONNRESET
        sockaddr_in host_address;
@@ -230,6 +287,8 @@ bool connection::RecvPacket(char *message, char* host, int &prt)
                return false;
        }
 
+       log(DEBUG,"connection::RecvPacket(): received packet type %d '%s'",p.type,p.data);
+
        if (p.type == PT_SYN_ONLY)
        {
                strcpy(message,p.data);
@@ -244,6 +303,7 @@ bool connection::RecvPacket(char *message, char* host, int &prt)
                strcpy(message,p.data);
                strcpy(host,inet_ntoa(host_address.sin_addr));
                prt = ntohs(host_address.sin_port);
+               this->state = STATE_CLEAR;
                return false;
        }
 
@@ -251,10 +311,13 @@ bool connection::RecvPacket(char *message, char* host, int &prt)
        {
                strcpy(message,p.data);
                strcpy(host,inet_ntoa(host_address.sin_addr));
+               theirkey = p.key;
                prt = ntohs(host_address.sin_port);
                SendACK(host,this->port,p.id);
+               return true;
        }
 
+       log(DEBUG,"connection::RecvPacket(): Invalid packet type %d (protocol error)",p.type);
        return true;
 }