latest changes from main repository

Net/src/HTTPChunkedStream.cpp

@@ -1,7 +1,7 @@
 //
 // HTTPChunkedStream.cpp
 //
-// $Id: //poco/Main/Net/src/HTTPChunkedStream.cpp#12 $
+// $Id: //poco/Main/Net/src/HTTPChunkedStream.cpp#13 $
 //
 // Library: Net
 // Package: HTTP
@@ -172,7 +172,7 @@ HTTPChunkedInputStream::~HTTPChunkedInputStream()
 }
 
 
-void* HTTPChunkedInputStream::operator new(size_t size)
+void* HTTPChunkedInputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }
@@ -204,7 +204,7 @@ HTTPChunkedOutputStream::~HTTPChunkedOutputStream()
 }
 
 
-void* HTTPChunkedOutputStream::operator new(size_t size)
+void* HTTPChunkedOutputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }

Net/src/HTTPFixedLengthStream.cpp

@@ -1,7 +1,7 @@
 //
 // HTTPFixedLengthStream.cpp
 //
-// $Id: //poco/Main/Net/src/HTTPFixedLengthStream.cpp#9 $
+// $Id: //poco/Main/Net/src/HTTPFixedLengthStream.cpp#10 $
 //
 // Library: Net
 // Package: HTTP
@@ -142,7 +142,7 @@ HTTPFixedLengthInputStream::~HTTPFixedLengthInputStream()
 }
 
 
-void* HTTPFixedLengthInputStream::operator new(size_t size)
+void* HTTPFixedLengthInputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }
@@ -174,7 +174,7 @@ HTTPFixedLengthOutputStream::~HTTPFixedLengthOutputStream()
 }
 
 
-void* HTTPFixedLengthOutputStream::operator new(size_t size)
+void* HTTPFixedLengthOutputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }

Net/src/HTTPHeaderStream.cpp

@@ -1,7 +1,7 @@
 //
 // HTTPHeaderStream.cpp
 //
-// $Id: //poco/Main/Net/src/HTTPHeaderStream.cpp#9 $
+// $Id: //poco/Main/Net/src/HTTPHeaderStream.cpp#10 $
 //
 // Library: Net
 // Package: HTTP
@@ -139,7 +139,7 @@ HTTPHeaderInputStream::~HTTPHeaderInputStream()
 }
 
 
-void* HTTPHeaderInputStream::operator new(size_t size)
+void* HTTPHeaderInputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }
@@ -171,7 +171,7 @@ HTTPHeaderOutputStream::~HTTPHeaderOutputStream()
 }
 
 
-void* HTTPHeaderOutputStream::operator new(size_t size)
+void* HTTPHeaderOutputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }

Net/src/HTTPStream.cpp

@@ -1,7 +1,7 @@
 //
 // HTTPStream.cpp
 //
-// $Id: //poco/Main/Net/src/HTTPStream.cpp#9 $
+// $Id: //poco/Main/Net/src/HTTPStream.cpp#10 $
 //
 // Library: Net
 // Package: HTTP
@@ -133,7 +133,7 @@ HTTPInputStream::~HTTPInputStream()
 }
 
 
-void* HTTPInputStream::operator new(size_t size)
+void* HTTPInputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }
@@ -165,7 +165,7 @@ HTTPOutputStream::~HTTPOutputStream()
 }
 
 
-void* HTTPOutputStream::operator new(size_t size)
+void* HTTPOutputStream::operator new(std::size_t size)
 {
 	return _pool.get();
 }

Net/src/IPAddress.cpp

@@ -1,7 +1,7 @@
 //
 // IPAddress.cpp
 //
-// $Id: //poco/Main/Net/src/IPAddress.cpp#13 $
+// $Id: //poco/Main/Net/src/IPAddress.cpp#15 $
 //
 // Library: Net
 // Package: NetCore
@@ -81,6 +81,7 @@ public:
 	virtual bool isSiteLocalMC() const = 0;
 	virtual bool isOrgLocalMC() const = 0;
 	virtual bool isGlobalMC() const = 0;
+	virtual void mask(const IPAddressImpl* pMask, const IPAddressImpl* pSet) = 0;
 
 protected:
 	IPAddressImpl()
@@ -237,6 +238,14 @@ public:
 			return 0;
 #endif
 	}
+	
+	void mask(const IPAddressImpl* pMask, const IPAddressImpl* pSet)
+	{
+		poco_assert (pMask->af() == AF_INET && pSet->af() == AF_INET);
+		
+		_addr.s_addr &= static_cast<const IPv4AddressImpl*>(pMask)->_addr.s_addr;
+		_addr.s_addr |= static_cast<const IPv4AddressImpl*>(pSet)->_addr.s_addr & ~static_cast<const IPv4AddressImpl*>(pMask)->_addr.s_addr;
+	}
 		
 private:
 	struct in_addr _addr;	
@@ -435,6 +444,11 @@ public:
 			return 0;
 #endif
 	}
+	
+	void mask(const IPAddressImpl* pMask, const IPAddressImpl* pSet)
+	{
+		throw Poco::NotImplementedException("mask() is only supported for IPv4 addresses");
+	}
 
 private:
 	struct in6_addr _addr;	
@@ -744,4 +758,17 @@ bool IPAddress::tryParse(const std::string& addr, IPAddress& result)
 }
 
 
+void IPAddress::mask(const IPAddress& mask)
+{
+	IPAddress null;
+	_pImpl->mask(mask._pImpl, null._pImpl);
+}
+
+
+void IPAddress::mask(const IPAddress& mask, const IPAddress& set)
+{
+	_pImpl->mask(mask._pImpl, set._pImpl);
+}
+
+
 } } // namespace Poco::Net

Net/src/NetworkInterface.cpp

@@ -1,7 +1,7 @@
 //
 // NetworkInterface.cpp
 //
-// $Id: //poco/Main/Net/src/NetworkInterface.cpp#16 $
+// $Id: //poco/Main/Net/src/NetworkInterface.cpp#18 $
 //
 // Library: Net
 // Package: Sockets
@@ -38,6 +38,7 @@
 #include "Poco/Net/DatagramSocket.h"
 #include "Poco/Net/NetException.h"
 #include "Poco/NumberFormatter.h"
+#include "Poco/RefCountedObject.h"
 #include <string.h>
 
 
@@ -49,48 +50,215 @@ namespace Poco {
 namespace Net {
 
 
-FastMutex NetworkInterface::_mutex;
+//
+// NetworkInterfaceImpl
+//
 
 
-NetworkInterface::NetworkInterface():
-	_index(0)
+class NetworkInterfaceImpl: public Poco::RefCountedObject
+{
+public:
+	NetworkInterfaceImpl();
+	NetworkInterfaceImpl(const std::string& name, const IPAddress& address, int index = -1);
+	NetworkInterfaceImpl(const std::string& name, const IPAddress& address, const IPAddress& subnetMask, const IPAddress& broadcastAddress, int index = -1);
+
+	int index() const;		
+	const std::string& name() const;
+	const IPAddress& address() const;
+	const IPAddress& subnetMask() const;
+	const IPAddress& broadcastAddress() const;
+
+protected:
+	~NetworkInterfaceImpl();
+
+private:	
+	std::string _name;
+	IPAddress   _address;
+	IPAddress   _subnetMask;
+	IPAddress   _broadcastAddress;
+	int         _index;
+};
+
+
+NetworkInterfaceImpl::NetworkInterfaceImpl():
+	_index(-1)
 {
 }
 
 
-NetworkInterface::NetworkInterface(const std::string& name, const IPAddress& address, int index):
+NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name, const IPAddress& address, int index):
 	_name(name),
 	_address(address),
 	_index(index)
 {
+#ifndef _WIN32
+	if (index == -1) // IPv4
+	{
+		struct ifreq ifr;
+		strncpy(ifr.ifr_name, name.c_str(), IFNAMSIZ);
+		DatagramSocket ds(IPAddress::IPv4);
+		ds.impl()->ioctl(SIOCGIFNETMASK, &ifr);
+		if (ifr.ifr_addr.sa_family == AF_INET)
+			_subnetMask = IPAddress(&reinterpret_cast<const struct sockaddr_in*>(&ifr.ifr_addr)->sin_addr, sizeof(struct in_addr));
+		if (!address.isLoopback())
+		{
+			try
+			{
+				// Not every interface (e.g. loopback) has a broadcast address
+				ds.impl()->ioctl(SIOCGIFBRDADDR, &ifr);
+				if (ifr.ifr_addr.sa_family == AF_INET)
+					_broadcastAddress = IPAddress(&reinterpret_cast<const struct sockaddr_in*>(&ifr.ifr_addr)->sin_addr, sizeof(struct in_addr));
+			}
+			catch (...)
+			{
+			}
+		}
+	}
+#endif
+}
+
+
+NetworkInterfaceImpl::NetworkInterfaceImpl(const std::string& name, const IPAddress& address, const IPAddress& subnetMask, const IPAddress& broadcastAddress, int index):
+	_name(name),
+	_address(address),
+	_subnetMask(subnetMask),
+	_broadcastAddress(broadcastAddress),
+	_index(index)
+{
+}
+
+
+NetworkInterfaceImpl::~NetworkInterfaceImpl()
+{
+}
+
+
+inline int NetworkInterfaceImpl::index() const
+{
+	return _index;
+}
+
+
+inline const std::string& NetworkInterfaceImpl::name() const
+{
+	return _name;
+}
+
+
+inline const IPAddress& NetworkInterfaceImpl::address() const
+{
+	return _address;
+}
+
+
+inline const IPAddress& NetworkInterfaceImpl::subnetMask() const
+{
+	return _subnetMask;
+}
+
+
+inline const IPAddress& NetworkInterfaceImpl::broadcastAddress() const
+{
+	return _broadcastAddress;
+}
+
+
+//
+// NetworkInterface
+//
+
+
+FastMutex NetworkInterface::_mutex;
+
+
+NetworkInterface::NetworkInterface():
+	_pImpl(new NetworkInterfaceImpl)
+{
 }
 
 
 NetworkInterface::NetworkInterface(const NetworkInterface& interface):
-	_name(interface._name),
-	_address(interface._address),
-	_index(interface._index)
+	_pImpl(interface._pImpl)
+{
+	_pImpl->duplicate();
+}
+
+
+NetworkInterface::NetworkInterface(const std::string& name, const IPAddress& address, int index):
+	_pImpl(new NetworkInterfaceImpl(name, address, index))
+{
+}
+
+
+NetworkInterface::NetworkInterface(const std::string& name, const IPAddress& address, const IPAddress& subnetMask, const IPAddress& broadcastAddress, int index):
+	_pImpl(new NetworkInterfaceImpl(name, address, subnetMask, broadcastAddress, index))
 {
 }
 
 
 NetworkInterface::~NetworkInterface()
 {
+	_pImpl->release();
 }
 
 
 NetworkInterface& NetworkInterface::operator = (const NetworkInterface& interface)
 {
-	if (&interface != this)
-	{
-		_name    = interface._name;
-		_address = interface._address;
-		_index   = interface._index;
-	}
+	NetworkInterface tmp(interface);
+	swap(tmp);
 	return *this;
 }
 
 
+void NetworkInterface::swap(NetworkInterface& other)
+{
+	using std::swap;
+	swap(_pImpl, other._pImpl);
+}
+
+
+int NetworkInterface::index() const
+{
+	return _pImpl->index();
+}
+
+
+const std::string& NetworkInterface::name() const
+{
+	return _pImpl->name();
+}
+
+
+const IPAddress& NetworkInterface::address() const
+{
+	return _pImpl->address();
+}
+
+
+const IPAddress& NetworkInterface::subnetMask() const
+{
+	return _pImpl->subnetMask();
+}
+
+
+const IPAddress& NetworkInterface::broadcastAddress() const
+{
+	return _pImpl->broadcastAddress();
+}
+
+
+bool NetworkInterface::supportsIPv4() const
+{
+	return _pImpl->index() == -1;
+}
+
+	
+bool NetworkInterface::supportsIPv6() const
+{
+	return _pImpl->index() != -1;
+}
+
+
 NetworkInterface NetworkInterface::forName(const std::string& name, bool requireIPv6)
 {
 #if defined(_WIN32)
@@ -114,12 +282,14 @@ NetworkInterface NetworkInterface::forName(const std::string& name, bool require
 		addr = IPAddress(&reinterpret_cast<const struct sockaddr_in*>(&ifr.ifr_addr)->sin_addr, sizeof(struct in_addr));
 	else if (ifr.ifr_addr.sa_family == AF_INET6)
 		addr = IPAddress(&reinterpret_cast<const struct sockaddr_in6*>(&ifr.ifr_addr)->sin6_addr, sizeof(struct in6_addr));
-	else throw InterfaceNotFoundException(addr.toString(), "interface has no IP address");
+	else
+		throw InterfaceNotFoundException(addr.toString(), "interface has no IP address");
 	int index = if_nametoindex(name.c_str());
 #else
 	if (ifr.ifr_addr.sa_family == AF_INET)
 		addr = IPAddress(&reinterpret_cast<const struct sockaddr_in*>(&ifr.ifr_addr)->sin_addr, sizeof(struct in_addr));
-	else throw InterfaceNotFoundException(addr.toString(), "interface has no IP address");
+	else
+		throw InterfaceNotFoundException(addr.toString(), "interface has no IP address");
 	int index = 0;
 #endif
 	return NetworkInterface(name, addr, index);
@@ -178,20 +348,21 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list()
 {
 	FastMutex::ScopedLock lock(_mutex);
 	NetworkInterfaceList result;
-	
+	DWORD rc;
+
 #if defined(POCO_HAVE_IPv6)
 	// On Windows XP/Server 2003 and later we use GetAdaptersAddresses.
 	PIP_ADAPTER_ADDRESSES pAdapterAddresses;
-	PIP_ADAPTER_ADDRESSES pAdapter = 0;
-	ULONG len         = sizeof(IP_ADAPTER_ADDRESSES);
-	pAdapterAddresses = reinterpret_cast<IP_ADAPTER_ADDRESSES*>(new char[len]);
+	PIP_ADAPTER_ADDRESSES pAddress = 0;
+	ULONG addrLen     = sizeof(IP_ADAPTER_ADDRESSES);
+	pAdapterAddresses = reinterpret_cast<IP_ADAPTER_ADDRESSES*>(new char[addrLen]);
 	// Make an initial call to GetAdaptersAddresses to get
-	// the necessary size into len
-	DWORD rc = GetAdaptersAddresses(AF_UNSPEC, 0, 0, pAdapterAddresses, &len);
+	// the necessary size into addrLen
+	rc = GetAdaptersAddresses(AF_INET6, 0, 0, pAdapterAddresses, &addrLen);
 	if (rc == ERROR_BUFFER_OVERFLOW) 
 	{
 		delete [] reinterpret_cast<char*>(pAdapterAddresses);
-		pAdapterAddresses = reinterpret_cast<IP_ADAPTER_ADDRESSES*>(new char[len]);
+		pAdapterAddresses = reinterpret_cast<IP_ADAPTER_ADDRESSES*>(new char[addrLen]);
 	}
 	else if (rc != ERROR_SUCCESS)
 	{
@@ -199,16 +370,16 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list()
 	}
 	try
 	{
-		if (GetAdaptersAddresses(AF_UNSPEC, 0, 0, pAdapterAddresses, &len) == NO_ERROR) 
+		if (GetAdaptersAddresses(AF_INET6, 0, 0, pAdapterAddresses, &addrLen) == NO_ERROR) 
 		{
-			pAdapter = pAdapterAddresses;
-			while (pAdapter) 
+			pAddress = pAdapterAddresses;
+			while (pAddress) 
 			{
-				if (pAdapter->FirstUnicastAddress)
+				if (pAddress->FirstUnicastAddress)
 				{
-					IPAddress addr(pAdapter->FirstUnicastAddress->Address.lpSockaddr, pAdapter->FirstUnicastAddress->Address.iSockaddrLength);
-					result.push_back(NetworkInterface(std::string(pAdapter->AdapterName), addr, pAdapter->Ipv6IfIndex));
-					pAdapter = pAdapter->Next;
+					IPAddress addr(pAddress->FirstUnicastAddress->Address.lpSockaddr, pAddress->FirstUnicastAddress->Address.iSockaddrLength);
+					result.push_back(NetworkInterface(std::string(pAddress->AdapterName), addr, pAddress->Ipv6IfIndex));
+					pAddress = pAddress->Next;
 				}
 			}
 		}
@@ -220,21 +391,22 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list()
 		throw;
 	}
 	delete [] reinterpret_cast<char*>(pAdapterAddresses);
-#else
-	// Add loopback interface (not returned by GetAdaptersInfo)
+#endif
+
+	// Add IPv4 loopback interface (not returned by GetAdaptersInfo)
 	result.push_back(NetworkInterface("Loopback", IPAddress("127.0.0.1"), -1));
 	// On Windows 2000 we use GetAdaptersInfo.
 	PIP_ADAPTER_INFO pAdapterInfo;
-	PIP_ADAPTER_INFO pAdapter = 0;
-	ULONG len    = sizeof(IP_ADAPTER_INFO);
-	pAdapterInfo = reinterpret_cast<IP_ADAPTER_INFO*>(new char[len]);
+	PIP_ADAPTER_INFO pInfo = 0;
+	ULONG infoLen = sizeof(IP_ADAPTER_INFO);
+	pAdapterInfo  = reinterpret_cast<IP_ADAPTER_INFO*>(new char[infoLen]);
 	// Make an initial call to GetAdaptersInfo to get
-	// the necessary size into len
-	DWORD rc = GetAdaptersInfo(pAdapterInfo, &len);
+	// the necessary size into infoLen
+	rc = GetAdaptersInfo(pAdapterInfo, &infoLen);
 	if (rc == ERROR_BUFFER_OVERFLOW) 
 	{
 		delete [] reinterpret_cast<char*>(pAdapterInfo);
-		pAdapterInfo = reinterpret_cast<IP_ADAPTER_INFO*>(new char[len]);
+		pAdapterInfo = reinterpret_cast<IP_ADAPTER_INFO*>(new char[infoLen]);
 	}
 	else if (rc != ERROR_SUCCESS)
 	{
@@ -242,14 +414,17 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list()
 	}
 	try
 	{
-		if (GetAdaptersInfo(pAdapterInfo, &len) == NO_ERROR) 
+		if (GetAdaptersInfo(pAdapterInfo, &infoLen) == NO_ERROR) 
 		{
-			pAdapter = pAdapterInfo;
-			while (pAdapter) 
+			pInfo = pAdapterInfo;
+			while (pInfo) 
 			{
-				IPAddress addr(std::string(pAdapter->IpAddressList.IpAddress.String));
-				result.push_back(NetworkInterface(std::string(pAdapter->AdapterName), addr));
-				pAdapter = pAdapter->Next;
+				IPAddress address(std::string(pInfo->IpAddressList.IpAddress.String));
+				IPAddress subnetMask(std::string(pInfo->IpAddressList.IpMask.String));
+				IPAddress broadcastAddress(address);
+				broadcastAddress.mask(subnetMask, IPAddress("255.255.255.255"));
+				result.push_back(NetworkInterface(std::string(pInfo->AdapterName), address, subnetMask, broadcastAddress));
+				pInfo = pInfo->Next;
 			}
 		}
 		else throw NetException("cannot get network adapter list");
@@ -260,7 +435,6 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list()
 		throw;
 	}
 	delete [] reinterpret_cast<char*>(pAdapterInfo);
-#endif
 
 	return result;
 }

Net/src/POP3ClientSession.cpp

@@ -1,7 +1,7 @@
 //
 // POP3ClientSession.cpp
 //
-// $Id: //poco/Main/Net/src/POP3ClientSession.cpp#6 $
+// $Id: //poco/Main/Net/src/POP3ClientSession.cpp#7 $
 //
 // Library: Net
 // Package: Mail
@@ -220,6 +220,7 @@ void POP3ClientSession::retrieveMessage(int id, MailMessage& message)
 	DialogInputStream sis(_socket);
 	MailInputStream mis(sis);
 	message.read(mis);
+	while (mis.good()) mis.get(); // read any remaining junk
 }
 
 
@@ -231,6 +232,7 @@ void POP3ClientSession::retrieveMessage(int id, MailMessage& message, PartHandle
 	DialogInputStream sis(_socket);
 	MailInputStream mis(sis);
 	message.read(mis, handler);
+	while (mis.good()) mis.get(); // read any remaining junk
 }
 
 

Net/src/RemoteSyslogListener.cpp

@@ -1,7 +1,7 @@
 //
 // RemoteSyslogListener.cpp
 //
-// $Id: //poco/Main/Net/src/RemoteSyslogListener.cpp#6 $
+// $Id: //poco/Main/Net/src/RemoteSyslogListener.cpp#7 $
 //
 // Library: Net
 // Package: Logging
@@ -47,6 +47,7 @@
 #include "Poco/LoggingFactory.h"
 #include "Poco/Buffer.h"
 #include <cctype>
+#include <cstddef>
 
 
 namespace Poco {