mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-29 04:17:55 +01:00
Feature net udp (#2347)
* add PMTU discovery #2329 * add socket gather/scatter capabilities #2330 (win, udp) * enable WSAPoll * add FastMemoryPool * add receiveFrom() with native args * allow copying of StringTokenizer * add AtomicFlag and SpinlockMutex * update .gitignore * UDPServer and client #2343 (windows) * fix warnings * fix warnings * regenerate Net VS solutions * regenerate CppUnit projects/solutions * clang fixes * gcc fixes * try to fix travis * more travis fixes * more travis fixes * handle UDPClient exception * fix makefiles and init order warnings * add UNIX gather/scatter sendto/recvfrom implementations and tests * run travis tests as sudo * try to run tests as sudo, 2nd attempt * fix warning * use mutex in reactor * lock-order-inversion in SocketReactor #2346 * add PMTU discovery #2329 (linux) * ICMPSocket does not check reply address #1921 * remove some ignored tests * add PMTU discovery #2329 (reconcile logic with #1921) * fix native receiveFrome() * reinstate ignoring of proxy errors * add testMTU to ignore list * add include atomic * NTPClient not checking reply address #2348 * some ICMP/MTU fixes * UDPSocketReader cleanup * resolve some socket inheritance warnings * add NTP time sync to ignored tests * SocketNotifier not thread-safe #2345 * prevent x64 samples build attempt for win32 * build TestApp and Library * fix ICMP tests * regen VS projects * regen VS projects and add missing 2012 files * remove debug prints
This commit is contained in:
committed by
GitHub
parent
da15142f69
commit
c4e676d36d
@@ -46,7 +46,7 @@ int NTPClient::request(const std::string& address) const
|
||||
|
||||
int NTPClient::request(SocketAddress& address) const
|
||||
{
|
||||
Poco::Net::SocketAddress sa;
|
||||
SocketAddress sa;
|
||||
DatagramSocket ntpSocket(_family);
|
||||
ntpSocket.setReceiveTimeout(_timeout);
|
||||
ntpSocket.bind(sa);
|
||||
@@ -62,22 +62,30 @@ int NTPClient::request(SocketAddress& address) const
|
||||
ntpSocket.sendTo(p, 48, address);
|
||||
|
||||
int received = 0;
|
||||
try
|
||||
Timestamp start;
|
||||
while (true)
|
||||
{
|
||||
Poco::Net::SocketAddress sender;
|
||||
int n = ntpSocket.receiveFrom(p, sizeof(p)-1, sender);
|
||||
try
|
||||
{
|
||||
int n = ntpSocket.receiveFrom(p, sizeof(p) - 1, sa);
|
||||
if (sa != address) // reply mixup, try until timeout ...
|
||||
{
|
||||
if ((Timestamp() - start) < _timeout) continue;
|
||||
break;
|
||||
}
|
||||
if (n < 48) // NTP packet must have at least 48 bytes
|
||||
throw Poco::Net::NTPException("Invalid response received");
|
||||
|
||||
if (n < 48) // NTP packet must have at least 48 bytes
|
||||
throw Poco::Net::NTPException("Invalid response received");
|
||||
|
||||
packet.setPacket(p);
|
||||
eventArgs.setPacket(packet);
|
||||
++received;
|
||||
response.notify(this, eventArgs);
|
||||
}
|
||||
catch (Poco::TimeoutException &)
|
||||
{
|
||||
// ignore
|
||||
packet.setPacket(p);
|
||||
eventArgs.setPacket(packet);
|
||||
++received;
|
||||
response.notify(this, eventArgs);
|
||||
break;
|
||||
}
|
||||
catch (Poco::TimeoutException &)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return received;
|
||||
|
||||
Reference in New Issue
Block a user