(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.26 and 1.28

version 1.26, 2005/02/24 21:47:28 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 StartNetworkApp(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);
 // StartNetworkApp creates socket sock of type type and returns assigned port number in addr.  static void BlockingServer_ProcessConnection(struct ServerInfo *t);
 static void StartNetworkApp(int type, SOCKET *sock, SOCKADDR_IN *addr)  
 {  
         SOCKADDR_IN tmpAddr;  
         int tmpAddrSize;  
         int bindOK;  
   
         // create socket  
         *sock = socket(AF_INET, type, 0);  
         ok( *sock != INVALID_SOCKET , "Error in socket()\n");  
         if (*sock == INVALID_SOCKET) {  
                 WSACleanup();  
                 exit(0);  
         }  
   
         addr->sin_family = AF_INET;  
         addr->sin_addr.s_addr = INADDR_ANY;  
         addr->sin_port = htons(0);  
   
         // bind socket to port  
         bindOK = !bind(*sock, (const SOCKADDR *) addr, sizeof(*addr));  
         ok( bindOK , "Error binding client to socket\n");  
         if( !bindOK ) {  
                 WSACleanup();  
                 exit(0);  
         }  
   
         // get port number  
         tmpAddrSize = sizeof(tmpAddr);  
         getsockname(*sock, (SOCKADDR *) &tmpAddr, &tmpAddrSize);  
         addr->sin_port = tmpAddr.sin_port;  
 }  
  
 static void BlockingClient(int *serverPort) static void BlockingClient(int *serverPort)
 { {
Line 157 
Line 123 
         }         }
 } }
  
 static void BlockingServer_ProcessConnection(struct ServerInfo *t)  // BlockingServer_Init creates socket sock of type type and returns assigned port number in addr.
   // returns server port number
   static int BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr)
 { {
         // this will handle all connections to the server, it's in its own function to allow for multithreading          SOCKADDR_IN tmpAddr;
         int bClosed;          int bindOK;
         int totCharsSent = 0;          int listenReturn;
         int numCharsSent;  
         const int charsPerSend = 2000;  
   
         // loop and send data  
         while( totCharsSent < TEST_DATA_SIZE ) {  
                 numCharsSent = send(t->connectedSocket, gTestData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0);  
                 ok( numCharsSent != SOCKET_ERROR, "socket error\n" );  
  
                 // pass if send buffer is full          // create socket
                 if(numCharsSent == 0) {          *sock = socket(AF_INET, type, 0);
                         Sleep(100);          ok( *sock != INVALID_SOCKET , "Error in socket()\n");
           if (*sock == INVALID_SOCKET) {
                   WSACleanup();
                   exit(0);
                 }                 }
  
                 totCharsSent += numCharsSent;          addr->sin_family = AF_INET;
           addr->sin_addr.s_addr = INADDR_ANY;
           addr->sin_port = htons(0);
   
           // bind socket to port
           bindOK = !bind(*sock, (const SOCKADDR *) addr, sizeofSOCKADDR_IN);
           ok( bindOK , "Error binding client to socket\n");
           if( !bindOK ) {
                   WSACleanup();
                   exit(0);
         }         }
  
         bClosed = !closesocket(t->connectedSocket);          // get port number
         ok(bClosed,"Error closing socket\n");          getsockname(*sock, (SOCKADDR *) &tmpAddr, &sizeofSOCKADDR_IN);
           addr->sin_port = tmpAddr.sin_port;
   
           // listen on port
           listenReturn = listen(*sock, NUM_CLIENTS);
           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;  
         int listenReturn;  
   
         StartNetworkApp(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);
  
         // listen on port  
         listenReturn = listen(sock, NUM_CLIENTS);  
         ok(listenReturn != SOCKET_ERROR, "error listening on socket\n");  
   
         // 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 226 
Line 189 
         free(threads);         free(threads);
 } }
  
 static void StartBlockingClients(int *serverPort)  static void BlockingServer_ProcessConnection(struct ServerInfo *t)
 { {
         int threadIndex = 0;          // this will handle all connections to the server, it's in its own function to allow for multithreading
         struct ThreadInfo *clientThreads;          int bClosed;
           int totCharsSent = 0;
           int numCharsSent;
           const int charsPerSend = 2000;
  
         clientThreads = malloc(sizeof(struct ThreadInfo) * NUM_CLIENTS);          // loop and send data
         memset(clientThreads, 0, sizeof(struct ThreadInfo) * NUM_CLIENTS);          while( totCharsSent < TEST_DATA_SIZE ) {
                   numCharsSent = send(t->connectedSocket, gTestData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0);
                   ok( numCharsSent != SOCKET_ERROR, "socket error\n" );
  
         for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {                  // pass if send buffer is full
                 clientThreads[threadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, (void *) serverPort, 0, &clientThreads[threadIndex].ID);                  if(numCharsSent == 0) {
                           Sleep(100);
         }         }
         trace("%d clients started\n", NUM_CLIENTS);  
  
         // wait for all clients to receive data before cleaning up                  totCharsSent += numCharsSent;
         for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {  
                 WaitForSingleObject(clientThreads[threadIndex].Handle, INFINITE);  
         }         }
  
         free(clientThreads);          bClosed = !closesocket(t->connectedSocket);
           ok(bClosed,"Error closing socket\n");
 } }
  
 static void test_ClientServerBlocking_1(void) static void test_ClientServerBlocking_1(void)
 { {
         struct ThreadInfo serverThread;         struct ThreadInfo serverThread;
         DWORD waitStatus;         DWORD waitStatus;
           SOCKET sock;
           SOCKADDR_IN server;
           int serverPort;
           int threadIndex = 0;
           struct ThreadInfo *clientThreads;
   
           // create socket, bind server and start listening
           serverPort = BlockingServer_Init(SOCK_STREAM, &sock, &server);
  
         // start server thread         // start server thread
         // server starts client threads after it binds to a port.          trace("starting server thread\n");
         trace("starting main server thread\n");          serverThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &sock, 0, &serverThread.ID);
         serverThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, NULL, 0, &serverThread.ID);  
           // start client threads
           clientThreads = malloc(sizeof(struct ThreadInfo) * NUM_CLIENTS);
           memset(clientThreads, 0, sizeof(struct ThreadInfo) * NUM_CLIENTS);
   
           for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {
                   clientThreads[threadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, (void *) &serverPort, 0, &clientThreads[threadIndex].ID);
           }
           trace("%d clients started\n", NUM_CLIENTS);
  
         // server thread needs to end before cleaning up         // server thread needs to end before cleaning up
         waitStatus = WaitForSingleObject(serverThread.Handle, TEST_TIMEOUT * 1000);         waitStatus = WaitForSingleObject(serverThread.Handle, TEST_TIMEOUT * 1000);
         ok( waitStatus != WAIT_TIMEOUT, "test did not complete in time\n" );         ok( waitStatus != WAIT_TIMEOUT, "test did not complete in time\n" );
   
           // wait for all clients to receive data before cleaning up
           for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) {
                   WaitForSingleObject(clientThreads[threadIndex].Handle, INFINITE);
           }
   
           free(clientThreads);
 } }
  
 static void test_Startup(void) static void test_Startup(void)

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