wine4/wine/dlls/winsock/tests/sock.c - diff

Return to sock.c CVS log

Up to [RizwankCVS] / wine4 / wine / dlls / winsock / tests

Diff for /wine4/wine/dlls/winsock/tests/sock.c between version 1.10 and 1.12

version 1.10, 2005/03/08 00:19:31

version 1.12, 2005/03/08 00:28:48

Line 383

test_params *gen = par->general;

server_memory *mem;

int n_expected = gen->n_chunks * gen->chunk_size, tmp, i,

id = GetCurrentThreadId(), n_connections = 0;

id = GetCurrentThreadId(), n_connections = 0, n_sent, n_recvd;

char *p;

struct timeval zerotime = {0,0};

fd_set fds_recv, fds_send, fds_openrecv, fds_opensend;

Line 412

fds_recv = fds_openrecv;

fds_send = fds_opensend;

select ( 0, &fds_recv, &fds_send, NULL, &zerotime );

wsa_ok ( select ( 0, &fds_recv, &fds_send, NULL, &zerotime ), SOCKET_ERROR !=,

"select_server (%lx): select() failed: %d\n" );

/* check for incoming requests */

if ( FD_ISSET ( mem->s, &fds_recv ) ) {

Line 421

Line 422

/* accept a single connection */

tmp = sizeof ( mem->sock[i].peer );

mem->sock[i].s = accept ( mem->s, (struct sockaddr*) &mem->sock[i].peer, &tmp );

wsa_ok ( mem->sock[i].s, INVALID_SOCKET !=, "select_server (%lx): accept failed: %d\n" );

wsa_ok ( mem->sock[i].s, INVALID_SOCKET !=, "select_server (%lx): accept() failed: %d\n" );

ok ( mem->sock[i].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ),

"select_server (%x): strange peer address\n", id );

Line 440

Line 441

if ( ( mem->sock[i].n_recvd < n_expected ) && FD_ISSET( mem->sock[i].s, &fds_recv ) ) {

/* Receive data & check it */

mem->sock[i].n_recvd += recv ( mem->sock[i].s, mem->sock[i].buf + mem->sock[i].n_recvd, min ( n_expected - mem->sock[i].n_recvd, par->buflen ), 0 );

n_recvd = recv ( mem->sock[i].s, mem->sock[i].buf + mem->sock[i].n_recvd, min ( n_expected - mem->sock[i].n_recvd, par->buflen ), 0 );

ok ( n_recvd != SOCKET_ERROR, "select_server (%x): error in recv(): %d\n", id, WSAGetLastError() );

mem->sock[i].n_recvd += n_recvd;

if ( mem->sock[i].n_recvd == n_expected ) {

p = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks );

Line 454

Line 457

if ( ( mem->sock[i].n_sent < n_expected ) && FD_ISSET ( mem->sock[i].s, &fds_send ) ) {

/* Echo data back */

mem->sock[i].n_sent += send ( mem->sock[i].s, mem->sock[i].buf + mem->sock[i].n_sent, min ( n_expected - mem->sock[i].n_sent, par->buflen ), 0 );

n_sent = send ( mem->sock[i].s, mem->sock[i].buf + mem->sock[i].n_sent, min ( n_expected - mem->sock[i].n_sent, par->buflen ), 0 );

ok ( n_sent != SOCKET_ERROR, "select_server (%x): error in send(): %d\n", id, WSAGetLastError() );

mem->sock[i].n_sent += n_sent;

if ( mem->sock[i].n_sent == n_expected ) {

FD_CLR ( mem->sock[i].s, &fds_opensend );

Legend:

Removed from v.1.10
changed lines
	Added in v.1.12

Rizwan Kassim