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

Diff for /wine4/wine/dlls/wsock32/tests/wsock32_main.c between version 1.27 and 1.28

version 1.27, 2005/02/24 21:57:44 version 1.28, 2005/02/24 22:20:13
Line 73 
Line 73 
 static void test_ClientServerBlocking_1(void); static void test_ClientServerBlocking_1(void);
 static void test_Cleanup(void); static void test_Cleanup(void);
  
 static void BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr);  
 static void BlockingServer_ProcessConnection(struct ServerInfo *t);  
 static void StartBlockingClients(int *serverPort);  
 static void BlockingClient(int *serverPort); static void BlockingClient(int *serverPort);
 static void BlockingServer();  static int BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr);
   static void BlockingServer(SOCKET *sock);
   static void BlockingServer_ProcessConnection(struct ServerInfo *t);
  
 static void BlockingClient(int *serverPort) static void BlockingClient(int *serverPort)
 { {
Line 125 
Line 124 
 } }
  
 // BlockingServer_Init creates socket sock of type type and returns assigned port number in addr. // BlockingServer_Init creates socket sock of type type and returns assigned port number in addr.
 static void BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr)  // returns server port number
   static int BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr)
 { {
         SOCKADDR_IN tmpAddr;         SOCKADDR_IN tmpAddr;
         int bindOK;         int bindOK;
Line 158 
Line 158 
         // listen on port         // listen on port
         listenReturn = listen(*sock, NUM_CLIENTS);         listenReturn = listen(*sock, NUM_CLIENTS);
         ok(listenReturn != SOCKET_ERROR, "error listening on socket\n");         ok(listenReturn != SOCKET_ERROR, "error listening on socket\n");
   
           return addr->sin_port;
 } }
  
 static void BlockingServer() // listens for incoming connections and accepts up to NUM_CLIENTS connections at once  static void BlockingServer(SOCKET *sock) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once
 { {
         struct ServerInfo *threads;         struct ServerInfo *threads;
         int threadIndex = 0;         int threadIndex = 0;
         int serverPort = 0;  
   
         SOCKET sock;  
         SOCKADDR_IN server;  
   
         BlockingServer_Init(SOCK_STREAM, &sock, &server);  
  
         // allocate enough space to keep track of NUM_CLIENTS connections         // allocate enough space to keep track of NUM_CLIENTS connections
         threads = malloc(sizeof(struct ServerInfo) * NUM_CLIENTS);         threads = malloc(sizeof(struct ServerInfo) * NUM_CLIENTS);
         memset(threads, 0, sizeof(struct ServerInfo) * NUM_CLIENTS);         memset(threads, 0, sizeof(struct ServerInfo) * NUM_CLIENTS);
  
         // set the port parameter; clients now know we're ready to accept connections  
         serverPort = server.sin_port;  
   
         // bound to port; now we can start clients  
         CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &StartBlockingClients, &serverPort, 0, NULL);  
   
         // we require one connection from each client thread         // we require one connection from each client thread
         for (threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {         for (threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {
                         // accept connection                         // accept connection
                         threads[threadIndex].connectedSocket = accept(sock, (SOCKADDR *) &threads[threadIndex].clientAddr, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket                          threads[threadIndex].connectedSocket = accept(*sock, (SOCKADDR *) &threads[threadIndex].clientAddr, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket
                         ok(threads[threadIndex].connectedSocket != INVALID_SOCKET, "error accepting socket\n");                         ok(threads[threadIndex].connectedSocket != INVALID_SOCKET, "error accepting socket\n");
  
                         // spawn thread to handle sending data                         // spawn thread to handle sending data
Line 224 
Line 214 
         ok(bClosed,"Error closing socket\n");         ok(bClosed,"Error closing socket\n");
 } }
  
 static void StartBlockingClients(int *serverPort)  static void test_ClientServerBlocking_1(void)
 { {
           struct ThreadInfo serverThread;
           DWORD waitStatus;
           SOCKET sock;
           SOCKADDR_IN server;
           int serverPort;
         int threadIndex = 0;         int threadIndex = 0;
         struct ThreadInfo *clientThreads;         struct ThreadInfo *clientThreads;
  
           // create socket, bind server and start listening
           serverPort = BlockingServer_Init(SOCK_STREAM, &sock, &server);
   
           // start server thread
           trace("starting server thread\n");
           serverThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &sock, 0, &serverThread.ID);
   
           // start client threads
         clientThreads = malloc(sizeof(struct ThreadInfo) * NUM_CLIENTS);         clientThreads = malloc(sizeof(struct ThreadInfo) * NUM_CLIENTS);
         memset(clientThreads, 0, sizeof(struct ThreadInfo) * NUM_CLIENTS);         memset(clientThreads, 0, sizeof(struct ThreadInfo) * NUM_CLIENTS);
  
         for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {         for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {
                 clientThreads[threadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, (void *) serverPort, 0, &clientThreads[threadIndex].ID);                  clientThreads[threadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, (void *) &serverPort, 0, &clientThreads[threadIndex].ID);
         }         }
         trace("%d clients started\n", NUM_CLIENTS);         trace("%d clients started\n", NUM_CLIENTS);
  
           // server thread needs to end before cleaning up
           waitStatus = WaitForSingleObject(serverThread.Handle, TEST_TIMEOUT * 1000);
           ok( waitStatus != WAIT_TIMEOUT, "test did not complete in time\n" );
   
         // wait for all clients to receive data before cleaning up         // wait for all clients to receive data before cleaning up
         for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {         for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {
                 WaitForSingleObject(clientThreads[threadIndex].Handle, INFINITE);                 WaitForSingleObject(clientThreads[threadIndex].Handle, INFINITE);
Line 245 
Line 252 
         free(clientThreads);         free(clientThreads);
 } }
  
 static void test_ClientServerBlocking_1(void)  
 {  
         struct ThreadInfo serverThread;  
         DWORD waitStatus;  
   
         // start server thread  
         // server starts client threads after it binds to a port.  
         trace("starting main server thread\n");  
         serverThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, NULL, 0, &serverThread.ID);  
   
         // server thread needs to end before cleaning up  
         waitStatus = WaitForSingleObject(serverThread.Handle, TEST_TIMEOUT * 1000);  
         ok( waitStatus != WAIT_TIMEOUT, "test did not complete in time\n" );  
 }  
   
 static void test_Startup(void) static void test_Startup(void)
 { {
         // initialize application         // initialize application


Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28

Rizwan Kassim
Powered by
ViewCVS 0.9.2