(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.1 and 1.12

version 1.1, 2005/03/01 22:28:18 version 1.12, 2005/03/08 00:28:48
Line 2 
Line 2 
  * Unit test suite for winsock functions  * Unit test suite for winsock functions
  *  *
  * Copyright 2002 Martin Wilck  * Copyright 2002 Martin Wilck
    * select() server Copyright 2005 Thomas Kho
  *  *
  * This library is free software; you can redistribute it and/or  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public  * modify it under the terms of the GNU Lesser General Public
Line 29 
Line 30 
 #include <winerror.h> #include <winerror.h>
  
 #define MAX_CLIENTS 4      /* Max number of clients */ #define MAX_CLIENTS 4      /* Max number of clients */
 #define NUM_TESTS   2      /* Number of tests performed */  #define NUM_TESTS   3      /* Number of tests performed */
 #define FIRST_CHAR 'A'     /* First character in transferred pattern */ #define FIRST_CHAR 'A'     /* First character in transferred pattern */
 #define BIND_SLEEP 10      /* seconds to wait between attempts to bind() */ #define BIND_SLEEP 10      /* seconds to wait between attempts to bind() */
 #define BIND_TRIES 6       /* Number of bind() attempts */ #define BIND_TRIES 6       /* Number of bind() attempts */
Line 60 
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 252 
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 372 
Line 375 
     server_stop ();     server_stop ();
 } }
  
   /*
    * select_server: A non-blocking server.
    */
   static VOID WINAPI select_server ( server_params *par )
   {
       test_params *gen = par->general;
       server_memory *mem;
       int n_expected = gen->n_chunks * gen->chunk_size, tmp, i,
           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;
   
       trace ( "select_server (%x) starting\n", id );
   
       set_so_opentype ( FALSE ); /* non-overlapped */
       server_start ( par );
       mem = TlsGetValue ( tls );
   
       wsa_ok ( set_blocking ( mem->s, FALSE ), 0 ==, "select_server (%lx): failed to set blocking mode: %d\n");
       wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "select_server (%lx): listen failed: %d\n");
   
       trace ( "select_server (%x) ready\n", id );
       SetEvent ( server_ready ); /* notify clients */
   
       FD_ZERO ( &fds_openrecv );
       FD_ZERO ( &fds_recv );
       FD_ZERO ( &fds_send );
       FD_ZERO ( &fds_opensend );
   
       FD_SET ( mem->s, &fds_openrecv );
   
       while(1)
       {
           fds_recv = fds_openrecv;
           fds_send = fds_opensend;
   
           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 ) ) {
               trace ( "select_server (%x): accepting client connection\n", id );
   
               /* 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" );
   
               ok ( mem->sock[i].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ),
                   "select_server (%x): strange peer address\n", id );
   
               /* add to list of open connections */
               FD_SET ( mem->sock[i].s, &fds_openrecv );
               FD_SET ( mem->sock[i].s, &fds_opensend );
   
               n_connections++;
           }
   
           /* handle open requests */
   
           for ( i = 0; i < n_connections; i++ )
           {
               if ( ( mem->sock[i].n_recvd < n_expected ) && FD_ISSET( mem->sock[i].s, &fds_recv ) ) {
   
                   /* Receive data & check it */
                   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 );
                       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 );
                   }
   
                   ok ( mem->sock[i].n_recvd <= n_expected, "select_server (%x): received too many bytes: %d\n", id, mem->sock[i].n_recvd );
               }
   
               if ( ( mem->sock[i].n_sent < n_expected ) && FD_ISSET ( mem->sock[i].s, &fds_send ) ) {
   
                   /* Echo data back */
                   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 );
                   }
   
                   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 */
           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;
           }
       }
   
       for ( i = 0; i < min ( gen->n_clients, MAX_CLIENTS ); i++ )
       {
           /* cleanup */
           read_zero_bytes ( mem->sock[i].s );
           wsa_ok ( closesocket ( mem->sock[i].s ),  0 ==, "select_server (%lx): closesocket error: %d\n" );
           mem->sock[i].s = INVALID_SOCKET;
       }
   
       trace ( "select_server (%x) exiting\n", id );
       server_stop ();
   }
   
 /**************** Clients ***************/ /**************** Clients ***************/
  
 /* /*
Line 774 
Line 891 
             WSA_FLAG_OVERLAPPED,             WSA_FLAG_OVERLAPPED,
             128             128
         }         }
       },
       /* Test 2: synchronous client, non-blocking server via select() */
       {
           {
               STD_STREAM_SOCKET,
               2048,
               16,
               2
           },
           select_server,
           {
               NULL,
               0,
               64
           },
           simple_client,
           {
               NULL,
               0,
               128
           }
     }     }
 }; };
  

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