Async servers (UDP and TCP)

Net/include/Poco/Net/DatagramSocket.h

@@ -67,7 +67,7 @@ class Net_API DatagramSocket: public Socket
 		/// Creates the DatagramSocket with the SocketImpl
 		/// from another socket.
 
-	~DatagramSocket();
+	~DatagramSocket() override;
 		/// Destroys the DatagramSocket.
 
 	DatagramSocket& operator = (const Socket& socket);

Net/include/Poco/Net/MultiSocketPoller.h

@@ -19,8 +19,12 @@
 
 
 #include "Poco/Net/Net.h"
+#include "Poco/Net/DatagramSocket.h"
 #include "Poco/Net/Socket.h"
+#include "Poco/Net/PollSet.h"
 #include "Poco/Net/UDPHandler.h"
+#include "Poco/Net/UDPServerParams.h"
+#include "Poco/Net/UDPSocketReader.h"
 
 
 namespace Poco {
@@ -34,7 +38,7 @@ class MultiSocketPoller
 	/// state, the reading/error handling actions are delegated to the reader.
 {
 public:
-	MultiSocketPoller(typename UDPHandlerImpl<S>::List& handlers, const Poco::Net::SocketAddress& sa, int nSockets = 10, Poco::Timespan timeout = 250000):
+	MultiSocketPoller(typename UDPHandlerImpl<S>::List& handlers, const Poco::Net::SocketAddress& sa, int nSockets = 10, const Poco::Timespan& timeout = 250000):
 		_address(sa),
 		_timeout(timeout),
 		_reader(handlers)
@@ -74,23 +78,20 @@ class MultiSocketPoller
 
 	void poll()
 	{
-		if (_reader.handlerStopped()) return;
+		if (_reader.handlerStopped())
+			return;
 		PollSet::SocketModeMap sm;
-		PollSet::SocketModeMap::iterator it;
-		PollSet::SocketModeMap::iterator end;
 		sm = _pollSet.poll(_timeout);
-		it = sm.begin();
-		end = sm.end();
-		for (; it != end; ++it)
+		for (auto& se: sm)
 		{
-			if (it->second & PollSet::POLL_READ)
+			if (se.second & PollSet::POLL_READ)
 			{
-				DatagramSocket ds(it->first);
+				DatagramSocket ds(se.first);
 				_reader.read(ds);
 			}
-			else if (it->second & PollSet::POLL_ERROR)
+			else if (se.second & PollSet::POLL_ERROR)
 			{
-				_reader.setError(it->first.impl()->sockfd());
+				_reader.setError(se.first.impl()->sockfd());
 			}
 		}
 	}

Net/include/Poco/Net/SingleSocketPoller.h

@@ -21,7 +21,8 @@
 #include "Poco/Net/Net.h"
 #include "Poco/Net/DatagramSocket.h"
 #include "Poco/Net/UDPHandler.h"
-#include "Poco/Net/PollSet.h"
+#include "Poco/Net/UDPServerParams.h"
+#include "Poco/Net/UDPSocketReader.h"
 
 
 namespace Poco {

Net/include/Poco/Net/Socket.h

@@ -411,11 +411,12 @@ class FDCompare
 {
 public:
 	FDCompare(int fd): _fd(fd) { }
+	FDCompare() = delete;
+
 	inline bool operator()(const Socket& socket) const
 	{ return socket.sockfd() == _fd; }
 
 private:
-	FDCompare();
 	int _fd;
 };
 #endif

Net/include/Poco/Net/SocketDefs.h

@@ -144,7 +144,7 @@
 	#define POCO_NO_DATA         NO_DATA
 #elif defined(POCO_OS_FAMILY_UNIX)
 	#include <unistd.h>
-	#include <errno.h>
+	#include <cerrno>
 	#include <sys/types.h>
 	#include <sys/socket.h>
 	#include <sys/un.h>
@@ -369,12 +369,12 @@ namespace Net {
 
 
 #if defined(POCO_OS_FAMILY_WINDOWS)
-	typedef WSABUF SocketBuf;
+	using SocketBuf = WSABUF;
 #elif defined(POCO_OS_FAMILY_UNIX) // TODO: may need more refinement
-	typedef iovec SocketBuf;
+	using SocketBuf = iovec;
 #endif
 
-typedef std::vector<SocketBuf> SocketBufVec;
+using SocketBufVec = std::vector<SocketBuf>;
 
 inline int SocketBufVecSize(const SocketBufVec& sbv)
 	/// Returns total length of all SocketBufs in the vector.

Net/include/Poco/Net/SocketImpl.h

@@ -490,7 +490,7 @@ class Net_API SocketImpl: public Poco::RefCountedObject
 	SocketImpl(poco_socket_t sockfd);
 		/// Creates a SocketImpl using the given native socket.
 
-	virtual ~SocketImpl();
+	~SocketImpl() override;
 		/// Destroys the SocketImpl.
 		/// Closes the socket if it is still open.
 

Net/include/Poco/Net/StreamSocket.h

@@ -69,7 +69,7 @@ class Net_API StreamSocket: public Socket
 		/// Creates the StreamSocket with the SocketImpl
 		/// from another socket.
 
-	virtual ~StreamSocket();
+	~StreamSocket() override;
 		/// Destroys the StreamSocket.
 
 	StreamSocket& operator = (const Socket& socket);

Net/include/Poco/Net/UDPClient.h

@@ -21,16 +21,16 @@
 #include "Poco/Net/Net.h"
 #include "Poco/Net/SocketAddress.h"
 #include "Poco/Net/DatagramSocket.h"
-#include "Poco/Timespan.h"
 #include "Poco/Runnable.h"
+#include "Poco/RefCountedObject.h"
 #include "Poco/Thread.h"
 
 
 namespace Poco {
 namespace Net {
 
 
-class Net_API UDPClient : public Poco::Runnable
+class Net_API UDPClient : public Poco::Runnable, public RefCountedObject
 	/// UDP client can either send, or send/receive UDP packets.
 	/// The mode of operation is specified at construction time.
 	/// If receiving functionality is enabled, it will run in a
@@ -43,12 +43,12 @@ class Net_API UDPClient : public Poco::Runnable
 	UDPClient(const std::string& address, Poco::UInt16 port, bool listen = false);
 		/// Creates UDP client and connects it to specified address/port.
 		/// If listen is true, a thread is launched where client can receive
-		/// responses rom the server.
+		/// responses from the server.
 
-	virtual ~UDPClient();
+	~UDPClient() override;
 		/// Destroys UDPClient.
 
-	void run();
+	void run() override;
 		/// Runs listener (typically invoked internally, in separate thread).
 
 	SocketAddress address() const;