--- a/C++/Socket.cpp	Thu Sep 12 11:44:34 2013 +0200
+++ b/C++/Socket.cpp	Thu Sep 12 13:36:12 2013 +0200
@@ -92,10 +92,16 @@
 }
 
 Socket::Socket()
+	: m_domain(0)
+	, m_type(0)
+	, m_protocol(0)
 {
 }
 
 Socket::Socket(int domain, int type, int protocol)
+	: m_domain(domain)
+	, m_type(type)
+	, m_protocol(protocol)
 {
 	m_socket = socket(domain, type, protocol);
 
@@ -103,20 +109,26 @@
 		throw SocketError(getLastSysError());
 }
 
-Socket::Socket(Socket::Type sock)
-	: m_socket(sock)
-{
-}
-
-Socket::~Socket()
-{
-}
-
 Socket::Type Socket::getSocket() const
 {
 	return m_socket;
 }
 
+int Socket::getDomain() const
+{
+	return m_domain;
+}
+
+int Socket::getType() const
+{
+	return m_type;
+}
+
+int Socket::getProtocol() const
+{
+	return m_protocol;
+}
+
 void Socket::set(int level, int name, const void *arg, unsigned argLen)
 {
 	if (setsockopt(m_socket, level, name, (Socket::ConstArg)arg, argLen) == SOCKET_ERROR)
@@ -173,15 +185,19 @@
 
 Socket Socket::accept(SocketAddress &info)
 {
-	Socket::Type sock;
+	Socket s;
 
 	info.m_addrlen = sizeof (sockaddr_storage);
-	sock = ::accept(m_socket, (sockaddr *)&info.m_addr, &info.m_addrlen);
+	s.m_socket = ::accept(m_socket, (sockaddr *)&info.m_addr, &info.m_addrlen);
 
-	if (sock == INVALID_SOCKET)
+	// Usually accept works only with SOCK_STREAM
+	s.m_domain	= info.m_addr.ss_family;
+	s.m_type	= SOCK_STREAM;
+
+	if (s.m_socket == INVALID_SOCKET)
 		throw SocketError(getLastSysError());
 
-	return Socket(sock);
+	return s;
 }
 
 void Socket::listen(int max)
@@ -265,7 +281,7 @@
 	return s1.getSocket() == s2.getSocket();
 }
 
-bool operator<(const Socket &s, const Socket &s2)
+bool operator<(const Socket &s1, const Socket &s2)
 {
 	return s1.getSocket() < s2.getSocket();
 }