From 1cec0f106df1bfad0ebbebec5b76186f4d43bd69 Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Sat, 14 Dec 2013 12:49:50 -0300 Subject: [PATCH] Fixed bug in PacketSender when using send_recv and a layer 2 PDU. The interface in which the packet was sent was not the default_interface set when the sender was constructed. --- src/packet_sender.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/packet_sender.cpp b/src/packet_sender.cpp index 741a9a0..f10a2ea 100644 --- a/src/packet_sender.cpp +++ b/src/packet_sender.cpp @@ -252,7 +252,7 @@ void PacketSender::send(PDU &pdu, const NetworkInterface &iface) { } PDU *PacketSender::send_recv(PDU &pdu) { - return send_recv(pdu, NetworkInterface()); + return send_recv(pdu, default_iface); } PDU *PacketSender::send_recv(PDU &pdu, const NetworkInterface &iface) { @@ -313,9 +313,8 @@ PDU *PacketSender::recv_match_loop(int sock, PDU &pdu, struct sockaddr* link_add 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)) { #ifdef WIN32 int length = addrlen;