Index: /trunk/include/iprt/socket.h =================================================================== --- /trunk/include/iprt/socket.h (revision 27503) +++ /trunk/include/iprt/socket.h (revision 27503) @@ -0,0 +1,150 @@ +/** @file + * IPRT - Network Sockets. + */ + +/* + * Copyright (C) 2006-2010 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + +#ifndef ___iprt_socket_h +#define ___iprt_socket_h + +#include +#include +#include +#include + +#ifdef IN_RING0 +# error "There are no RTSocket APIs available Ring-0 Host Context!" +#endif + + +RT_C_DECLS_BEGIN + +/** @defgroup grp_rt_tcp RTSocket - Network Sockets + * @ingroup grp_rt + * @{ + */ + +/** + * Destroys the specified handle, freeing associated resources and closing the + * socket. + * + * @returns IPRT status code. + * @param hSocket The socket handle. NIL is ignored. + * + * @remarks This will not perform a graceful shutdown of the socket, it will + * just destroy it. Use the protocol specific close method if this is + * desired. + */ +RTDECL(int) RTSocketDestroy(RTSOCKET hSocket); + +/** + * Gets the native socket handle. + * + * @returns The native socket handle or RTHCUINTPTR_MAX if not invalid. + * @param hSocket The socket handle. + */ +RTDECL(RTHCUINTPTR) RTSocketToNative(RTSOCKET hSocket); + +/** + * Helper that ensures the correct inheritability of a socket. + * + * We're currently ignoring failures. + * + * @returns IPRT status code + * @param hSocket The socket handle. + * @param fInheritable The desired inheritability state. + */ +RTDECL(int) RTSocketSetInheritance(RTSOCKET hSocket, bool fInheritable); + +/** + * Receive data from a socket. + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param pvBuffer Where to put the data we read. + * @param cbBuffer Read buffer size. + * @param pcbRead Number of bytes read. If NULL the entire buffer + * will be filled upon successful return. If not NULL a + * partial read can be done successfully. + */ +RTDECL(int) RTSocketRead(RTSOCKET hSocket, void *pvBuffer, size_t cbBuffer, size_t *pcbRead); + +/** + * Send data to a socket. + * + * @returns IPRT status code. + * @retval VERR_INTERRUPTED if interrupted before anything was written. + * + * @param hSocket The socket handle. + * @param pvBuffer Buffer to write data to socket. + * @param cbBuffer How much to write. + */ +RTDECL(int) RTSocketWrite(RTSOCKET hSocket, const void *pvBuffer, size_t cbBuffer); + +/** + * Checks if the socket is ready for reading (for I/O multiplexing). + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param cMillies Number of milliseconds to wait for the socket. Use + * RT_INDEFINITE_WAIT to wait for ever. + */ +RTDECL(int) RTSocketSelectOne(RTSOCKET hSocket, RTMSINTERVAL cMillies); + +/** + * Shuts down one or both directions of communciation. + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param fRead Whether to shutdown our read direction. + * @param fWrite Whether to shutdown our write direction. + */ +RTDECL(int) RTSocketShutdown(RTSOCKET hSocket, bool fRead, bool fWrite); + +/** + * Gets the address of the local side. + * + * @returns IPRT status code. + * @param Sock Socket descriptor. + * @param pAddr Where to store the local address on success. + */ +RTDECL(int) RTSocketGetLocalAddress(RTSOCKET hSocket, PRTNETADDR pAddr); + +/** + * Gets the address of the other party. + * + * @returns IPRT status code. + * @param Sock Socket descriptor. + * @param pAddr Where to store the peer address on success. + */ +RTDECL(int) RTSocketGetPeerAddress(RTSOCKET hSocket, PRTNETADDR pAddr); + +/** @} */ +RT_C_DECLS_END + +#endif + + Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 27502) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 27503) @@ -384,4 +384,5 @@ r3/path.cpp \ r3/process.cpp \ + r3/socket.cpp \ r3/stream.cpp \ r3/test.cpp \ Index: /trunk/src/VBox/Runtime/include/internal/socket.h =================================================================== --- /trunk/src/VBox/Runtime/include/internal/socket.h (revision 27503) +++ /trunk/src/VBox/Runtime/include/internal/socket.h (revision 27503) @@ -0,0 +1,58 @@ +/* $Id$ */ +/** @file + * IPRT - Internal Header for RTSocket. + */ + +/* + * Copyright (C) 2010 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + +#ifndef ___internal_socket_h +#define ___internal_socket_h + +#include +#include + + +RT_C_DECLS_BEGIN + +int rtSocketResolverError(void); +int rtSocketCreateForNative(RTSOCKETINT **ppSocket, +#ifdef RT_OS_WINDOWS + SOCKET hNative +#else + int hNative +#endif + ); +int rtSocketCreate(PRTSOCKET phSocket, int iDomain, int iType, int iProtocol); +int rtSocketBind(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr); +int rtSocketListen(RTSOCKET hSocket, int cMaxPending); +int rtSocketAccept(RTSOCKET hSocket, PRTSOCKET phClient, struct sockaddr *pAddr, size_t *pcbAddr); +int rtSocketConnect(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr); +int rtSocketSetOpt(RTSOCKET hSocket, int iLevel, int iOption, void const *pvValue, int cbValue); + +RT_C_DECLS_END + +#endif + Index: /trunk/src/VBox/Runtime/r3/posix/poll-posix.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/posix/poll-posix.cpp (revision 27502) +++ /trunk/src/VBox/Runtime/r3/posix/poll-posix.cpp (revision 27503) @@ -41,4 +41,5 @@ #include #include +#include #include #include @@ -300,11 +301,11 @@ case RTHANDLETYPE_PIPE: if (pHandle->u.hPipe != NIL_RTPIPE) - fd = RTPipeToNative(pHandle->u.hPipe); - break; - - //case RTHANDLETYPE_SOCKET: - // if (pHandle->u.hSocket != NIL_RTSOCKET) - // fd = (int)pHandle->u.hSocket; //fd = RTTcpToNative(pHandle->u.hSocket); - // break; + fd = (int)RTPipeToNative(pHandle->u.hPipe); + break; + + case RTHANDLETYPE_SOCKET: + if (pHandle->u.hSocket != NIL_RTSOCKET) + fd = (int)RTSocketToNative(pHandle->u.hSocket); + break; case RTHANDLETYPE_FILE: Index: /trunk/src/VBox/Runtime/r3/posix/process-posix.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/posix/process-posix.cpp (revision 27502) +++ /trunk/src/VBox/Runtime/r3/posix/process-posix.cpp (revision 27503) @@ -61,4 +61,5 @@ #include #include +#include #include #include "internal/process.h" @@ -118,9 +119,9 @@ break; - //case RTHANDLETYPE_SOCKET: - // aStdFds[i] = paHandles[i]->u.hSocket != NIL_RTSOCKET - // ? (int)paHandles[i]->u.hSocket //RTTcpToNative(paHandles[i]->u.hSocket) - // : -2 /* close it */; - // break; + case RTHANDLETYPE_SOCKET: + aStdFds[i] = paHandles[i]->u.hSocket != NIL_RTSOCKET + ? (int)RTSocketToNative(paHandles[i]->u.hSocket) + : -2 /* close it */; + break; default: Index: /trunk/src/VBox/Runtime/r3/socket.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/socket.cpp (revision 27503) +++ /trunk/src/VBox/Runtime/r3/socket.cpp (revision 27503) @@ -0,0 +1,861 @@ +/* $Id$ */ +/** @file + * IPRT - Network Sockets. + */ + +/* + * Copyright (C) 2006-2010 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#ifdef RT_OS_WINDOWS +# include +#else /* !RT_OS_WINDOWS */ +# include +# include +# include +# include +# include +# include +# ifdef IPRT_WITH_TCPIP_V6 +# include +# endif +# include +# include +# include +# include +#endif /* !RT_OS_WINDOWS */ +#include + +#include "internal/iprt.h" +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "internal/magics.h" +#include "internal/socket.h" + + +/******************************************************************************* +* Defined Constants And Macros * +*******************************************************************************/ +/* non-standard linux stuff (it seems). */ +#ifndef MSG_NOSIGNAL +# define MSG_NOSIGNAL 0 +#endif +#ifndef SHUT_RDWR +# ifdef SD_BOTH +# define SHUT_RDWR SD_BOTH +# else +# define SHUT_RDWR 2 +# endif +#endif +#ifndef SHUT_WR +# ifdef SD_SEND +# define SHUT_WR SD_SEND +# else +# define SHUT_WR 1 +# endif +#endif + +/* fixup backlevel OSes. */ +#if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS) +# define socklen_t int +#endif + +/** How many pending connection. */ +#define RTTCP_SERVER_BACKLOG 10 + + +/******************************************************************************* +* Structures and Typedefs * +*******************************************************************************/ +/** + * Socket handle data. + * + * This is mainly required for implementing RTPollSet on Windows. + */ +typedef struct RTSOCKETINT +{ + /** Magic number (RTTCPSOCKET_MAGIC). */ + uint32_t u32Magic; + /** Usage count. This is used to prevent two threads from accessing the + * handle concurrently. */ + uint32_t volatile cUsers; +#ifdef RT_OS_WINDOWS + /** The native socket handle. */ + SOCKET hNative; + /** The event semaphore we've associated with the socket handle. + * This is INVALID_HANDLE_VALUE if not done. */ + WSAEVENT hEvent; + /** The pollset currently polling this socket. This is NIL if no one is + * polling. */ + RTPOLLSET hPollSet; + /** The events we're polling for. */ + uint32_t fPollEvts; +#else + /** The native socket handle. */ + int hNative; +#endif +} RTSOCKETINT; + + +/** + * Address union used internally for things like getpeername and getsockname. + */ +typedef union RTSOCKADDRUNION +{ + struct sockaddr Addr; + struct sockaddr_in Ipv4; +#ifdef IPRT_WITH_TCPIP_V6 + struct sockaddr_in6 Ipv6; +#endif +} RTSOCKADDRUNION; + + +/******************************************************************************* +* Internal Functions * +*******************************************************************************/ + + +/** + * Get the last error as an iprt status code. + * + * @returns IPRT status code. + */ +DECLINLINE(int) rtSocketError(void) +{ +#ifdef RT_OS_WINDOWS + return RTErrConvertFromWin32(WSAGetLastError()); +#else + return RTErrConvertFromErrno(errno); +#endif +} + + +/** + * Resets the last error. + */ +DECLINLINE(void) rtSocketErrorReset(void) +{ +#ifdef RT_OS_WINDOWS + WSASetLastError(0); +#else + errno = 0; +#endif +} + + +/** + * Get the last resolver error as an iprt status code. + * + * @returns iprt status code. + */ +int rtSocketResolverError(void) +{ +#ifdef RT_OS_WINDOWS + return RTErrConvertFromWin32(WSAGetLastError()); +#else + switch (h_errno) + { + case HOST_NOT_FOUND: + return VERR_NET_HOST_NOT_FOUND; + case NO_DATA: + return VERR_NET_ADDRESS_NOT_AVAILABLE; + case NO_RECOVERY: + return VERR_IO_GEN_FAILURE; + case TRY_AGAIN: + return VERR_TRY_AGAIN; + + default: + return VERR_UNRESOLVED_ERROR; + } +#endif +} + + +/** + * Tries to lock the socket for exclusive usage by the calling thread. + * + * Call rtSocketUnlock() to unlock. + * + * @returns @c true if locked, @c false if not. + * @param pThis The socket structure. + */ +DECLINLINE(bool) rtSocketTryLock(RTSOCKETINT *pThis) +{ + return ASMAtomicCmpXchgU32(&pThis->cUsers, 1, 0); +} + + +/** + * Unlocks the socket. + * + * @param pThis The socket structure. + */ +DECLINLINE(void) rtSocketUnlock(RTSOCKETINT *pThis) +{ + ASMAtomicCmpXchgU32(&pThis->cUsers, 0, 1); +} + + +/** + * Creates an IPRT socket handle for a native one. + * + * @returns IPRT status code. + * @param ppSocket Where to return the IPRT socket handle. + * @param hNative The native handle. + */ +int rtSocketCreateForNative(RTSOCKETINT **ppSocket, +#ifdef RT_OS_WINDOWS + SOCKET hNative +#else + int hNative +#endif + ) +{ + RTSOCKETINT *pThis = (RTSOCKETINT *)RTMemAlloc(sizeof(*pThis)); + if (!pThis) + return VERR_NO_MEMORY; + pThis->u32Magic = RTSOCKET_MAGIC; + pThis->cUsers = 0; + pThis->hNative = hNative; +#ifdef RT_OS_WINDOWS + pThis->hEvent = INVALID_HANDLE_VALUE; + pThis->hPollSet = 0; + pThis->fPollEvts = 0; +#endif + *ppSocket = pThis; + return VINF_SUCCESS; +} + + +/** + * Wrapper around socket(). + * + * @returns IPRT status code. + * @param phSocket Where to store the handle to the socket on + * success. + * @param iDomain The protocol family (PF_XXX). + * @param iType The socket type (SOCK_XXX). + * @param iProtocol Socket parameter, usually 0. + */ +int rtSocketCreate(PRTSOCKET phSocket, int iDomain, int iType, int iProtocol) +{ + /* + * Create the socket. + */ +#ifdef RT_OS_WINDOWS + SOCKET hNative = socket(iDomain, iType, iProtocol); + if (hNative == INVALID_SOCKET) + return rtSocketError(); +#else + int hNative = socket(iDomain, iType, iProtocol); + if (hNative == -1) + return rtSocketError(); +#endif + + /* + * Wrap it. + */ + int rc = rtSocketCreateForNative(phSocket, hNative); + if (RT_FAILURE(rc)) + { +#ifdef RT_OS_WINDOWS + closesocket(hNative); +#else + close(hNative); +#endif + } + return rc; +} + + +RTDECL(int) RTSocketDestroy(RTSOCKET hSocket) +{ + RTSOCKETINT *pThis = hSocket; + if (pThis == NIL_RTSOCKET) + return VINF_SUCCESS; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + + Assert(pThis->cUsers == 0); + AssertReturn(ASMAtomicCmpXchgU32(&pThis->u32Magic, RTSOCKET_MAGIC_DEAD, RTSOCKET_MAGIC), VERR_INVALID_HANDLE); + + /* + * Do the cleanup. + */ + int rc = VINF_SUCCESS; +#ifdef RT_OS_WINDOWS + if (pThis->hEvent == INVALID_HANDLE_VALUE) + { + CloseHandle(pThis->hEvent); + pThis->hEvent = INVALID_HANDLE_VALUE; + } + + if (pThis->hNative != INVALID_HANDLE_VALUE) + { + rc = closesocket(pThis->hNative); + if (!rc) + rc = VINF_SUCCESS; + else + { + rc = rtSocketError(); + AssertMsgFailed(("\"%s\": closesocket(%p) -> %Rrc\n", pThis->hNative, rc)); + } + pThis->hNative = INVALID_HANDLE_VALUE; + } + +#else + if (pThis->hNative != -1) + { + if (close(pThis->hNative)) + { + rc = rtSocketError(); + AssertMsgFailed(("\"%s\": close(%d) -> %Rrc\n", pThis->hNative, rc)); + } + pThis->hNative = -1; + } +#endif + + return rc; +} + + +RTDECL(RTHCUINTPTR) RTSocketToNative(RTSOCKET hSocket) +{ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, RTHCUINTPTR_MAX); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, RTHCUINTPTR_MAX); + return (RTHCUINTPTR)pThis->hNative; +} + + +RTDECL(int) RTSocketSetInheritance(RTSOCKET hSocket, bool fInheritable) +{ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + int rc = VINF_SUCCESS; +#ifdef RT_OS_WINDOWS + if (!SetHandleInformation(pThis->hNative, HANDLE_FLAG_INHERIT, fInheritable ? HANDLE_FLAG_INHERIT : 0)) + rc = RTErrConvertFromWin32(GetLastError()); +#else + if (fcntl(pThis->hNative, F_SETFD, fInheritable ? 0 : FD_CLOEXEC) < 0) + rc = RTErrConvertFromErrno(errno); +#endif + AssertRC(rc); /// @todo remove later. + + rtSocketUnlock(pThis); + return rc; +} + + +RTDECL(int) RTSocketRead(RTSOCKET hSocket, void *pvBuffer, size_t cbBuffer, size_t *pcbRead) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(cbBuffer > 0, VERR_INVALID_PARAMETER); + AssertPtr(pvBuffer); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + /* + * Read loop. + * If pcbRead is NULL we have to fill the entire buffer! + */ + int rc = VINF_SUCCESS; + size_t cbRead = 0; + size_t cbToRead = cbBuffer; + for (;;) + { + rtSocketErrorReset(); +#ifdef RT_OS_WINDOWS + int cbNow = cbToRead >= INT_MAX/2 ? INT_MAX/2 : (int)cbToRead; +#else + size_t cbNow = cbToRead; +#endif + ssize_t cbBytesRead = recv(pThis->hNative, (char *)pvBuffer + cbRead, cbNow, MSG_NOSIGNAL); + if (cbBytesRead <= 0) + { + rc = rtSocketError(); + Assert(RT_FAILURE_NP(rc) || cbBytesRead == 0); + if (RT_SUCCESS_NP(rc)) + { + if (!pcbRead) + rc = VERR_NET_SHUTDOWN; + else + { + *pcbRead = 0; + rc = VINF_SUCCESS; + } + } + break; + } + if (pcbRead) + { + /* return partial data */ + *pcbRead = cbBytesRead; + break; + } + + /* read more? */ + cbRead += cbBytesRead; + if (cbRead == cbBuffer) + break; + + /* next */ + cbToRead = cbBuffer - cbRead; + } + + rtSocketUnlock(pThis); + return rc; +} + + +RTDECL(int) RTSocketWrite(RTSOCKET hSocket, const void *pvBuffer, size_t cbBuffer) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + /* + * Try write all at once. + */ + int rc = VINF_SUCCESS; +#ifdef RT_OS_WINDOWS + int cbNow = cbBuffer >= INT_MAX / 2 ? INT_MAX / 2 : (int)cbBuffer; +#else + size_t cbNow = cbBuffer >= SSIZE_MAX ? SSIZE_MAX : cbBuffer; +#endif + ssize_t cbWritten = send(pThis->hNative, (const char *)pvBuffer, cbNow, MSG_NOSIGNAL); + if (RT_LIKELY((size_t)cbWritten == cbBuffer && cbWritten >= 0)) + rc = VINF_SUCCESS; + else if (cbWritten < 0) + rc = rtSocketError(); + else + { + /* + * Unfinished business, write the remainder of the request. Must ignore + * VERR_INTERRUPTED here if we've managed to send something. + */ + size_t cbSentSoFar = 0; + for (;;) + { + /* advance */ + cbBuffer -= (size_t)cbWritten; + if (!cbBuffer) + break; + cbSentSoFar += (size_t)cbWritten; + pvBuffer = (char const *)pvBuffer + cbWritten; + + /* send */ +#ifdef RT_OS_WINDOWS + cbNow = cbBuffer >= INT_MAX / 2 ? INT_MAX / 2 : (int)cbBuffer; +#else + cbNow = cbBuffer >= SSIZE_MAX ? SSIZE_MAX : cbBuffer; +#endif + cbWritten = send(pThis->hNative, (const char *)pvBuffer, cbNow, MSG_NOSIGNAL); + if (cbWritten >= 0) + AssertMsg(cbBuffer >= (size_t)cbWritten, ("Wrote more than we requested!!! cbWritten=%zu cbBuffer=%zu rtSocketError()=%d\n", + cbWritten, cbBuffer, rtSocketError())); + else + { + rc = rtSocketError(); + if (rc != VERR_INTERNAL_ERROR || cbSentSoFar == 0) + break; + cbWritten = 0; + rc = VINF_SUCCESS; + } + } + } + + rtSocketUnlock(pThis); + return rc; +} + + +RTDECL(int) RTSocketSelectOne(RTSOCKET hSocket, RTMSINTERVAL cMillies) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + /* + * Set up the file descriptor sets and do the select. + */ + fd_set fdsetR; + FD_ZERO(&fdsetR); + FD_SET(pThis->hNative, &fdsetR); + + fd_set fdsetE = fdsetR; + + int rc; + if (cMillies == RT_INDEFINITE_WAIT) + rc = select(pThis->hNative + 1, &fdsetR, NULL, &fdsetE, NULL); + else + { + struct timeval timeout; + timeout.tv_sec = cMillies / 1000; + timeout.tv_usec = (cMillies % 1000) * 1000; + rc = select(pThis->hNative + 1, &fdsetR, NULL, &fdsetE, &timeout); + } + if (rc > 0) + rc = VINF_SUCCESS; + else if (rc == 0) + rc = VERR_TIMEOUT; + else + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + +RTDECL(int) RTSocketShutdown(RTSOCKET hSocket, bool fRead, bool fWrite) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(fRead || fWrite, VERR_INVALID_PARAMETER); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + /* + * Do the job. + */ + int rc = VINF_SUCCESS; + int fHow; + if (fRead && fWrite) + fHow = SHUT_RDWR; + else if (fRead) + fHow = SHUT_RD; + else + fHow = SHUT_WR; + if (shutdown(pThis->hNative, fHow) == -1) + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + +/** + * Converts from a native socket address to a generic IPRT network address. + * + * @returns IPRT status code. + * @param pSrc The source address. + * @param cbSrc The size of the source address. + * @param pAddr Where to return the generic IPRT network + * address. + */ +static int rtSocketConvertAddress(RTSOCKADDRUNION const *pSrc, size_t cbSrc, PRTNETADDR pAddr) +{ + /* + * Convert the address. + */ + if ( cbSrc == sizeof(struct sockaddr_in) + && pSrc->Addr.sa_family == AF_INET) + { + RT_ZERO(*pAddr); + pAddr->enmType = RTNETADDRTYPE_IPV4; + pAddr->uPort = RT_N2H_U16(pSrc->Ipv4.sin_port); + pAddr->uAddr.IPv4.u = pSrc->Ipv4.sin_addr.s_addr; + } +#ifdef IPRT_WITH_TCPIP_V6 + else if ( cbSrc == sizeof(struct sockaddr_in6) + && pSrc->Addr.sa_family == AF_INET6) + { + RT_ZERO(*pAddr); + pAddr->enmType = RTNETADDRTYPE_IPV6; + pAddr->uPort = RT_N2H_U16(pSrc->Ipv6.sin6_port); + pAddr->uAddr.IPv6.au32[0] = pSrc->Ipv6.sin6_addr.s6_addr32[0]; + pAddr->uAddr.IPv6.au32[1] = pSrc->Ipv6.sin6_addr.s6_addr32[1]; + pAddr->uAddr.IPv6.au32[2] = pSrc->Ipv6.sin6_addr.s6_addr32[2]; + pAddr->uAddr.IPv6.au32[3] = pSrc->Ipv6.sin6_addr.s6_addr32[3]; + } +#endif + else + return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED; + return VINF_SUCCESS; +} + + +RTDECL(int) RTSocketGetLocalAddress(RTSOCKET hSocket, PRTNETADDR pAddr) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + /* + * Get the address and convert it. + */ + int rc; + RTSOCKADDRUNION u; +#ifdef RT_OS_WINDOWS + int cbAddr = sizeof(u); +#else + socklen_t cbAddr = sizeof(u); +#endif + RT_ZERO(u); + if (getsockname(pThis->hNative, &u.Addr, &cbAddr) == 0) + rc = rtSocketConvertAddress(&u, cbAddr, pAddr); + else + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + +RTDECL(int) RTSocketGetPeerAddress(RTSOCKET hSocket, PRTNETADDR pAddr) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + /* + * Get the address and convert it. + */ + int rc; + RTSOCKADDRUNION u; +#ifdef RT_OS_WINDOWS + int cbAddr = sizeof(u); +#else + socklen_t cbAddr = sizeof(u); +#endif + RT_ZERO(u); + if (getpeername(pThis->hNative, &u.Addr, &cbAddr) == 0) + rc = rtSocketConvertAddress(&u, cbAddr, pAddr); + else + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + + +/** + * Wrapper around bind. + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param pAddr The socket address to bind to. + * @param cbAddr The size of the address structure @a pAddr + * points to. + */ +int rtSocketBind(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + int rc = VINF_SUCCESS; + if (bind(pThis->hNative, pAddr, cbAddr) != 0) + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + +/** + * Wrapper around listen. + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param cMaxPending The max number of pending connections. + */ +int rtSocketListen(RTSOCKET hSocket, int cMaxPending) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + int rc = VINF_SUCCESS; + if (listen(pThis->hNative, cMaxPending) != 0) + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + +/** + * Wrapper around accept. + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param phClient Where to return the client socket handle on + * success. + * @param pAddr Where to return the client address. + * @param pcbAddr On input this gives the size buffer size of what + * @a pAddr point to. On return this contains the + * size of what's stored at @a pAddr. + */ +int rtSocketAccept(RTSOCKET hSocket, PRTSOCKET phClient, struct sockaddr *pAddr, size_t *pcbAddr) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + /* + * Call accept(). + */ + rtSocketErrorReset(); + int rc = VINF_SUCCESS; +#ifdef RT_OS_WINDOWS + int cbAddr = (int)*pcbAddr; + SOCKET hNative = accept(pThis->hNative, pAddr, &cbAddr); + if (hNative != INVALID_SOCKET) +#else + socklen_t cbAddr = *pcbAddr; + int hNative = accept(pThis->hNative, pAddr, &cbAddr); + if (hNative != -1) +#endif + { + *pcbAddr = cbAddr; + + /* + * Wrap the client socket. + */ + rc = rtSocketCreateForNative(phClient, hNative); + if (RT_FAILURE(rc)) + { +#ifdef RT_OS_WINDOWS + closesocket(hNative); +#else + close(hNative); +#endif + } + } + else + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + +/** + * Wrapper around connect. + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param pAddr The socket address to connect to. + * @param cbAddr The size of the address structure @a pAddr + * points to. + */ +int rtSocketConnect(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + int rc = VINF_SUCCESS; + if (connect(pThis->hNative, pAddr, cbAddr) != 0) + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + + +/** + * Wrapper around setsockopt. + * + * @returns IPRT status code. + * @param hSocket The socket handle. + * @param iLevel The protocol level, e.g. IPPORTO_TCP. + * @param iOption The option, e.g. TCP_NODELAY. + * @param pvValue The value buffer. + * @param cbValue The size of the value pointed to by pvValue. + */ +int rtSocketSetOpt(RTSOCKET hSocket, int iLevel, int iOption, void const *pvValue, int cbValue) +{ + /* + * Validate input. + */ + RTSOCKETINT *pThis = hSocket; + AssertPtrReturn(pThis, VERR_INVALID_HANDLE); + AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); + AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); + + int rc = VINF_SUCCESS; + if (setsockopt(pThis->hNative, iLevel, iOption, (const char *)pvValue, cbValue) != 0) + rc = rtSocketError(); + + rtSocketUnlock(pThis); + return rc; +} + Index: /trunk/src/VBox/Runtime/r3/tcp.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/tcp.cpp (revision 27502) +++ /trunk/src/VBox/Runtime/r3/tcp.cpp (revision 27503) @@ -61,8 +61,10 @@ #include #include +#include #include #include #include "internal/magics.h" +#include "internal/socket.h" @@ -201,805 +203,4 @@ - -/** - * Get the last error as an iprt status code. - * - * @returns IPRT status code. - */ -DECLINLINE(int) rtSocketError(void) -{ -#ifdef RT_OS_WINDOWS - return RTErrConvertFromWin32(WSAGetLastError()); -#else - return RTErrConvertFromErrno(errno); -#endif -} - - -/** - * Resets the last error. - */ -DECLINLINE(void) rtSocketErrorReset(void) -{ -#ifdef RT_OS_WINDOWS - WSASetLastError(0); -#else - errno = 0; -#endif -} - - -/** - * Get the last resolver error as an iprt status code. - * - * @returns iprt status code. - */ -DECLINLINE(int) rtSocketResolverError(void) -{ -#ifdef RT_OS_WINDOWS - return RTErrConvertFromWin32(WSAGetLastError()); -#else - switch (h_errno) - { - case HOST_NOT_FOUND: - return VERR_NET_HOST_NOT_FOUND; - case NO_DATA: - return VERR_NET_ADDRESS_NOT_AVAILABLE; - case NO_RECOVERY: - return VERR_IO_GEN_FAILURE; - case TRY_AGAIN: - return VERR_TRY_AGAIN; - - default: - return VERR_UNRESOLVED_ERROR; - } -#endif -} - - -/** - * Tries to lock the socket for exclusive usage by the calling thread. - * - * Call rtSocketUnlock() to unlock. - * - * @returns @c true if locked, @c false if not. - * @param pThis The socket structure. - */ -DECLINLINE(bool) rtSocketTryLock(RTSOCKETINT *pThis) -{ - return ASMAtomicCmpXchgU32(&pThis->cUsers, 1, 0); -} - - -/** - * Unlocks the socket. - * - * @param pThis The socket structure. - */ -DECLINLINE(void) rtSocketUnlock(RTSOCKETINT *pThis) -{ - ASMAtomicCmpXchgU32(&pThis->cUsers, 0, 1); -} - - -/** - * Creates an IPRT socket handle for a native one. - * - * @returns IPRT status code. - * @param ppSocket Where to return the IPRT socket handle. - * @param hNative The native handle. - */ -int rtSocketCreateForNative(RTSOCKETINT **ppSocket, -#ifdef RT_OS_WINDOWS - HANDLE hNative -#else - int hNative -#endif - ) -{ - RTSOCKETINT *pThis = (RTSOCKETINT *)RTMemAlloc(sizeof(*pThis)); - if (!pThis) - return VERR_NO_MEMORY; - pThis->u32Magic = RTSOCKET_MAGIC; - pThis->cUsers = 0; - pThis->hNative = hNative; -#ifdef RT_OS_WINDOWS - pThis->hEvent = INVALID_HANDLE_VALUE; - pThis->hPollSet = 0; - pThis->fPollEvts = 0; -#endif - *ppSocket = pThis; - return VINF_SUCCESS; -} - - -/** - * Wrapper around socket(). - * - * @returns IPRT status code. - * @param phSocket Where to store the handle to the socket on - * success. - * @param iDomain The protocol family (PF_XXX). - * @param iType The socket type (SOCK_XXX). - * @param iProtocol Socket parameter, usually 0. - */ -static int rtSocketCreate(PRTSOCKET phSocket, int iDomain, int iType, int iProtocol) -{ - /* - * Create the socket. - */ -#ifdef RT_OS_WINDOWS - SOCKET hNative = socket(iDomain, iType, iProtocol); - if (hNative == INVALID_SOCKET) - return rtSocketError(); -#else - int hNative = socket(iDomain, iType, iProtocol); - if (hNative == -1) - return rtSocketError(); -#endif - - /* - * Wrap it. - */ - int rc = rtSocketCreateForNative(phSocket, hNative); - if (RT_FAILURE(rc)) - { -#ifdef RT_OS_WINDOWS - closesocket(hNative); -#else - close(hNative); -#endif - } - return rc; -} - - -/** - * Destroys the specified handle, freeing associated resources and closing the - * socket. - * - * @returns IPRT status code. - * @param hSocket The socket handle. NIL is ignored. - * - * @remarks This will not perform a graceful shutdown of the socket, it will - * just destroy it. Use the protocol specific close method if this is - * desired. - */ -int rtSocketDestroy(RTSOCKET hSocket) -{ - RTSOCKETINT *pThis = hSocket; - if (pThis == NIL_RTSOCKET) - return VINF_SUCCESS; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - - Assert(pThis->cUsers == 0); - AssertReturn(ASMAtomicCmpXchgU32(&pThis->u32Magic, RTSOCKET_MAGIC_DEAD, RTSOCKET_MAGIC), VERR_INVALID_HANDLE); - - /* - * Do the cleanup. - */ - int rc = VINF_SUCCESS; -#ifdef RT_OS_WINDOWS - if (pThis->hEvent == INVALID_HANDLE_VALUE) - { - CloseHandle(pThis->hEvent); - pThis->hEvent = INVALID_HANDLE_VALUE; - } - - if (pThis->hNative != INVALID_HANDLE_VALUE) - { - rc = closesocket(pThis->hNative); - if (!rc) - rc = VINF_SUCCESS; - else - { - rc = rtSocketError(); - AssertMsgFailed(("\"%s\": closesocket(%p) -> %Rrc\n", pThis->hNative, rc)); - } - pThis->hNative = INVALID_HANDLE_VALUE; - } - -#else - if (pThis->hNative != -1) - { - if (close(pThis->hNative)) - { - rc = rtSocketError(); - AssertMsgFailed(("\"%s\": close(%d) -> %Rrc\n", pThis->hNative, rc)); - } - pThis->hNative = -1; - } -#endif - - return rc; -} - - -/** - * Gets the native socket handle. - * - * @returns The native socket handle or RTHCUINTPTR_MAX if not invalid. - * @param hSocket The socket handle. - */ -RTHCUINTPTR rtSocketNative(RTSOCKET hSocket) -{ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, RTHCUINTPTR_MAX); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, RTHCUINTPTR_MAX); - return (RTHCUINTPTR)pThis->hNative; -} - - -/** - * Helper that ensures the correct inheritability of a socket. - * - * We're currently ignoring failures. - * - * @returns IPRT status code - * @param hSocket The socket handle. - * @param fInheritable The desired inheritability state. - */ -int rtSocketSetInheritance(RTSOCKET hSocket, bool fInheritable) -{ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - int rc = VINF_SUCCESS; -#ifdef RT_OS_WINDOWS - if (!SetHandleInformation(pThis->hNative, HANDLE_FLAG_INHERIT, fInheritable ? HANDLE_FLAG_INHERIT : 0)) - rc = RTErrConvertFromWin32(GetLastError()); -#else - if (fcntl(pThis->hNative, F_SETFD, fInheritable ? 0 : FD_CLOEXEC) < 0) - rc = RTErrConvertFromErrno(errno); -#endif - AssertRC(rc); /// @todo remove later. - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Receive data from a socket. - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param pvBuffer Where to put the data we read. - * @param cbBuffer Read buffer size. - * @param pcbRead Number of bytes read. If NULL the entire buffer - * will be filled upon successful return. If not NULL a - * partial read can be done successfully. - */ -int rtSocketRead(RTSOCKET hSocket, void *pvBuffer, size_t cbBuffer, size_t *pcbRead) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(cbBuffer > 0, VERR_INVALID_PARAMETER); - AssertPtr(pvBuffer); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - /* - * Read loop. - * If pcbRead is NULL we have to fill the entire buffer! - */ - int rc = VINF_SUCCESS; - size_t cbRead = 0; - size_t cbToRead = cbBuffer; - for (;;) - { - rtSocketErrorReset(); -#ifdef RT_OS_WINDOWS - int cbNow = cbToRead >= INT_MAX/2 ? INT_MAX/2 : (int)cbToRead; -#else - size_t cbNow = cbToRead; -#endif - ssize_t cbBytesRead = recv(pThis->hNative, (char *)pvBuffer + cbRead, cbNow, MSG_NOSIGNAL); - if (cbBytesRead <= 0) - { - rc = rtSocketError(); - Assert(RT_FAILURE_NP(rc) || cbBytesRead == 0); - if (RT_SUCCESS_NP(rc)) - { - if (!pcbRead) - rc = VERR_NET_SHUTDOWN; - else - { - *pcbRead = 0; - rc = VINF_SUCCESS; - } - } - break; - } - if (pcbRead) - { - /* return partial data */ - *pcbRead = cbBytesRead; - break; - } - - /* read more? */ - cbRead += cbBytesRead; - if (cbRead == cbBuffer) - break; - - /* next */ - cbToRead = cbBuffer - cbRead; - } - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Send data to a socket. - * - * @returns IPRT status code. - * @retval VERR_INTERRUPTED if interrupted before anything was written. - * - * @param hSocket The socket handle. - * @param pvBuffer Buffer to write data to socket. - * @param cbBuffer How much to write. - */ -int rtSocketWrite(RTSOCKET hSocket, const void *pvBuffer, size_t cbBuffer) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - /* - * Try write all at once. - */ - int rc = VINF_SUCCESS; -#ifdef RT_OS_WINDOWS - int cbNow = cbBuffer >= INT_MAX / 2 ? INT_MAX / 2 : (int)cbBuffer; -#else - size_t cbNow = cbBuffer >= SSIZE_MAX ? SSIZE_MAX : cbBuffer; -#endif - ssize_t cbWritten = send(pThis->hNative, (const char *)pvBuffer, cbNow, MSG_NOSIGNAL); - if (RT_LIKELY((size_t)cbWritten == cbBuffer && cbWritten >= 0)) - rc = VINF_SUCCESS; - else if (cbWritten < 0) - rc = rtSocketError(); - else - { - /* - * Unfinished business, write the remainder of the request. Must ignore - * VERR_INTERRUPTED here if we've managed to send something. - */ - size_t cbSentSoFar = 0; - for (;;) - { - /* advance */ - cbBuffer -= (size_t)cbWritten; - if (!cbBuffer) - break; - cbSentSoFar += (size_t)cbWritten; - pvBuffer = (char const *)pvBuffer + cbWritten; - - /* send */ -#ifdef RT_OS_WINDOWS - cbNow = cbBuffer >= INT_MAX / 2 ? INT_MAX / 2 : (int)cbBuffer; -#else - cbNow = cbBuffer >= SSIZE_MAX ? SSIZE_MAX : cbBuffer; -#endif - cbWritten = send(pThis->hNative, (const char *)pvBuffer, cbNow, MSG_NOSIGNAL); - if (cbWritten >= 0) - AssertMsg(cbBuffer >= (size_t)cbWritten, ("Wrote more than we requested!!! cbWritten=%zu cbBuffer=%zu rtSocketError()=%d\n", - cbWritten, cbBuffer, rtSocketError())); - else - { - rc = rtSocketError(); - if (rc != VERR_INTERNAL_ERROR || cbSentSoFar == 0) - break; - cbWritten = 0; - rc = VINF_SUCCESS; - } - } - } - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Checks if the socket is ready for reading (for I/O multiplexing). - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param cMillies Number of milliseconds to wait for the socket. Use - * RT_INDEFINITE_WAIT to wait for ever. - */ -int rtSocketSelectOne(RTSOCKET hSocket, RTMSINTERVAL cMillies) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - /* - * Set up the file descriptor sets and do the select. - */ - fd_set fdsetR; - FD_ZERO(&fdsetR); - FD_SET(pThis->hNative, &fdsetR); - - fd_set fdsetE = fdsetR; - - int rc; - if (cMillies == RT_INDEFINITE_WAIT) - rc = select(pThis->hNative + 1, &fdsetR, NULL, &fdsetE, NULL); - else - { - struct timeval timeout; - timeout.tv_sec = cMillies / 1000; - timeout.tv_usec = (cMillies % 1000) * 1000; - rc = select(pThis->hNative + 1, &fdsetR, NULL, &fdsetE, &timeout); - } - if (rc > 0) - rc = VINF_SUCCESS; - else if (rc == 0) - rc = VERR_TIMEOUT; - else - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Shuts down one or both directions of communciation. - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param fRead Whether to shutdown our read direction. - * @param fWrite Whether to shutdown our write direction. - */ -static int rtSocketShutdown(RTSOCKET hSocket, bool fRead, bool fWrite) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(fRead || fWrite, VERR_INVALID_PARAMETER); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - /* - * Do the job. - */ - int rc = VINF_SUCCESS; - int fHow; - if (fRead && fWrite) - fHow = SHUT_RDWR; - else if (fRead) - fHow = SHUT_RD; - else - fHow = SHUT_WR; - if (shutdown(pThis->hNative, fHow) == -1) - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Converts from a native socket address to a generic IPRT network address. - * - * @returns IPRT status code. - * @param pSrc The source address. - * @param cbSrc The size of the source address. - * @param pAddr Where to return the generic IPRT network - * address. - */ -static int rtSocketConvertAddress(RTSOCKADDRUNION const *pSrc, size_t cbSrc, PRTNETADDR pAddr) -{ - /* - * Convert the address. - */ - if ( cbSrc == sizeof(struct sockaddr_in) - && pSrc->Addr.sa_family == AF_INET) - { - RT_ZERO(*pAddr); - pAddr->enmType = RTNETADDRTYPE_IPV4; - pAddr->uPort = RT_N2H_U16(pSrc->Ipv4.sin_port); - pAddr->uAddr.IPv4.u = pSrc->Ipv4.sin_addr.s_addr; - } -#ifdef IPRT_WITH_TCPIP_V6 - else if ( cbSrc == sizeof(struct sockaddr_in6) - && pSrc->Addr.sa_family == AF_INET6) - { - RT_ZERO(*pAddr); - pAddr->enmType = RTNETADDRTYPE_IPV6; - pAddr->uPort = RT_N2H_U16(pSrc->Ipv6.sin6_port); - pAddr->uAddr.IPv6.au32[0] = pSrc->Ipv6.sin6_addr.s6_addr32[0]; - pAddr->uAddr.IPv6.au32[1] = pSrc->Ipv6.sin6_addr.s6_addr32[1]; - pAddr->uAddr.IPv6.au32[2] = pSrc->Ipv6.sin6_addr.s6_addr32[2]; - pAddr->uAddr.IPv6.au32[3] = pSrc->Ipv6.sin6_addr.s6_addr32[3]; - } -#endif - else - return VERR_NET_ADDRESS_FAMILY_NOT_SUPPORTED; - return VINF_SUCCESS; -} - - -/** - * Gets the address of the local side. - * - * @returns IPRT status code. - * @param Sock Socket descriptor. - * @param pAddr Where to store the local address on success. - */ -int rtSocketGetLocalAddress(RTSOCKET hSocket, PRTNETADDR pAddr) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - /* - * Get the address and convert it. - */ - int rc; - RTSOCKADDRUNION u; -#ifdef RT_OS_WINDOWS - int cbAddr = sizeof(u); -#else - socklen_t cbAddr = sizeof(u); -#endif - RT_ZERO(u); - if (getsockname(pThis->hNative, &u.Addr, &cbAddr) == 0) - rc = rtSocketConvertAddress(&u, cbAddr, pAddr); - else - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Gets the address of the other party. - * - * @returns IPRT status code. - * @param Sock Socket descriptor. - * @param pAddr Where to store the peer address on success. - */ -int rtSocketGetPeerAddress(RTSOCKET hSocket, PRTNETADDR pAddr) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - /* - * Get the address and convert it. - */ - int rc; - RTSOCKADDRUNION u; -#ifdef RT_OS_WINDOWS - int cbAddr = sizeof(u); -#else - socklen_t cbAddr = sizeof(u); -#endif - RT_ZERO(u); - if (getpeername(pThis->hNative, &u.Addr, &cbAddr) == 0) - rc = rtSocketConvertAddress(&u, cbAddr, pAddr); - else - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -///////////////////////////////////////////////////////////////////////////////// - - -/** - * Wrapper around bind. - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param pAddr The socket address to bind to. - * @param cbAddr The size of the address structure @a pAddr - * points to. - */ -int rtSocketBind(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - int rc = VINF_SUCCESS; - if (bind(pThis->hNative, pAddr, cbAddr) != 0) - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Wrapper around listen. - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param cMaxPending The max number of pending connections. - */ -int rtSocketListen(RTSOCKET hSocket, int cMaxPending) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - int rc = VINF_SUCCESS; - if (listen(pThis->hNative, cMaxPending) != 0) - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Wrapper around accept. - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param phClient Where to return the client socket handle on - * success. - * @param pAddr Where to return the client address. - * @param pcbAddr On input this gives the size buffer size of what - * @a pAddr point to. On return this contains the - * size of what's stored at @a pAddr. - */ -int rtSocketAccept(RTSOCKET hSocket, PRTSOCKET phClient, struct sockaddr *pAddr, size_t *pcbAddr) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - /* - * Call accept(). - */ - rtSocketErrorReset(); - int rc = VINF_SUCCESS; -#ifdef RT_OS_WINDOWS - int cbAddr = (int)*pcbAddr; - SOCKET hNative = accept(pThis->hNative, pAddr, &cbAddr); - if (hNative != INVALID_SOCKET) -#else - socklen_t cbAddr = *pcbAddr; - int hNative = accept(pThis->hNative, pAddr, &cbAddr); - if (hNative != -1) -#endif - { - *pcbAddr = cbAddr; - - /* - * Wrap the client socket. - */ - rc = rtSocketCreateForNative(phClient, hNative); - if (RT_FAILURE(rc)) - { -#ifdef RT_OS_WINDOWS - closesocket(hNative); -#else - close(hNative); -#endif - } - } - else - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Wrapper around connect. - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param pAddr The socket address to connect to. - * @param cbAddr The size of the address structure @a pAddr - * points to. - */ -int rtSocketConnect(RTSOCKET hSocket, const struct sockaddr *pAddr, int cbAddr) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - int rc = VINF_SUCCESS; - if (connect(pThis->hNative, pAddr, cbAddr) != 0) - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - -/** - * Wrapper around setsockopt. - * - * @returns IPRT status code. - * @param hSocket The socket handle. - * @param iLevel The protocol level, e.g. IPPORTO_TCP. - * @param iOption The option, e.g. TCP_NODELAY. - * @param pvValue The value buffer. - * @param cbValue The size of the value pointed to by pvValue. - */ -int rtSocketSetOpt(RTSOCKET hSocket, int iLevel, int iOption, void const *pvValue, int cbValue) -{ - /* - * Validate input. - */ - RTSOCKETINT *pThis = hSocket; - AssertPtrReturn(pThis, VERR_INVALID_HANDLE); - AssertReturn(pThis->u32Magic == RTSOCKET_MAGIC, VERR_INVALID_HANDLE); - AssertReturn(rtSocketTryLock(pThis), VERR_CONCURRENT_ACCESS); - - int rc = VINF_SUCCESS; - if (setsockopt(pThis->hNative, iLevel, iOption, (const char *)pvValue, cbValue) != 0) - rc = rtSocketError(); - - rtSocketUnlock(pThis); - return rc; -} - - - -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// - - - /** * Atomicly updates a socket variable. @@ -1048,5 +249,5 @@ { if (!fTryGracefulShutdown) - rtSocketShutdown(hSocket, true /*fRead*/, true /*fWrite*/); + RTSocketShutdown(hSocket, true /*fRead*/, true /*fWrite*/); return rtTcpClose(hSocket, pszMsg, fTryGracefulShutdown); } @@ -1204,5 +405,5 @@ if (RT_SUCCESS(rc)) { - rtSocketSetInheritance(WaitSock, false /*fInheritable*/); + RTSocketSetInheritance(WaitSock, false /*fInheritable*/); /* @@ -1355,5 +556,5 @@ continue; } - rtSocketSetInheritance(Socket, false /*fInheritable*/); + RTSocketSetInheritance(Socket, false /*fInheritable*/); /* @@ -1495,5 +696,5 @@ continue; } - rtSocketSetInheritance(Socket, false /*fInheritable*/); + RTSocketSetInheritance(Socket, false /*fInheritable*/); /* @@ -1697,5 +898,5 @@ if (!pHostEnt) { - rc = rtSocketError(); + rc = rtSocketResolverError(); AssertMsgFailed(("Could not resolve '%s', rc=%Rrc\n", pszAddress, rc)); return rc; @@ -1710,5 +911,5 @@ if (RT_SUCCESS(rc)) { - rtSocketSetInheritance(Sock, false /*fInheritable*/); + RTSocketSetInheritance(Sock, false /*fInheritable*/); struct sockaddr_in InAddr; @@ -1752,5 +953,5 @@ if (fTryGracefulShutdown) { - rc = rtSocketShutdown(Sock, false /*fRead*/, true /*fWrite*/); + rc = RTSocketShutdown(Sock, false /*fRead*/, true /*fWrite*/); if (RT_SUCCESS(rc)) { @@ -1758,5 +959,5 @@ for (;;) { - rc = rtSocketSelectOne(Sock, 1000); + rc = RTSocketSelectOne(Sock, 1000); if (rc == VERR_TIMEOUT) { @@ -1768,5 +969,5 @@ { char abBitBucket[16*_1K]; - ssize_t cbBytesRead = recv(rtSocketNative(Sock), &abBitBucket[0], sizeof(abBitBucket), MSG_NOSIGNAL); + ssize_t cbBytesRead = recv(RTSocketToNative(Sock), &abBitBucket[0], sizeof(abBitBucket), MSG_NOSIGNAL); if (cbBytesRead == 0) break; /* orderly shutdown in progress */ @@ -1781,5 +982,5 @@ * Destroy the socket handle. */ - return rtSocketDestroy(Sock); + return RTSocketDestroy(Sock); } @@ -1787,5 +988,5 @@ RTR3DECL(int) RTTcpRead(RTSOCKET Sock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead) { - return rtSocketRead(Sock, pvBuffer, cbBuffer, pcbRead); + return RTSocketRead(Sock, pvBuffer, cbBuffer, pcbRead); } @@ -1793,5 +994,5 @@ RTR3DECL(int) RTTcpWrite(RTSOCKET Sock, const void *pvBuffer, size_t cbBuffer) { - return rtSocketWrite(Sock, pvBuffer, cbBuffer); + return RTSocketWrite(Sock, pvBuffer, cbBuffer); } @@ -1813,5 +1014,5 @@ RTR3DECL(int) RTTcpSelectOne(RTSOCKET Sock, RTMSINTERVAL cMillies) { - return rtSocketSelectOne(Sock, cMillies); + return RTSocketSelectOne(Sock, cMillies); } @@ -1819,5 +1020,5 @@ RTR3DECL(int) RTTcpGetLocalAddress(RTSOCKET Sock, PRTNETADDR pAddr) { - return rtSocketGetLocalAddress(Sock, pAddr); + return RTSocketGetLocalAddress(Sock, pAddr); } @@ -1825,5 +1026,5 @@ RTR3DECL(int) RTTcpGetPeerAddress(RTSOCKET Sock, PRTNETADDR pAddr) { - return rtSocketGetPeerAddress(Sock, pAddr); -} - + return RTSocketGetPeerAddress(Sock, pAddr); +} +