X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstreamsocket.cpp;h=79b08f4d91541854817d75f5f975f50444a21746;hb=2aab4004e71a2e5c773289e0be5e58aec6a8d339;hp=48d06a79ccebab9809d3c2b2cf65988c93033a5c;hpb=ef23ca71babc753231bb2dd197be6dd7099d9804;p=libs%2Fnet.git

diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp
index 48d06a7..79b08f4 100644
--- a/source/streamsocket.cpp
+++ b/source/streamsocket.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspnet
-Copyright © 2008-2009  Mikkosoft Productions, Mikko Rasa
-Distributed under the LGPL
-*/
-
 #ifndef WIN32
 #include <sys/socket.h>
 #endif
@@ -102,12 +95,12 @@ int StreamSocket::connect(const SockAddr &addr)
 	if(connected)
 		throw InvalidState("Socket is already connected");
 
-	sockaddr sa;
+	sockaddr_storage sa;
 	socklen_t size=addr.fill_sockaddr(sa);
 
 #ifdef WIN32
-	int err=WSAConnect(handle, &sa, size, 0, 0, 0, 0);
-	if(err=SOCKET_ERROR)
+	int err=WSAConnect(handle, reinterpret_cast<sockaddr *>(&sa), size, 0, 0, 0, 0);
+	if(err==SOCKET_ERROR)
 	{
 		int err_code=WSAGetLastError();
 		if(err_code==WSAEWOULDBLOCK)
@@ -120,7 +113,7 @@ int StreamSocket::connect(const SockAddr &addr)
 			throw Exception(format("Unable to connect: %d", err_code));
 	}
 #else
-	int err=::connect(handle, &sa, size);
+	int err=::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
 	if(err==-1)
 	{
 		if(errno==EINPROGRESS)
@@ -137,8 +130,8 @@ int StreamSocket::connect(const SockAddr &addr)
 	peer_addr=addr.copy();
 
 	delete local_addr;
-	size=sizeof(sockaddr);
-	getsockname(handle, &sa, &size);
+	size=sizeof(sockaddr_storage);
+	getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
 	local_addr=SockAddr::create(sa);
 
 	if(err==0)