Fixes

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

diff --git a/src/connection.cpp b/src/connection.cpp
index 1296e7d93ec1397b50de06337f559f2492db7306..3c743d233bad4ec3df752f1a4e503e64c5be396d 100644 (file)
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -4,6 +4,8 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
+#include <errno.h>
+#include <vector>
 #include "inspircd.h"
 #include "modules.h"
 
@@ -128,18 +130,18 @@ bool connection::SendPacket(char *message, char* host, int port, long ourkey)
        // returns false if the packet could not be sent (e.g. target host down)
        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));
+               log(DEBUG,"sendto() failed for Connection::SendPacket() with a packet of size %d: %s",sizeof(p),strerror(errno));
                return false;
        }
        this->state = STATE_WAIT_FOR_ACK;
 
 
-       socklen_t host_address_size;
        // 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);
        
@@ -149,23 +151,40 @@ bool connection::SendPacket(char *message, char* host, int port, long ourkey)
                // 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))
+               do 
                {
                        fd_set sfd;
                        timeval tval;
-                       tval.tv_usec = 10;
+                       tval.tv_usec = 100;
                        tval.tv_sec = 0;
                        FD_ZERO(&sfd);
                        FD_SET(fd,&sfd);
                        int res = select(65535, &sfd, NULL, NULL, &tval);
                        cycles++;
                }
+               while ((recvfrom(fd,&p2,sizeof(p2),0,(sockaddr*)&host_address,&host_address_size)<0) && (cycles < 10));
+               
                if (cycles >= 10)
                {
-                       log(DEFAULT,"ERROR! connection::SendPacket() waited >100 nanosecs for an ACK. Will resend up to 5 times");
+                       log(DEFAULT,"ERROR! connection::SendPacket() waited >10000 nanosecs for an ACK. Will resend up to 5 times");
                }
                else
                {
+                       if (p2.type != PT_ACK_ONLY)
+                       {
+                               packet_buf pb;
+                               pb.p.id = p.id;
+                               pb.p.key = p.key;
+                               pb.p.type = p.type;
+                               strcpy(pb.host,inet_ntoa(host_address.sin_addr));
+                               pb.port = ntohs(host_address.sin_port);
+                               this->buffer.push_back(pb);
+                               
+                               log(DEFAULT,"ERROR! connection::SendPacket() received a data response and was expecting an ACK!!!");
+                               this->state = STATE_CLEAR;
+                               return true;
+                       }
+
                        if (p2.id != p.id)
                        {
                                log(DEFAULT,"ERROR! connection::SendPacket() received an ack for a packet it didnt send!");
@@ -282,12 +301,26 @@ bool connection::RecvPacket(char *message, char* host, int &prt, long &theirkey)
        host_address.sin_family=AF_INET;
        host_address_size=sizeof(host_address);
 
+       //int recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
        if (recvfrom(fd,&p,sizeof(p),0,(sockaddr*)&host_address,&host_address_size)<0)
        {
+               if (this->buffer.size() != -1)
+               {
+                       log(DEBUG,"Fetching a buffered packet");
+
+                       strcpy(message,buffer[0].p.data);
+                       theirkey = buffer[0].p.key;
+                       strcpy(host,buffer[0].host);
+                       prt = buffer[0].port;
+                       
+                       buffer.erase(0);
+                       
+                       return true;
+               }
                return false;
        }
 
-       log(DEBUG,"connection::RecvPacket(): received packet type %d '%s'",p.type,p.data);
+       log(DEBUG,"connection::RecvPacket(): received packet type %d '%s' from '%s'",p.type,p.data,inet_ntoa(host_address.sin_addr));
 
        if (p.type == PT_SYN_ONLY)
        {
@@ -312,8 +345,28 @@ bool connection::RecvPacket(char *message, char* host, int &prt, long &theirkey)
                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);
+               prt = ntohs(host_address.sin_port); // the port we received it on
+               SendACK(host,prt,p.id);
+
+               if (this->buffer.size() != -1)
+               {
+                       log(DEBUG,"Fetching a buffered packet");
+                       packet_buf pb;
+                       pb.p.id = p.id;
+                       pb.p.key = p.key;
+                       pb.p.type = p.type;
+                       strcpy(pb.host,inet_ntoa(host_address.sin_addr));
+                       pb.port = ntohs(host_address.sin_port);
+                       this->buffer.push_back(pb);
+
+                       strcpy(message,buffer[0].p.data);
+                       theirkey = buffer[0].p.key;
+                       strcpy(host,buffer[0].host);
+                       prt = buffer[0].port;
+                       
+                       buffer.erase(0);
+               }
+
                return true;
        }