X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsockaddr.h;h=aad5e29065e5695ff6b8794cf5dd95f5696e2dc3;hb=21c596567e3b6fd794ed6af73d304ce2bc70e58f;hp=62e559c23f73df62bde597d40ec1daee6668144a;hpb=2aab4004e71a2e5c773289e0be5e58aec6a8d339;p=libs%2Fnet.git

diff --git a/source/sockaddr.h b/source/sockaddr.h
index 62e559c..aad5e29 100644
--- a/source/sockaddr.h
+++ b/source/sockaddr.h
@@ -2,9 +2,6 @@
 #define MSP_NET_SOCKADDR_H_
 
 #include <string>
-#ifndef WIN32
-#include <sys/socket.h>
-#endif
 #include "constants.h"
 
 namespace Msp {
@@ -13,25 +10,20 @@ namespace Net {
 class SockAddr
 {
 public:
-	virtual Family get_family() const =0;
-	virtual std::string str() const =0;
-
-	/**
-	Fills the given struct sockaddr with information from this SockAddr.
+	struct SysAddr;
 
-	@return  Number of bytes used
-	*/
-	virtual unsigned fill_sockaddr(sockaddr &) const =0;
-	virtual unsigned fill_sockaddr(sockaddr_storage &) const;
+protected:
+	SockAddr() { }
+public:
+	virtual ~SockAddr() { }
 
-	virtual SockAddr *copy() const =0;
+	virtual SockAddr *copy() const = 0;
 
-	virtual ~SockAddr() { }
+	static SockAddr *new_from_sys(const SysAddr &);
+	virtual SysAddr to_sys() const = 0;
 
-	static SockAddr *create(const sockaddr &sa) { return create(reinterpret_cast<const sockaddr_storage &>(sa)); }
-	static SockAddr *create(const sockaddr_storage &);
-protected:
-	SockAddr() { }
+	virtual Family get_family() const = 0;
+	virtual std::string str() const = 0;
 };
 
 } // namespace Net