X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsocket.cpp;h=c845471a58ed13d20608b4768e13879389370016;hb=6102d830138013216241b6723527246764103fa0;hp=fcd686f1f24d810fb1eef4a6bc8faf139c841288;hpb=3970ee9cf7978c462390d49e083deb740d71c6fe;p=libs%2Fnet.git diff --git a/source/socket.cpp b/source/socket.cpp index fcd686f..c845471 100644 --- a/source/socket.cpp +++ b/source/socket.cpp @@ -1,17 +1,13 @@ -/* $Id$ - -This file is part of libmspnet -Copyright © 2008 Mikkosoft Productions, Mikko Rasa -Distributed under the LGPL -*/ - #ifndef WIN32 #include #include #include #endif #include -#include +#include +#include +#include +#include #include #include "socket.h" @@ -24,7 +20,7 @@ public: WinSockHelper() { WSADATA wsa_data; - int err=WSAStartup(0x0002, &wsa_data); + int err = WSAStartup(0x0002, &wsa_data); if(err) std::cerr<<"Failed to initialize WinSock: "<(&sa), &size); + local_addr = SockAddr::create(sa); + +#ifdef WIN32 + event = CreateEvent(0, false, false, 0); +#else + *event = handle; +#endif +} + +Socket::Socket(Family af, int type, int proto): + connected(false), + local_addr(0), + peer_addr(0) +{ + handle = socket(af, type, proto); + +#ifdef WIN32 + event = CreateEvent(0, false, false, 0); +#else + *event = handle; +#endif +} + +Socket::~Socket() +{ + close(); +} + void Socket::set_block(bool b) { - mode=(mode&~IO::M_NONBLOCK); + mode = (mode&~IO::M_NONBLOCK); if(b) - mode=(mode|IO::M_NONBLOCK); + mode = (mode|IO::M_NONBLOCK); #ifdef WIN32 - u_long flag=!b; + u_long flag = !b; ioctlsocket(handle, FIONBIO, &flag); #else - int flags=fcntl(handle, F_GETFL); + int flags = fcntl(handle, F_GETFL); fcntl(handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK)); #endif } -IO::Handle Socket::get_event_handle() +const IO::Handle &Socket::get_event_handle() { -#ifdef WIN32 return event; -#else - return handle; -#endif } @@ -72,21 +101,17 @@ void Socket::bind(const SockAddr &addr) { check_state(false); - sockaddr sa; - unsigned size=addr.fill_sockaddr(sa); + sockaddr_storage sa; + unsigned size = addr.fill_sockaddr(sa); - int err=::bind(handle, &sa, size); + int err = ::bind(handle, reinterpret_cast(&sa), size); if(err==-1) - throw SystemError("Unable to bind", errno); + throw system_error("bind"); delete local_addr; - local_addr=addr.copy(); + local_addr = addr.copy(); } -/** -Closes the socket. Most operations on the socket will return an error after -this. -*/ void Socket::close() { if(handle==MSP_NET_INVALID_SOCKET_HANDLE) @@ -101,71 +126,61 @@ void Socket::close() #else ::close(handle); #endif - handle=MSP_NET_INVALID_SOCKET_HANDLE; + handle = MSP_NET_INVALID_SOCKET_HANDLE; + connected = false; signal_closed.emit(); delete local_addr; - local_addr=0; + local_addr = 0; delete peer_addr; - peer_addr=0; + peer_addr = 0; +} + +void Socket::set_timeout(const Time::TimeDelta &timeout) +{ +#ifndef WIN32 + timeval tv = Time::rawtime_to_timeval(timeout.raw()); + set_option(SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(timeval)); + set_option(SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(timeval)); +#else + DWORD msecs = static_cast(timeout/Time::msec); + set_option(SOL_SOCKET, SO_RCVTIMEO, &msecs, sizeof(DWORD)); + set_option(SOL_SOCKET, SO_SNDTIMEO, &msecs, sizeof(DWORD)); +#endif } const SockAddr &Socket::get_local_address() const { if(local_addr==0) - throw InvalidState("Local address not set"); + throw bad_socket_state("not bound"); return *local_addr; } const SockAddr &Socket::get_peer_address() const { if(peer_addr==0) - throw InvalidState("Peer address not set"); + throw bad_socket_state("not connected"); return *peer_addr; } -Socket::~Socket() -{ - close(); -} - -Socket::Socket(SocketHandle h, const SockAddr &paddr): - handle(h), - connected(true), - local_addr(0), - peer_addr(paddr.copy()) +void Socket::check_state(bool conn) const { - sockaddr sa; - socklen_t size=sizeof(sockaddr); - getsockname(handle, &sa, &size); - local_addr=SockAddr::create(sa); - -#ifdef WIN32 - event=CreateEvent(0, false, false, 0); -#endif + if(handle==MSP_NET_INVALID_SOCKET_HANDLE) + throw bad_socket_state("socket is closed"); + if(conn && !connected) + throw bad_socket_state("not connected"); } -Socket::Socket(Family af, int type, int proto): - connected(false), - local_addr(0), - peer_addr(0) +int Socket::set_option(int level, int optname, const void *optval, socklen_t optlen) { - handle=socket(af, type, proto); - #ifdef WIN32 - event=CreateEvent(0, false, false, 0); + return setsockopt(handle, level, optname, reinterpret_cast(optval), optlen); +#else + return setsockopt(handle, level, optname, optval, optlen); #endif } -void Socket::check_state(bool conn) const -{ - if(handle==MSP_NET_INVALID_SOCKET_HANDLE) - throw Exception("Socket is closed"); - if(conn && !connected) - throw Exception("Socket is not connected"); -} - -int Socket::get_option(int level, int optname, void *optval, socklen_t *optlen) +int Socket::get_option(int level, int optname, void *optval, socklen_t *optlen) const { #ifdef WIN32 return getsockopt(handle, level, optname, reinterpret_cast(optval), optlen); @@ -181,13 +196,13 @@ unsigned Socket::do_write(const char *buf, unsigned size) if(size==0) return 0; - int ret=::send(handle, buf, size, 0); + int ret = ::send(handle, buf, size, 0); if(ret<0) { if(errno==EAGAIN) return 0; else - throw SystemError("Writing to socket failed", errno); + throw system_error("send"); } return ret; @@ -200,17 +215,17 @@ unsigned Socket::do_read(char *buf, unsigned size) if(size==0) return 0; - int ret=::recv(handle, buf, size, 0); + int ret = ::recv(handle, buf, size, 0); if(ret<0) { if(errno==EAGAIN) return 0; else - throw SystemError("Reading from socket failed", errno); + throw system_error("recv"); } else if(ret==0 && !eof_flag) { - eof_flag=true; + eof_flag = true; signal_end_of_file.emit(); set_events(IO::P_NONE); }