X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fclientsocket.cpp;h=89e2d082a65bddee2cdfd1f32334f2fb0f3a57bf;hb=3ab65d35cfd696002e09768a38f98e6a2e1ade81;hp=80303de7ea9a136aa61ce54337effb80e049d934;hpb=debe1004676d5431e571d9c4361072661dcc88c4;p=libs%2Fnet.git diff --git a/source/net/clientsocket.cpp b/source/net/clientsocket.cpp index 80303de..89e2d08 100644 --- a/source/net/clientsocket.cpp +++ b/source/net/clientsocket.cpp @@ -1,9 +1,4 @@ -#ifdef WIN32 -#include -#else -#include -#include -#endif +#include "platform_api.h" #include #include "clientsocket.h" #include "socket_private.h" @@ -12,15 +7,11 @@ namespace Msp { namespace Net { ClientSocket::ClientSocket(Family af, int type, int proto): - Socket(af, type, proto), - connecting(false), - connected(false), - peer_addr(0) + Socket(af, type, proto) { } ClientSocket::ClientSocket(const Private &p, const SockAddr &paddr): Socket(p), - connecting(false), connected(true), peer_addr(paddr.copy()) { } @@ -32,54 +23,66 @@ ClientSocket::~ClientSocket() delete peer_addr; } +void ClientSocket::shutdown(IO::Mode m) +{ + int how; + m = m&IO::M_RDWR; +#ifdef _WIN32 + if(m==IO::M_READ) + how = SD_RECEIVE; + else if(m==IO::M_WRITE) + how = SD_SEND; + else if(m==IO::M_RDWR) + how = SD_BOTH; +#else + if(m==IO::M_READ) + how = SHUT_RD; + else if(m==IO::M_WRITE) + how = SHUT_WR; + else if(m==IO::M_RDWR) + how = SHUT_RDWR; +#endif + else + return; + + ::shutdown(priv->handle, how); + mode = mode&~m; +} + const SockAddr &ClientSocket::get_peer_address() const { - if(peer_addr==0) + if(!peer_addr) throw bad_socket_state("not connected"); return *peer_addr; } -unsigned ClientSocket::do_write(const char *buf, unsigned size) +size_t ClientSocket::do_write(const char *buf, size_t size) { + check_access(IO::M_WRITE); if(!connected) throw bad_socket_state("not connected"); if(size==0) return 0; - int ret = ::send(priv->handle, buf, size, 0); - if(ret<0) - { - if(errno==EAGAIN) - return 0; - else - throw system_error("send"); - } - - return ret; + return check_sys_error(::send(priv->handle, buf, size, 0), "send"); } -unsigned ClientSocket::do_read(char *buf, unsigned size) +size_t ClientSocket::do_read(char *buf, size_t size) { + check_access(IO::M_READ); if(!connected) throw bad_socket_state("not connected"); if(size==0) return 0; - int ret = ::recv(priv->handle, buf, size, 0); - if(ret<0) - { - if(errno==EAGAIN) - return 0; - else - throw system_error("recv"); - } - else if(ret==0 && !eof_flag) + size_t ret = check_sys_error(::recv(priv->handle, buf, size, 0), "recv"); + if(ret==0 && !eof_flag) { eof_flag = true; + set_socket_events(S_NONE); signal_end_of_file.emit(); - set_events(IO::P_NONE); } return ret;