*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
* FIXME: we use read|write access in all cases. Shouldn't we depend that
* on the access of the current handle?
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
+#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
+#endif
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#include <time.h>
#include <unistd.h>
-#include "winerror.h"
-#include "winbase.h"
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winternl.h"
+
#include "process.h"
+#include "file.h"
#include "handle.h"
#include "thread.h"
#include "request.h"
#include "user.h"
-#include "async.h"
/* To avoid conflicts with the Unix socket headers. Plus we only need a few
* macros anyway.
struct sock
{
struct object obj; /* object header */
+ struct fd *fd; /* socket file descriptor */
unsigned int state; /* status bits */
unsigned int mask; /* event mask */
unsigned int hmask; /* held (blocked) events */
unsigned int pmask; /* pending events */
unsigned int flags; /* socket flags */
+ int polling; /* is socket being polled? */
+ unsigned short type; /* socket type */
+ unsigned short family; /* socket family */
struct event *event; /* event object */
user_handle_t window; /* window to send the message to */
unsigned int message; /* message to send */
- unsigned int wparam; /* message wparam (socket handle) */
+ obj_handle_t wparam; /* message wparam (socket handle) */
int errors[FD_MAX_EVENTS]; /* event errors */
- struct sock* deferred; /* socket that waits for a deferred accept */
- struct async_queue read_q; /* Queue for asynchronous reads */
- struct async_queue write_q; /* Queue for asynchronous writes */
+ struct sock *deferred; /* socket that waits for a deferred accept */
+ struct list read_q; /* queue for asynchronous reads */
+ struct list write_q; /* queue for asynchronous writes */
};
static void sock_dump( struct object *obj, int verbose );
static int sock_signaled( struct object *obj, struct thread *thread );
-static int sock_get_poll_events( struct object *obj );
-static void sock_poll_event( struct object *obj, int event );
-static int sock_get_fd( struct object *obj );
-static int sock_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags );
+static struct fd *sock_get_fd( struct object *obj );
+static unsigned int sock_map_access( struct object *obj, unsigned int access );
static void sock_destroy( struct object *obj );
+
+static int sock_get_poll_events( struct fd *fd );
+static void sock_poll_event( struct fd *fd, int event );
+static int sock_get_info( struct fd *fd );
+static void sock_queue_async( struct fd *fd, void *apc, void *user, void *iosb, int type, int count );
+static void sock_cancel_async( struct fd *fd );
+
static int sock_get_error( int err );
static void sock_set_error(void);
-static void sock_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count);
static const struct object_ops sock_ops =
{
remove_queue, /* remove_queue */
sock_signaled, /* signaled */
no_satisfied, /* satisfied */
+ no_signal, /* signal */
+ sock_get_fd, /* get_fd */
+ sock_map_access, /* map_access */
+ no_lookup_name, /* lookup_name */
+ no_close_handle, /* close_handle */
+ sock_destroy /* destroy */
+};
+
+static const struct fd_ops sock_fd_ops =
+{
sock_get_poll_events, /* get_poll_events */
sock_poll_event, /* poll_event */
- sock_get_fd, /* get_fd */
no_flush, /* flush */
sock_get_info, /* get_file_info */
sock_queue_async, /* queue_async */
- sock_destroy /* destroy */
+ sock_cancel_async /* cancel_async */
};
6, 7, 8, 9 /* leftovers */
};
+/* Flags that make sense only for SOCK_STREAM sockets */
+#define STREAM_FLAG_MASK ((unsigned int) (FD_CONNECT | FD_ACCEPT | FD_WINE_LISTENING | FD_WINE_CONNECTED))
+
+typedef enum {
+ SOCK_SHUTDOWN_ERROR = -1,
+ SOCK_SHUTDOWN_EOF = 0,
+ SOCK_SHUTDOWN_POLLHUP = 1
+} sock_shutdown_t;
+
+static sock_shutdown_t sock_shutdown_type = SOCK_SHUTDOWN_ERROR;
+
+static sock_shutdown_t sock_check_pollhup(void)
+{
+ sock_shutdown_t ret = SOCK_SHUTDOWN_ERROR;
+ int fd[2], n;
+ struct pollfd pfd;
+ char dummy;
+
+ if ( socketpair( AF_UNIX, SOCK_STREAM, 0, fd ) ) goto out;
+ if ( shutdown( fd[0], 1 ) ) goto out;
+
+ pfd.fd = fd[1];
+ pfd.events = POLLIN;
+ pfd.revents = 0;
+
+ n = poll( &pfd, 1, 0 );
+ if ( n != 1 ) goto out; /* error or timeout */
+ if ( pfd.revents & POLLHUP )
+ ret = SOCK_SHUTDOWN_POLLHUP;
+ else if ( pfd.revents & POLLIN &&
+ read( fd[1], &dummy, 1 ) == 0 )
+ ret = SOCK_SHUTDOWN_EOF;
+
+out:
+ close( fd[0] );
+ close( fd[1] );
+ return ret;
+}
+
+void sock_init(void)
+{
+ sock_shutdown_type = sock_check_pollhup();
+
+ switch ( sock_shutdown_type )
+ {
+ case SOCK_SHUTDOWN_EOF:
+ if (debug_level) fprintf( stderr, "sock_init: shutdown() causes EOF\n" );
+ break;
+ case SOCK_SHUTDOWN_POLLHUP:
+ if (debug_level) fprintf( stderr, "sock_init: shutdown() causes POLLHUP\n" );
+ break;
+ default:
+ fprintf( stderr, "sock_init: ERROR in sock_check_pollhup()\n" );
+ sock_shutdown_type = SOCK_SHUTDOWN_EOF;
+ }
+}
static int sock_reselect( struct sock *sock )
{
- int ev = sock_get_poll_events( &sock->obj );
+ int ev = sock_get_poll_events( sock->fd );
if (debug_level)
- fprintf(stderr,"sock_reselect(%d): new mask %x\n", sock->obj.fd, ev);
+ fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev);
- if (sock->obj.select == -1) {
+ if (!sock->polling) /* FIXME: should find a better way to do this */
+ {
/* previously unconnected socket, is this reselect supposed to connect it? */
if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0;
/* ok, it is, attach it to the wineserver's main poll loop */
- add_select_user( &sock->obj );
+ sock->polling = 1;
}
/* update condition mask */
- set_select_events( &sock->obj, ev );
+ set_fd_events( sock->fd, ev );
return ev;
}
/* After POLLHUP is received, the socket will no longer be in the main select loop.
This function is used to signal pending events nevertheless */
-static void sock_try_event ( struct sock *sock, int event )
+static void sock_try_event( struct sock *sock, int event )
{
- struct pollfd pfd;
-
- pfd.fd = sock->obj.fd;
- pfd.events = event;
- pfd.revents = 0;
- poll (&pfd, 1, 0);
-
- if ( pfd.revents )
+ event = check_fd_events( sock->fd, event );
+ if (event)
{
- if ( debug_level ) fprintf ( stderr, "sock_try_event: %x\n", pfd.revents );
- sock_poll_event ( &sock->obj, pfd.revents );
+ if ( debug_level ) fprintf( stderr, "sock_try_event: %x\n", event );
+ sock_poll_event( sock->fd, event );
}
}
int i;
int async_active = 0;
- if ( sock->flags & FD_FLAG_OVERLAPPED )
+ if ( sock->flags & WSA_FLAG_OVERLAPPED )
{
- if( pollev & (POLLIN|POLLPRI) && IS_READY( sock->read_q ) )
+ if ( pollev & (POLLIN|POLLPRI) && !list_empty( &sock->read_q ))
{
- if (debug_level) fprintf ( stderr, "activating read queue for socket %p\n", sock );
- async_notify( sock->read_q.head, STATUS_ALERTED );
+ if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock );
+ async_terminate_head( &sock->read_q, STATUS_ALERTED );
async_active = 1;
}
- if( pollev & POLLOUT && IS_READY( sock->write_q ) )
+ if ( pollev & POLLOUT && !list_empty( &sock->write_q ))
{
- if (debug_level) fprintf ( stderr, "activating write queue for socket %p\n", sock );
- async_notify( sock->write_q.head, STATUS_ALERTED );
+ if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock );
+ async_terminate_head( &sock->write_q, STATUS_ALERTED );
async_active = 1;
}
}
}
if (sock->window)
{
- if (debug_level) fprintf(stderr, "signalling events %x win %x\n", events, sock->window );
+ if (debug_level) fprintf(stderr, "signalling events %x win %p\n", events, sock->window );
for (i = 0; i < FD_MAX_EVENTS; i++)
{
int event = event_bitorder[i];
if (sock->pmask & (1 << event))
{
unsigned int lparam = (1 << event) | (sock->errors[event] << 16);
- post_message( sock->window, sock->message, sock->wparam, lparam );
+ post_message( sock->window, sock->message, (unsigned long)sock->wparam, lparam );
}
}
sock->pmask = 0;
}
}
-inline static int sock_error(int s)
+inline static int sock_error( struct fd *fd )
{
unsigned int optval = 0, optlen;
optlen = sizeof(optval);
- getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen);
+ getsockopt( get_unix_fd(fd), SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen);
return optval ? sock_get_error(optval) : 0;
}
-static void sock_poll_event( struct object *obj, int event )
+static void sock_poll_event( struct fd *fd, int event )
{
- struct sock *sock = (struct sock *)obj;
- int empty_recv = 0;
+ struct sock *sock = get_fd_user( fd );
+ int hangup_seen = 0;
assert( sock->obj.ops == &sock_ops );
if (debug_level)
- fprintf(stderr, "socket %d select event: %x\n", sock->obj.fd, event);
+ fprintf(stderr, "socket %p select event: %x\n", sock, event);
if (sock->state & FD_CONNECT)
{
/* connecting */
sock->pmask |= FD_CONNECT;
sock->errors[FD_CONNECT_BIT] = 0;
if (debug_level)
- fprintf(stderr, "socket %d connection success\n", sock->obj.fd);
+ fprintf(stderr, "socket %p connection success\n", sock);
}
else if (event & (POLLERR|POLLHUP))
{
/* we didn't get connected? */
sock->state &= ~FD_CONNECT;
sock->pmask |= FD_CONNECT;
- sock->errors[FD_CONNECT_BIT] = sock_error( sock->obj.fd );
+ sock->errors[FD_CONNECT_BIT] = sock_error( fd );
if (debug_level)
- fprintf(stderr, "socket %d connection failure\n", sock->obj.fd);
+ fprintf(stderr, "socket %p connection failure\n", sock);
}
- } else
- if (sock->state & FD_WINE_LISTENING)
+ }
+ else if (sock->state & FD_WINE_LISTENING)
{
/* listening */
if (event & POLLIN)
{
/* failed incoming connection? */
sock->pmask |= FD_ACCEPT;
- sock->errors[FD_ACCEPT_BIT] = sock_error( sock->obj.fd );
+ sock->errors[FD_ACCEPT_BIT] = sock_error( fd );
sock->hmask |= FD_ACCEPT;
}
- } else
+ }
+ else
{
/* normal data flow */
- if (event & POLLIN)
+ if ( sock->type == SOCK_STREAM && ( event & POLLIN ) )
{
char dummy;
int nr;
/* Linux 2.4 doesn't report POLLHUP if only one side of the socket
* has been closed, so we need to check for it explicitly here */
- nr = recv( sock->obj.fd, &dummy, 1, MSG_PEEK );
+ nr = recv( get_unix_fd( fd ), &dummy, 1, MSG_PEEK );
if ( nr > 0 )
{
/* incoming data */
sock->hmask |= (FD_READ|FD_CLOSE);
sock->errors[FD_READ_BIT] = 0;
if (debug_level)
- fprintf(stderr, "socket %d is readable\n", sock->obj.fd );
+ fprintf(stderr, "socket %p is readable\n", sock );
}
else if ( nr == 0 )
- empty_recv = 1;
+ hangup_seen = 1;
else
{
/* EAGAIN can happen if an async recv() falls between the server's poll()
else
{
if ( debug_level )
- fprintf ( stderr, "recv error on socket %d: %d\n", sock->obj.fd, errno );
+ fprintf( stderr, "recv error on socket %p: %d\n", sock, errno );
event = POLLERR;
}
}
}
- else if (event & POLLHUP) empty_recv = 1;
+ else if ( sock_shutdown_type == SOCK_SHUTDOWN_POLLHUP && (event & POLLHUP) )
+ {
+ hangup_seen = 1;
+ }
+ else if ( event & POLLIN ) /* POLLIN for non-stream socket */
+ {
+ sock->pmask |= FD_READ;
+ sock->hmask |= (FD_READ|FD_CLOSE);
+ sock->errors[FD_READ_BIT] = 0;
+ if (debug_level)
+ fprintf(stderr, "socket %p is readable\n", sock );
+
+ }
if (event & POLLOUT)
{
sock->hmask |= FD_WRITE;
sock->errors[FD_WRITE_BIT] = 0;
if (debug_level)
- fprintf(stderr, "socket %d is writable\n", sock->obj.fd);
+ fprintf(stderr, "socket %p is writable\n", sock);
}
if (event & POLLPRI)
{
sock->hmask |= FD_OOB;
sock->errors[FD_OOB_BIT] = 0;
if (debug_level)
- fprintf(stderr, "socket %d got OOB data\n", sock->obj.fd);
+ fprintf(stderr, "socket %p got OOB data\n", sock);
}
/* According to WS2 specs, FD_CLOSE is only delivered when there is
- no more data to be read (i.e. empty_recv = 1) */
- else if ( empty_recv && (sock->state & (FD_READ|FD_WRITE) ))
+ no more data to be read (i.e. hangup_seen = 1) */
+ else if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) ))
{
- sock->errors[FD_CLOSE_BIT] = sock_error( sock->obj.fd );
- if ( event & POLLERR)
- sock->state &= ~(FD_WINE_CONNECTED|FD_WRITE);
+ sock->errors[FD_CLOSE_BIT] = sock_error( fd );
+ if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) ))
+ sock->state &= ~FD_WRITE;
sock->pmask |= FD_CLOSE;
sock->hmask |= FD_CLOSE;
if (debug_level)
- fprintf(stderr, "socket %d aborted by error %d, event: %x - removing from select loop\n",
- sock->obj.fd, sock->errors[FD_CLOSE_BIT], event);
+ fprintf(stderr, "socket %p aborted by error %d, event: %x - removing from select loop\n",
+ sock, sock->errors[FD_CLOSE_BIT], event);
}
}
if ( sock->pmask & FD_CLOSE || event & (POLLERR|POLLHUP) )
{
if ( debug_level )
- fprintf ( stderr, "removing socket %d from select loop\n", sock->obj.fd );
- set_select_events( &sock->obj, -1 );
+ fprintf( stderr, "removing socket %p from select loop\n", sock );
+ set_fd_events( sock->fd, -1 );
}
else
sock_reselect( sock );
/* wake up anyone waiting for whatever just happened */
- if ( sock->pmask & sock->mask || sock->flags & FD_FLAG_OVERLAPPED ) sock_wake_up( sock, event );
+ if ( sock->pmask & sock->mask || sock->flags & WSA_FLAG_OVERLAPPED ) sock_wake_up( sock, event );
/* if anyone is stupid enough to wait on the socket object itself,
* maybe we should wake them up too, just in case? */
{
struct sock *sock = (struct sock *)obj;
assert( obj->ops == &sock_ops );
- printf( "Socket fd=%d, state=%x, mask=%x, pending=%x, held=%x\n",
- sock->obj.fd, sock->state,
+ printf( "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n",
+ sock->fd, sock->state,
sock->mask, sock->pmask, sock->hmask );
}
struct sock *sock = (struct sock *)obj;
assert( obj->ops == &sock_ops );
- return check_select_events( sock->obj.fd, sock_get_poll_events( &sock->obj ) );
+ return check_fd_events( sock->fd, sock_get_poll_events( sock->fd ) ) != 0;
}
-static int sock_get_poll_events( struct object *obj )
+static unsigned int sock_map_access( struct object *obj, unsigned int access )
{
- struct sock *sock = (struct sock *)obj;
+ if (access & GENERIC_READ) access |= FILE_GENERIC_READ;
+ if (access & GENERIC_WRITE) access |= FILE_GENERIC_WRITE;
+ if (access & GENERIC_EXECUTE) access |= FILE_GENERIC_EXECUTE;
+ if (access & GENERIC_ALL) access |= FILE_ALL_ACCESS;
+ return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
+}
+
+static int sock_get_poll_events( struct fd *fd )
+{
+ struct sock *sock = get_fd_user( fd );
unsigned int mask = sock->mask & sock->state & ~sock->hmask;
int ev = 0;
- assert( obj->ops == &sock_ops );
+ assert( sock->obj.ops == &sock_ops );
if (sock->state & FD_CONNECT)
/* connecting, wait for writable */
/* listening, wait for readable */
return (sock->hmask & FD_ACCEPT) ? 0 : POLLIN;
- if (mask & (FD_READ) || (sock->flags & WSA_FLAG_OVERLAPPED && IS_READY (sock->read_q)))
+ if (mask & (FD_READ) || (sock->flags & WSA_FLAG_OVERLAPPED && !list_empty( &sock->read_q )))
ev |= POLLIN | POLLPRI;
- if (mask & FD_WRITE || (sock->flags & WSA_FLAG_OVERLAPPED && IS_READY (sock->write_q)))
+ if (mask & FD_WRITE || (sock->flags & WSA_FLAG_OVERLAPPED && !list_empty( &sock->write_q )))
ev |= POLLOUT;
- /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication. */
- if (sock->mask & ~sock->hmask & FD_CLOSE)
+ /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */
+ if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) )
ev |= POLLIN;
return ev;
}
-static int sock_get_fd( struct object *obj )
+static int sock_get_info( struct fd *fd )
{
- struct sock *sock = (struct sock *)obj;
- assert( obj->ops == &sock_ops );
- return sock->obj.fd;
-}
-
-static int sock_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags )
-{
- struct sock *sock = (struct sock*) obj;
- assert ( obj->ops == &sock_ops );
+ int flags = FD_FLAG_AVAILABLE;
+ struct sock *sock = get_fd_user( fd );
+ assert( sock->obj.ops == &sock_ops );
- if (reply)
+ if (sock->flags & WSA_FLAG_OVERLAPPED) flags |= FD_FLAG_OVERLAPPED;
+ if ( sock->type != SOCK_STREAM || sock->state & FD_WINE_CONNECTED )
{
- reply->type = FILE_TYPE_PIPE;
- reply->attr = 0;
- reply->access_time = 0;
- reply->write_time = 0;
- reply->size_high = 0;
- reply->size_low = 0;
- reply->links = 0;
- reply->index_high = 0;
- reply->index_low = 0;
- reply->serial = 0;
+ if ( !(sock->state & FD_READ ) ) flags |= FD_FLAG_RECV_SHUTDOWN;
+ if ( !(sock->state & FD_WRITE ) ) flags |= FD_FLAG_SEND_SHUTDOWN;
}
- *flags = 0;
- if (sock->flags & WSA_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED;
- if ( !(sock->state & FD_READ ) ) *flags |= FD_FLAG_RECV_SHUTDOWN;
- if ( !(sock->state & FD_WRITE ) ) *flags |= FD_FLAG_SEND_SHUTDOWN;
- return FD_TYPE_SOCKET;
+ return flags;
}
-static void sock_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count)
+static void sock_queue_async( struct fd *fd, void *apc, void *user, void *iosb,
+ int type, int count )
{
- struct sock *sock = (struct sock *)obj;
- struct async_queue *q;
- struct async *async;
+ struct sock *sock = get_fd_user( fd );
+ struct list *queue;
int pollev;
- assert( obj->ops == &sock_ops );
+ assert( sock->obj.ops == &sock_ops );
if ( !(sock->flags & WSA_FLAG_OVERLAPPED) )
{
- set_error ( STATUS_INVALID_HANDLE );
+ set_error( STATUS_INVALID_HANDLE );
return;
}
- switch( type )
+ switch (type)
{
case ASYNC_TYPE_READ:
- q = &sock->read_q;
+ queue = &sock->read_q;
sock->hmask &= ~FD_CLOSE;
break;
case ASYNC_TYPE_WRITE:
- q = &sock->write_q;
+ queue = &sock->write_q;
break;
default:
set_error( STATUS_INVALID_PARAMETER );
return;
}
- async = find_async ( q, current, ptr );
-
- if ( status == STATUS_PENDING )
+ if ( ( !( sock->state & FD_READ ) && type == ASYNC_TYPE_READ ) ||
+ ( !( sock->state & FD_WRITE ) && type == ASYNC_TYPE_WRITE ) )
{
- if ( ( !( sock->state & FD_READ ) && type == ASYNC_TYPE_READ ) ||
- ( !( sock->state & FD_WRITE ) && type == ASYNC_TYPE_WRITE ) )
- {
- set_error ( STATUS_PIPE_DISCONNECTED );
- if ( async ) destroy_async ( async );
- }
- else
- {
- if ( !async )
- async = create_async ( obj, current, ptr );
- if ( !async )
- return;
-
- async->status = STATUS_PENDING;
- if ( !async->q )
- async_insert ( q, async );
- }
+ set_error( STATUS_PIPE_DISCONNECTED );
+ }
+ else
+ {
+ if (!create_async( current, NULL, queue, apc, user, iosb ))
+ return;
}
- else if ( async ) destroy_async ( async );
- else set_error ( STATUS_INVALID_PARAMETER );
- pollev = sock_reselect ( sock );
- if ( pollev ) sock_try_event ( sock, pollev );
+ pollev = sock_reselect( sock );
+ if ( pollev ) sock_try_event( sock, pollev );
+}
+
+static void sock_cancel_async( struct fd *fd )
+{
+ struct sock *sock = get_fd_user( fd );
+ assert( sock->obj.ops == &sock_ops );
+
+ async_terminate_queue( &sock->read_q, STATUS_CANCELLED );
+ async_terminate_queue( &sock->write_q, STATUS_CANCELLED );
+}
+
+static struct fd *sock_get_fd( struct object *obj )
+{
+ struct sock *sock = (struct sock *)obj;
+ return (struct fd *)grab_object( sock->fd );
}
static void sock_destroy( struct object *obj )
/* FIXME: special socket shutdown stuff? */
if ( sock->deferred )
- release_object ( sock->deferred );
+ release_object( sock->deferred );
if ( sock->flags & WSA_FLAG_OVERLAPPED )
{
- destroy_async_queue ( &sock->read_q );
- destroy_async_queue ( &sock->write_q );
+ async_terminate_queue( &sock->read_q, STATUS_CANCELLED );
+ async_terminate_queue( &sock->write_q, STATUS_CANCELLED );
}
if (sock->event) release_object( sock->event );
+ if (sock->fd) release_object( sock->fd );
}
/* create a new and unconnected socket */
sockfd = socket( family, type, protocol );
if (debug_level)
fprintf(stderr,"socket(%d,%d,%d)=%d\n",family,type,protocol,sockfd);
- if (sockfd == -1) {
+ if (sockfd == -1)
+ {
sock_set_error();
return NULL;
}
fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */
- if (!(sock = alloc_object( &sock_ops, -1 ))) return NULL;
- sock->obj.fd = sockfd;
+ if (!(sock = alloc_object( &sock_ops )))
+ {
+ close( sockfd );
+ return NULL;
+ }
sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0;
sock->mask = 0;
sock->hmask = 0;
sock->pmask = 0;
+ sock->polling = 0;
sock->flags = flags;
+ sock->type = type;
+ sock->family = family;
sock->event = NULL;
sock->window = 0;
sock->message = 0;
sock->wparam = 0;
sock->deferred = NULL;
- if (sock->flags & WSA_FLAG_OVERLAPPED)
+ if (!(sock->fd = create_anonymous_fd( &sock_fd_ops, sockfd, &sock->obj )))
{
- init_async_queue (&sock->read_q);
- init_async_queue (&sock->write_q);
+ release_object( sock );
+ return NULL;
}
+ list_init( &sock->read_q );
+ list_init( &sock->write_q );
sock_reselect( sock );
clear_error();
return &sock->obj;
struct sock *sock;
int acceptfd;
struct sockaddr saddr;
- int slen;
- sock=(struct sock*)get_handle_obj(current->process,handle,
- GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops);
+ sock = (struct sock *)get_handle_obj( current->process, handle, FILE_READ_DATA, &sock_ops );
if (!sock)
return NULL;
- if ( sock->deferred ) {
+ if ( sock->deferred )
+ {
acceptsock = sock->deferred;
sock->deferred = NULL;
- } else {
+ }
+ else
+ {
/* Try to accept(2). We can't be safe that this an already connected socket
* or that accept() is allowed on it. In those cases we will get -1/errno
* return.
*/
- slen = sizeof(saddr);
- acceptfd = accept(sock->obj.fd,&saddr,&slen);
- if (acceptfd==-1) {
+ unsigned int slen = sizeof(saddr);
+ acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen);
+ if (acceptfd==-1)
+ {
sock_set_error();
release_object( sock );
return NULL;
}
- if (!(acceptsock = alloc_object( &sock_ops, -1 )))
+ if (!(acceptsock = alloc_object( &sock_ops )))
{
+ close( acceptfd );
release_object( sock );
return NULL;
}
/* newly created socket gets the same properties of the listening socket */
fcntl(acceptfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */
- acceptsock->obj.fd = acceptfd;
acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE;
if (sock->state & FD_WINE_NONBLOCKING)
acceptsock->state |= FD_WINE_NONBLOCKING;
acceptsock->mask = sock->mask;
acceptsock->hmask = 0;
acceptsock->pmask = 0;
+ acceptsock->polling = 0;
+ acceptsock->type = sock->type;
+ acceptsock->family = sock->family;
acceptsock->event = NULL;
acceptsock->window = sock->window;
acceptsock->message = sock->message;
acceptsock->wparam = 0;
if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event );
acceptsock->flags = sock->flags;
- acceptsock->deferred = 0;
- if ( acceptsock->flags & WSA_FLAG_OVERLAPPED )
+ acceptsock->deferred = NULL;
+ if (!(acceptsock->fd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj )))
{
- init_async_queue ( &acceptsock->read_q );
- init_async_queue ( &acceptsock->write_q );
+ release_object( acceptsock );
+ release_object( sock );
+ return NULL;
}
+ list_init( &acceptsock->read_q );
+ list_init( &acceptsock->write_q );
}
clear_error();
sock->pmask &= ~FD_ACCEPT;
{
switch (err)
{
- case EINTR: return WSAEINTR; break;
- case EBADF: return WSAEBADF; break;
+ case EINTR: return WSAEINTR;
+ case EBADF: return WSAEBADF;
case EPERM:
- case EACCES: return WSAEACCES; break;
- case EFAULT: return WSAEFAULT; break;
- case EINVAL: return WSAEINVAL; break;
- case EMFILE: return WSAEMFILE; break;
- case EWOULDBLOCK: return WSAEWOULDBLOCK; break;
- case EINPROGRESS: return WSAEINPROGRESS; break;
- case EALREADY: return WSAEALREADY; break;
- case ENOTSOCK: return WSAENOTSOCK; break;
- case EDESTADDRREQ: return WSAEDESTADDRREQ; break;
- case EMSGSIZE: return WSAEMSGSIZE; break;
- case EPROTOTYPE: return WSAEPROTOTYPE; break;
- case ENOPROTOOPT: return WSAENOPROTOOPT; break;
- case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; break;
- case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; break;
- case EOPNOTSUPP: return WSAEOPNOTSUPP; break;
- case EPFNOSUPPORT: return WSAEPFNOSUPPORT; break;
- case EAFNOSUPPORT: return WSAEAFNOSUPPORT; break;
- case EADDRINUSE: return WSAEADDRINUSE; break;
- case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; break;
- case ENETDOWN: return WSAENETDOWN; break;
- case ENETUNREACH: return WSAENETUNREACH; break;
- case ENETRESET: return WSAENETRESET; break;
- case ECONNABORTED: return WSAECONNABORTED; break;
+ case EACCES: return WSAEACCES;
+ case EFAULT: return WSAEFAULT;
+ case EINVAL: return WSAEINVAL;
+ case EMFILE: return WSAEMFILE;
+ case EWOULDBLOCK: return WSAEWOULDBLOCK;
+ case EINPROGRESS: return WSAEINPROGRESS;
+ case EALREADY: return WSAEALREADY;
+ case ENOTSOCK: return WSAENOTSOCK;
+ case EDESTADDRREQ: return WSAEDESTADDRREQ;
+ case EMSGSIZE: return WSAEMSGSIZE;
+ case EPROTOTYPE: return WSAEPROTOTYPE;
+ case ENOPROTOOPT: return WSAENOPROTOOPT;
+ case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT;
+ case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT;
+ case EOPNOTSUPP: return WSAEOPNOTSUPP;
+ case EPFNOSUPPORT: return WSAEPFNOSUPPORT;
+ case EAFNOSUPPORT: return WSAEAFNOSUPPORT;
+ case EADDRINUSE: return WSAEADDRINUSE;
+ case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL;
+ case ENETDOWN: return WSAENETDOWN;
+ case ENETUNREACH: return WSAENETUNREACH;
+ case ENETRESET: return WSAENETRESET;
+ case ECONNABORTED: return WSAECONNABORTED;
case EPIPE:
- case ECONNRESET: return WSAECONNRESET; break;
- case ENOBUFS: return WSAENOBUFS; break;
- case EISCONN: return WSAEISCONN; break;
- case ENOTCONN: return WSAENOTCONN; break;
- case ESHUTDOWN: return WSAESHUTDOWN; break;
- case ETOOMANYREFS: return WSAETOOMANYREFS; break;
- case ETIMEDOUT: return WSAETIMEDOUT; break;
- case ECONNREFUSED: return WSAECONNREFUSED; break;
- case ELOOP: return WSAELOOP; break;
- case ENAMETOOLONG: return WSAENAMETOOLONG; break;
- case EHOSTDOWN: return WSAEHOSTDOWN; break;
- case EHOSTUNREACH: return WSAEHOSTUNREACH; break;
- case ENOTEMPTY: return WSAENOTEMPTY; break;
+ case ECONNRESET: return WSAECONNRESET;
+ case ENOBUFS: return WSAENOBUFS;
+ case EISCONN: return WSAEISCONN;
+ case ENOTCONN: return WSAENOTCONN;
+ case ESHUTDOWN: return WSAESHUTDOWN;
+ case ETOOMANYREFS: return WSAETOOMANYREFS;
+ case ETIMEDOUT: return WSAETIMEDOUT;
+ case ECONNREFUSED: return WSAECONNREFUSED;
+ case ELOOP: return WSAELOOP;
+ case ENAMETOOLONG: return WSAENAMETOOLONG;
+ case EHOSTDOWN: return WSAEHOSTDOWN;
+ case EHOSTUNREACH: return WSAEHOSTUNREACH;
+ case ENOTEMPTY: return WSAENOTEMPTY;
#ifdef EPROCLIM
- case EPROCLIM: return WSAEPROCLIM; break;
+ case EPROCLIM: return WSAEPROCLIM;
#endif
#ifdef EUSERS
- case EUSERS: return WSAEUSERS; break;
+ case EUSERS: return WSAEUSERS;
#endif
#ifdef EDQUOT
- case EDQUOT: return WSAEDQUOT; break;
+ case EDQUOT: return WSAEDQUOT;
#endif
#ifdef ESTALE
- case ESTALE: return WSAESTALE; break;
+ case ESTALE: return WSAESTALE;
#endif
#ifdef EREMOTE
- case EREMOTE: return WSAEREMOTE; break;
+ case EREMOTE: return WSAEREMOTE;
#endif
- default: errno=err; perror("sock_set_error"); return ERROR_UNKNOWN; break;
+ default: errno=err; perror("sock_set_error"); return WSAEFAULT;
}
}
reply->handle = 0;
if ((obj = create_socket( req->family, req->type, req->protocol, req->flags )) != NULL)
{
- reply->handle = alloc_handle( current->process, obj, req->access, req->inherit );
+ reply->handle = alloc_handle( current->process, obj, req->access, req->attributes );
release_object( obj );
}
}
reply->handle = 0;
if ((sock = accept_socket( req->lhandle )) != NULL)
{
- reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->inherit );
+ reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes );
sock->wparam = reply->handle; /* wparam for message is the socket handle */
sock_reselect( sock );
release_object( &sock->obj );
struct event *old_event;
int pollev;
- if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle,
- GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, &sock_ops)))
- return;
+ if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle,
+ FILE_WRITE_ATTRIBUTES, &sock_ops))) return;
old_event = sock->event;
sock->mask = req->mask;
sock->event = NULL;
if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event);
pollev = sock_reselect( sock );
- if ( pollev ) sock_try_event ( sock, pollev );
+ if ( pollev ) sock_try_event( sock, pollev );
if (sock->mask)
sock->state |= FD_WINE_NONBLOCKING;
{
struct sock *sock;
- sock=(struct sock*)get_handle_obj(current->process,req->handle,GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops);
+ sock = (struct sock *)get_handle_obj( current->process, req->handle, FILE_READ_ATTRIBUTES, &sock_ops );
if (!sock)
{
reply->mask = 0;
int pollev;
if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle,
- GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, &sock_ops)))
+ FILE_WRITE_ATTRIBUTES, &sock_ops)))
return;
sock->pmask &= ~req->mask; /* is this safe? */
sock->hmask &= ~FD_CLOSE;
sock->state |= req->sstate;
sock->state &= ~req->cstate;
+ if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK;
pollev = sock_reselect( sock );
- if ( pollev ) sock_try_event ( sock, pollev );
+ if ( pollev ) sock_try_event( sock, pollev );
release_object( &sock->obj );
}
{
struct sock *sock, *acceptsock;
- sock=(struct sock*)get_handle_obj( current->process,req->handle,
- GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops );
+ sock=(struct sock *)get_handle_obj( current->process, req->handle, FILE_WRITE_ATTRIBUTES, &sock_ops );
if ( !sock )
{
- set_error ( WSAENOTSOCK );
+ set_error( WSAENOTSOCK );
return;
}
- acceptsock = (struct sock*)get_handle_obj( current->process,req->deferred,
- GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops );
+ acceptsock = (struct sock *)get_handle_obj( current->process, req->deferred, 0, &sock_ops );
if ( !acceptsock )
{
- release_object ( sock );
- set_error ( WSAENOTSOCK );
+ release_object( sock );
+ set_error( WSAENOTSOCK );
return;
}
sock->deferred = acceptsock;
- release_object ( sock );
+ release_object( sock );
}