(file) Return to sock.c CVS log (file) (dir) Up to [RizwankCVS] / wine4 / wine / dlls / winsock / tests

Diff for /wine4/wine/dlls/winsock/tests/sock.c between version 1.7 and 1.11

version 1.7, 2005/03/06 22:25:41 version 1.11, 2005/03/08 00:25:02
Line 202 
Line 202 
     return p - buf;     return p - buf;
 } }
  
 static int do_nonblocking_send ( int id, int first_time, SOCKET s, char *buf, int buflen, int sendlen )  
 {  
     char *last = buf + buflen;  
     static char *p[MAX_CLIENTS];  
     int n;  
   
     if ( first_time ) {  
         p[id] = buf;  
     }  
   
     n = send ( s, p[id], min ( sendlen, last - p[id] ), 0 );  
     p[id] += n;  
   
     return p[id] - buf;  
 }  
   
 static int do_nonblocking_recv ( int id, int first_time, SOCKET s, char *buf, int buflen, int recvlen )  
 {  
     char *last = buf + buflen;  
     static char *p[MAX_CLIENTS];  
     int n;  
   
     if ( first_time ) {  
         p[id] = buf;  
     }  
   
     n = recv ( s, p[id], min ( recvlen, last - p[id] ), 0 );  
     p[id] += n;  
   
     return p[id] - buf;  
 }  
   
 /* /*
  *  Call this routine right after thread startup.  *  Call this routine right after thread startup.
  *  SO_OPENTYPE must by 0, regardless what the server did.  *  SO_OPENTYPE must by 0, regardless what the server did.
Line 415 
Line 383 
     test_params *gen = par->general;     test_params *gen = par->general;
     server_memory *mem;     server_memory *mem;
     int n_expected = gen->n_chunks * gen->chunk_size, tmp, i,     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;     char *p;
     struct timeval zerotime = {0,0};     struct timeval zerotime = {0,0};
     fd_set fds_recv, fds_send, fds_openrecv, fds_opensend;     fd_set fds_recv, fds_send, fds_openrecv, fds_opensend;
Line 469 
Line 437 
  
         for ( i = 0; i < n_connections; i++ )         for ( i = 0; i < n_connections; i++ )
         {         {
             if ( (mem->sock[i].n_recvd < n_expected)              if ( ( mem->sock[i].n_recvd < n_expected ) && FD_ISSET( mem->sock[i].s, &fds_recv ) ) {
                 && FD_ISSET( mem->sock[i].s, &fds_recv ) ) {  
  
                 /* Receive data & check it */                 /* Receive data & check it */
                 mem->sock[i].n_recvd = do_nonblocking_recv ( i, (mem->sock[i].n_recvd == 0), mem->sock[i].s, mem->sock[i].buf, n_expected, par->buflen );                  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 ) {                 if ( mem->sock[i].n_recvd == n_expected ) {
                     p = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks );                     p = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks );
Line 481 
Line 450 
                     FD_CLR ( mem->sock[i].s, &fds_openrecv );                     FD_CLR ( mem->sock[i].s, &fds_openrecv );
                 }                 }
  
             } else if ( !FD_ISSET ( mem->sock[i].s, &fds_openrecv )                  ok ( mem->sock[i].n_recvd <= n_expected, "select_server (%x): received too many bytes: %d\n", id, mem->sock[i].n_recvd );
                 && FD_ISSET ( mem->sock[i].s, &fds_send ) ) {              }
   
               if ( ( mem->sock[i].n_sent < n_expected ) && FD_ISSET ( mem->sock[i].s, &fds_send ) ) {
  
                 /* Echo data back */                 /* Echo data back */
                 mem->sock[i].n_sent = do_nonblocking_send ( i, (mem->sock[i].n_sent == 0), mem->sock[i].s, mem->sock[i].buf, n_expected, par->buflen );                  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 ) {                 if ( mem->sock[i].n_sent == n_expected ) {
                     FD_CLR ( mem->sock[i].s, &fds_opensend );                     FD_CLR ( mem->sock[i].s, &fds_opensend );
                 }                 }
             } else if( FD_ISSET( mem->sock[i].s, &fds_recv ) ) {  
                 ok ( 0, "select_server (%x): too many bytes read\n", id );                  ok ( mem->sock[i].n_sent <= n_expected, "select_server (%x): sent too many bytes: %d\n", id, mem->sock[i].n_sent );
             }             }
         }         }
  
         /* check if all clients are done */         /* check if all clients are done */
         if ( ( fds_opensend.fd_count == 0 )         if ( ( fds_opensend.fd_count == 0 )
               && ( fds_openrecv.fd_count == 1 ) /* initial socket that accepts clients */
             && ( n_connections  == min ( gen->n_clients, MAX_CLIENTS ) ) ) {             && ( n_connections  == min ( gen->n_clients, MAX_CLIENTS ) ) ) {
             break;             break;
         }         }

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.11
Rizwan Kassim
 Powered by
ViewCVS 0.9.2