(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.3 and 1.13

version 1.3, 2005/03/06 21:46:38 version 1.13, 2005/03/08 08:45:01
Line 61 
Line 61 
     struct sockaddr_in     addr;     struct sockaddr_in     addr;
     struct sockaddr_in     peer;     struct sockaddr_in     peer;
     char                  *buf;     char                  *buf;
     int                    nread;      int                    n_recvd;
       int                    n_sent;
 } sock_info; } sock_info;
  
 /* Test parameters for both server & client */ /* Test parameters for both server & client */
Line 201 
Line 202 
     return p - buf;     return p - buf;
 } }
  
 static int do_nonblocking_send ( int id, SOCKET s, char *buf, int buflen, int sendlen )  
 {  
     char* last = buf + buflen, *p;  
     int n = 1;  
     for ( p = buf; p < last; p += n )  
         n = send ( s, p, min ( sendlen, last - p ), 0 );  
     wsa_ok ( n, 0 <=, "do_synchronous_send (%lx): error %d\n" );  
     return p - buf;  
 /*    char *last = buf + buflen;  
     static char *p[MAX_CLIENTS] = { NULL, NULL };  
     int n;  
   
                 trace ( "id = %d\n", id );  
   
     if ( p[id] == NULL ) {  
         p[id] = buf;  
     }  
   
     n = send ( s, p[id], min ( sendlen, last - p[id] ), 0 );  
     p[id] += n;  
   
     //wsa_ok ( n, 0 <=, "do_synchronous_send (%lx): error %d\n" );  
     return p[id] - buf;*/  
 }  
   
 static int do_nonblocking_recv ( int id, SOCKET s, char *buf, int buflen, int recvlen )  
 {  
     char* last = buf + buflen, *p;  
     int n = 1;  
     for ( p = buf; p < last; p += n )  
         n = recv ( s, p, min ( recvlen, last - p ), 0 );  
     wsa_ok ( n, 0 <=, "do_synchronous_recv (%lx): error %d:\n" );  
     return p - buf;  
 /*    char *last = buf + buflen;  
     static char *p[MAX_CLIENTS] = { NULL, NULL };  
     int n;  
   
     if ( p[id] == NULL ) {  
         p[id] = buf;  
     }  
   
     n = recv ( s, p[id], min ( recvlen, last - p[id] ), 0 );  
     p[id] += n;  
   
     //wsa_ok ( n, 0 <=, "do_synchronous_recv (%lx): error %d:\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 301 
Line 254 
     {     {
         mem->sock[i].s = INVALID_SOCKET;         mem->sock[i].s = INVALID_SOCKET;
         mem->sock[i].buf = (LPVOID) LocalAlloc ( LPTR, gen->n_chunks * gen->chunk_size );         mem->sock[i].buf = (LPVOID) LocalAlloc ( LPTR, gen->n_chunks * gen->chunk_size );
         mem->sock[i].nread = 0;          mem->sock[i].n_recvd = 0;
           mem->sock[i].n_sent = 0;
     }     }
  
     if ( gen->sock_type == SOCK_STREAM )     if ( gen->sock_type == SOCK_STREAM )
Line 428 
Line 382 
 { {
     test_params *gen = par->general;     test_params *gen = par->general;
     server_memory *mem;     server_memory *mem;
     int n_recvd, n_sent, 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, done = 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 450 
Line 404 
     FD_ZERO ( &fds_recv );     FD_ZERO ( &fds_recv );
     FD_ZERO ( &fds_send );     FD_ZERO ( &fds_send );
     FD_ZERO ( &fds_opensend );     FD_ZERO ( &fds_opensend );
   
     FD_SET ( mem->s, &fds_openrecv );     FD_SET ( mem->s, &fds_openrecv );
  
     while(1)     while(1)
Line 457 
Line 412 
         fds_recv = fds_openrecv;         fds_recv = fds_openrecv;
         fds_send = fds_opensend;         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 */         /* check for incoming requests */
         if ( FD_ISSET ( mem->s, &fds_recv ) ) {         if ( FD_ISSET ( mem->s, &fds_recv ) ) {
             trace ( "select_server (%x): accepting client connection\n", id );             trace ( "select_server (%x): accepting client connection\n", id );
  
             /* accept a single connection */             /* accept a single connection */
             tmp = sizeof ( mem->sock[i].peer );              tmp = sizeof ( mem->sock[n_connections].peer );
             mem->sock[i].s = accept ( mem->s, (struct sockaddr*) &mem->sock[i].peer, &tmp );              mem->sock[n_connections].s = accept ( mem->s, (struct sockaddr*) &mem->sock[n_connections].peer, &tmp );
             wsa_ok ( mem->sock[i].s, INVALID_SOCKET !=, "select_server (%lx): accept failed: %d\n" );              wsa_ok ( mem->sock[n_connections].s, INVALID_SOCKET !=, "select_server (%lx): accept() failed: %d\n" );
  
             ok ( mem->sock[i].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ),              ok ( mem->sock[n_connections].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ),
                 "select_server (%x): strange peer address\n", id );                 "select_server (%x): strange peer address\n", id );
  
             /* add to list of open connections */             /* add to list of open connections */
             FD_SET ( mem->sock[i].s, &fds_openrecv );              FD_SET ( mem->sock[n_connections].s, &fds_openrecv );
             FD_SET ( mem->sock[i].s, &fds_opensend );              FD_SET ( mem->sock[n_connections].s, &fds_opensend );
  
             n_connections++;             n_connections++;
         }         }
Line 482 
Line 438 
  
         for ( i = 0; i < n_connections; i++ )         for ( i = 0; i < n_connections; i++ )
         {         {
             if ( (mem->sock[i].nread < 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 ) ) {  
                 /* more data to receive */  
  
                 /* Receive data & check it */                 /* Receive data & check it */
                 n_recvd = do_nonblocking_recv ( i, 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 == n_expected,                  ok ( n_recvd != SOCKET_ERROR, "select_server (%x): error in recv(): %d\n", id, WSAGetLastError() );
                 //    "select_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected );                  mem->sock[i].n_recvd += n_recvd;
  
                 if ( 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 );
                     ok ( p == NULL, "select_server (%x): test pattern error: %d\n", id, p - mem->sock[i].buf);                     ok ( p == NULL, "select_server (%x): test pattern error: %d\n", id, p - mem->sock[i].buf);
                     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 ) ) {              }
                 /* send data */  
  
                 /* Echo data back */              if ( ( mem->sock[i].n_sent < n_expected ) && ( mem->sock[i].n_recvd == n_expected ) && FD_ISSET ( mem->sock[i].s, &fds_send ) ) {
                 n_sent = do_nonblocking_send ( i, mem->sock[i].s, mem->sock[i].buf, n_expected, par->buflen );  
  
                 //ok ( n_sent == n_expected,                  /* Echo data back */
                 //    "select_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected );                  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 ( 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 );  
             }  
  
             if ( ( fds_opensend.fd_count == 0 )                  ok ( mem->sock[i].n_sent <= n_expected, "select_server (%x): sent too many bytes: %d\n", id, mem->sock[i].n_sent );
                 && ( n_connections  == min ( gen->n_clients, MAX_CLIENTS ) ) ) {  
                 done = 1;  
                                                                 break;  
             }             }
         }         }
  
                                 if ( done == 1 ) {          /* check if all clients are done */
           if ( ( fds_opensend.fd_count == 0 )
               && ( fds_openrecv.fd_count == 1 ) /* initial socket that accepts clients */
               && ( n_connections  == min ( gen->n_clients, MAX_CLIENTS ) ) ) {
                                         break;                                         break;
                                 }                                 }
     }     }
Line 941 
Line 892 
             128             128
         }         }
     },     },
     /* Test 2: event-driven client, non-blocking server via select() */      /* Test 2: synchronous client, non-blocking server via select() */
     {     {
         {         {
             STD_STREAM_SOCKET,             STD_STREAM_SOCKET,

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