#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/utsname.h>
+#include <errno.h>
+#include <vector>
#include "inspircd.h"
#include "modules.h"
key = GenKey();
fd = 0;
state = STATE_CLEAR;
+ buffer.clear();
}
this->port = p;
- setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,(const char*)&on,sizeof(on));
- linger.l_onoff = 1;
- linger.l_linger = 0;
- setsockopt(fd,SOL_SOCKET,SO_LINGER,(const char*)&linger,sizeof(linger));
+ setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,(const char*)&on,sizeof(on));
+ linger.l_onoff = 1;
+ linger.l_linger = 0;
+ setsockopt(fd,SOL_SOCKET,SO_LINGER,(const char*)&linger,sizeof(linger));
+ buffer.clear();
+
return true;
}
// 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;
-
- // 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;
- do
- {
- 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++;
- }
- 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 >10000 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;
+ return true;
+ break;
}
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)
{
return false;