From 2dc004eceb5c1ede5f468f21349f961212b5050d Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Thu, 22 Mar 2012 23:36:23 -0300 Subject: [PATCH] Modified PacketSender::recv_match_loop timeout handling. --- src/packetsender.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/packetsender.cpp b/src/packetsender.cpp index 1f0c2d6..b4e0496 100644 --- a/src/packetsender.cpp +++ b/src/packetsender.cpp @@ -148,16 +148,18 @@ Tins::PDU *Tins::PacketSender::recv_match_loop(int sock, PDU *pdu, struct sockad while(true) { FD_ZERO(&readfds); FD_SET(sock, &readfds); - if((read = select(sock + 1, &readfds, 0, 0, &timeout)) == -1) + if((read = select(sock + 1, &readfds, 0, 0, &timeout)) == -1) { return 0; + } if(FD_ISSET(sock, &readfds)) { ssize_t size = recvfrom(sock, buffer, 2048, 0, link_addr, &addrlen); - if(pdu->matches_response(buffer, size)) + if(pdu->matches_response(buffer, size)) { return pdu->clone_packet(buffer, size); + } } struct timeval this_time, diff; gettimeofday(&this_time, 0); - if(timeval_subtract(&diff, &this_time, &end_time)) { + if(timeval_subtract(&diff, &end_time, &this_time)) { return 0; } timeout.tv_sec = diff.tv_sec;