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

Merge branch 'master' of ssh://git.code.sf.net/p/libtins/code

Browse Source
This commit is contained in:
Matias Fontanini
2012-03-12 09:47:51 -03:00
parent e9484209fc 44536943c9
commit 642240a904
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/packetsender.h
View File

@@ -63,7 +63,7 @@ namespace Tins {
*
* \param recv_timeout The timeout which will be used when receiving responses.
*/
PacketSender(uint32_t recv_timeout = DEFAULT_TIMEOUT);
PacketSender(uint32_t recv_timeout = DEFAULT_TIMEOUT, uint32_t usec = 0);
/** \brief PacketSender destructor.
*
@@ -174,7 +174,7 @@ namespace Tins {
std::vector<int> _sockets;
SocketTypeMap _types;
uint32_t _timeout;
uint32_t _timeout, _timeout_usec;
};
};

5
src/packetsender.cpp
View File

@@ -38,7 +38,8 @@
const int Tins::PacketSender::INVALID_RAW_SOCKET = -1;
const uint32_t Tins::PacketSender::DEFAULT_TIMEOUT = 2;
Tins::PacketSender::PacketSender(uint32_t recv_timeout) : _sockets(SOCKETS_END, INVALID_RAW_SOCKET), _timeout(recv_timeout) {
Tins::PacketSender::PacketSender(uint32_t recv_timeout, uint32_t usec) :
_sockets(SOCKETS_END, INVALID_RAW_SOCKET), _timeout(recv_timeout), _timeout_usec(usec) {
_types[IP_SOCKET] = IPPROTO_RAW;
_types[ICMP_SOCKET] = IPPROTO_ICMP;
}
@@ -143,7 +144,7 @@ Tins::PDU *Tins::PacketSender::recv_match_loop(int sock, PDU *pdu, struct sockad
uint8_t buffer[2048];
time_t end_time = time(0) + _timeout;
timeout.tv_sec = _timeout;
timeout.tv_usec = 0;
timeout.tv_usec = _timeout_usec;
while(true) {
FD_ZERO(&readfds);
FD_SET(sock, &readfds);