3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Fixed bug when using microsecond presition on PacketSender::recv_match_loop.

Browse Source
This commit is contained in:
Matias Fontanini
2012-03-19 17:16:35 -03:00
parent 937a4d66cc
commit 547a46f542
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/packetsender.cpp
View File

@@ -22,6 +22,7 @@
#ifndef WIN32
#include <sys/socket.h>
#include <sys/select.h>
#include <sys/time.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <linux/if_ether.h>
@@ -139,12 +140,12 @@ bool Tins::PacketSender::send_l3(PDU *pdu, struct sockaddr* link_addr, uint32_t
Tins::PDU *Tins::PacketSender::recv_match_loop(int sock, PDU *pdu, struct sockaddr* link_addr, socklen_t addrlen) {
fd_set readfds;
struct timeval timeout;
struct timeval timeout, end_time;
int read;
uint8_t buffer[2048];
time_t end_time = time(0) + _timeout;
timeout.tv_sec = _timeout;
timeout.tv_usec = _timeout_usec;
end_time.tv_sec = time(0) + _timeout;
end_time.tv_usec = timeout.tv_usec = _timeout_usec;
while(true) {
FD_ZERO(&readfds);
FD_SET(sock, &readfds);
@@ -155,10 +156,12 @@ Tins::PDU *Tins::PacketSender::recv_match_loop(int sock, PDU *pdu, struct sockad
if(pdu->matches_response(buffer, size))
return pdu->clone_packet(buffer, size);
}
time_t this_time = time(0);
if(end_time <= this_time)
struct timeval this_time;
gettimeofday(&this_time, 0);
if(end_time.tv_sec <= this_time.tv_sec && end_time.tv_usec <= this_time.tv_usec)
return 0;
timeout.tv_sec = end_time - this_time;
timeout.tv_sec = end_time.tv_sec - this_time.tv_sec;
timeout.tv_usec = end_time.tv_usec;
}
return 0;
}