-/* $Id$
-
-This file is part of libmspnet
-Copyright © 2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the LGPL
-*/
-
#ifndef WIN32
#include <sys/socket.h>
#endif
if(!connecting)
throw InvalidState("No connection attempt going on");
- int res=poll(*this, IO::P_OUTPUT, timeout);
+ int res = poll(*this, IO::P_OUTPUT, timeout);
if(res==-1)
#ifdef WIN32
throw Exception(format("Connection polling failed: %d", WSAGetLastError()));
#endif
else if(res>0)
{
- connecting=false;
+ connecting = false;
int err;
- socklen_t len=sizeof(int);
+ socklen_t len = sizeof(int);
get_option(SOL_SOCKET, SO_ERROR, &err, &len);
if(err!=0)
#endif
set_events(IO::P_INPUT);
- connected=true;
+ connected = true;
return 0;
}
if(connected)
throw InvalidState("Socket is already connected");
- sockaddr sa;
- socklen_t size=addr.fill_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();
+ int err_code = WSAGetLastError();
if(err_code==WSAEWOULDBLOCK)
{
- connecting=true;
+ connecting = true;
WSAEventSelect(handle, event, FD_CONNECT);
set_events(IO::P_OUTPUT);
}
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)
{
- connecting=true;
+ connecting = true;
set_events(IO::P_OUTPUT);
}
else
#endif
delete peer_addr;
- peer_addr=addr.copy();
+ peer_addr = addr.copy();
delete local_addr;
- size=sizeof(sockaddr);
- getsockname(handle, &sa, &size);
- local_addr=SockAddr::create(sa);
+ size = sizeof(sockaddr_storage);
+ getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
+ local_addr = SockAddr::create(sa);
if(err==0)
{
- connected=true;
+ connected = true;
+ set_events(IO::P_INPUT);
signal_connect_finished.emit(0);
}
if((ev&(IO::P_OUTPUT|IO::P_ERROR)) && connecting)
{
int err;
- socklen_t len=sizeof(err);
+ socklen_t len = sizeof(err);
get_option(SOL_SOCKET, SO_ERROR, &err, &len);
- connecting=false;
- connected=(err==0);
+ connecting = false;
+ connected = (err==0);
signal_connect_finished.emit(err);
if(err!=0)
{
delete peer_addr;
- peer_addr=0;
+ peer_addr = 0;
}
#ifdef WIN32