#include <msp/io/handle_private.h>
#include <msp/io/poll.h>
#include <msp/strings/format.h>
+#include "sockaddr_private.h"
#include "socket_private.h"
#include "streamsocket.h"
namespace Net {
StreamSocket::StreamSocket(const Private &p, const SockAddr &paddr):
- Socket(p, paddr),
- connecting(false)
+ ClientSocket(p, paddr)
{
#ifdef WIN32
WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE);
}
StreamSocket::StreamSocket(Family af, int proto):
- Socket(af, SOCK_STREAM, proto),
- connecting(false)
+ ClientSocket(af, SOCK_STREAM, proto)
{ }
-int StreamSocket::poll_connect(const Time::TimeDelta &timeout)
-{
- if(!connecting)
- throw bad_socket_state("not connecting");
-
- int res = poll(*this, IO::P_OUTPUT, timeout);
- if(res==-1)
-#ifdef WIN32
- throw system_error("poll", WSAGetLastError());
-#else
- throw system_error("poll");
-#endif
- else if(res>0)
- {
- connecting = false;
-
- int err;
- socklen_t len = sizeof(int);
- get_option(SOL_SOCKET, SO_ERROR, &err, &len);
-
- if(err!=0)
- {
- set_events(IO::P_NONE);
-#ifdef WIN32
- throw system_error("connect", WSAGetLastError());
-#else
- throw system_error("connect");
-#endif
- }
-
-#ifdef WIN32
- WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE);
-#endif
- set_events(IO::P_INPUT);
-
- connected = true;
-
- return 0;
- }
-
- return 1;
-}
-
-int StreamSocket::connect(const SockAddr &addr)
+bool StreamSocket::connect(const SockAddr &addr)
{
if(connected)
throw bad_socket_state("already connected");
- sockaddr_storage sa;
- socklen_t size = addr.fill_sockaddr(sa);
+ SockAddr::SysAddr sa = addr.to_sys();
#ifdef WIN32
- int err = WSAConnect(priv->handle, reinterpret_cast<sockaddr *>(&sa), size, 0, 0, 0, 0);
+ int err = WSAConnect(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), sa.size, 0, 0, 0, 0);
if(err==SOCKET_ERROR)
{
int err_code = WSAGetLastError();
throw system_error("connect", err_code);
}
#else
- int err = ::connect(priv->handle, reinterpret_cast<sockaddr *>(&sa), size);
+ int err = ::connect(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), sa.size);
if(err==-1)
{
if(errno==EINPROGRESS)
peer_addr = addr.copy();
delete local_addr;
- size = sizeof(sockaddr_storage);
- getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa), &size);
- local_addr = SockAddr::create(sa);
+ SockAddr::SysAddr lsa;
+ getsockname(priv->handle, reinterpret_cast<sockaddr *>(&lsa.addr), &lsa.size);
+ local_addr = SockAddr::from_sys(lsa);
if(err==0)
{
signal_connect_finished.emit(0);
}
- return (err==0)?0:1;
+ return connected;
+}
+
+bool StreamSocket::poll_connect(const Time::TimeDelta &timeout)
+{
+ if(!connecting)
+ throw bad_socket_state("not connecting");
+
+ IO::PollEvent res = poll(*this, IO::P_OUTPUT, timeout);
+ if(res&IO::P_OUTPUT)
+ {
+ connecting = false;
+
+ int err;
+ socklen_t len = sizeof(int);
+ get_option(SOL_SOCKET, SO_ERROR, &err, &len);
+
+ if(err!=0)
+ {
+ set_events(IO::P_NONE);
+#ifdef WIN32
+ throw system_error("connect", WSAGetLastError());
+#else
+ throw system_error("connect");
+#endif
+ }
+
+#ifdef WIN32
+ WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE);
+#endif
+ set_events(IO::P_INPUT);
+
+ connected = true;
+ }
+
+ return connected;
}
void StreamSocket::on_event(IO::PollEvent ev)