(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.16 and 1.18

version 1.16, 2005/02/22 06:33:40 version 1.18, 2005/02/23 04:43:40
Line 43 
Line 43 
 #define todo_wine #define todo_wine
 #endif #endif
  
 #define NUM_CLIENTS 1  #define NUM_CLIENTS 3
 // amount of data to transfer from each client to server // amount of data to transfer from each client to server
 #define TEST_DATA_SIZE 100000  #define TEST_DATA_SIZE 14554
  
 int clientsDone = 0; int clientsDone = 0;
 int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN); int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN);
Line 123 
Line 123 
         int numCharsReceived;         int numCharsReceived;
         int memSame;         int memSame;
         char buf[1001];         char buf[1001];
         char* msg="Some message to send to server";  
  
         StartNetworkApp(SOCK_STREAM, &sock, &client);         StartNetworkApp(SOCK_STREAM, &sock, &client);
  
         hp = gethostbyname("localhost");         hp = gethostbyname("localhost");
  
         while(*serverPort == 0) ;          while(*serverPort == 0)
                   ;
  
         // network code here         // network code here
         server.sin_family = AF_INET;         server.sin_family = AF_INET;
Line 142 
Line 142 
                 WSACleanup();                 WSACleanup();
                 exit(0);                 exit(0);
         }         }
           printf("client starting data transfer\n");
         while( totCharsReceived < TEST_DATA_SIZE ) {         while( totCharsReceived < TEST_DATA_SIZE ) {
                 numCharsReceived = recv(sock, buf, 1000, 0);                 numCharsReceived = recv(sock, buf, 1000, 0);
                 ok( numCharsReceived > 0, "socket was closed unexpectedly" );                 ok( numCharsReceived > 0, "socket was closed unexpectedly" );
  
                 memSame = ! memcmp(buf,testData+totCharsReceived,numCharsReceived);                 memSame = ! memcmp(buf,testData+totCharsReceived,numCharsReceived);
   
                   if(!memSame) {
                           printf("\n%d chars received\ncompared %d chars\n",totCharsReceived,numCharsReceived);
                   }
   
                 ok( memSame, "data integrity lost during transfer" );                 ok( memSame, "data integrity lost during transfer" );
  
   
                 totCharsReceived += numCharsReceived;                 totCharsReceived += numCharsReceived;
                   //printf("received %d chars\n", numCharsReceived);
         }         }
           printf("client data transfer completed\n");
  
         trace("blocking client done\n");         trace("blocking client done\n");
         clientsDone++;         clientsDone++;
 } }
  
 void ProcessConnection(struct ServerThread t)  void ProcessConnection(struct ServerThread *t)
 { {
         // this will handle all connections to the server, it's in its own function to allow for multithreading         // this will handle all connections to the server, it's in its own function to allow for multithreading
         int bClosed;         int bClosed;
         bClosed = close(t.ConnectedSocket);          int totCharsSent = 0;
           int numCharsSent;
           const int charsPerSend = 2000;
   
           printf("server starting data transfer\n");
           while( totCharsSent < TEST_DATA_SIZE ) {
                   numCharsSent = send(t->ConnectedSocket, testData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0);
                   //ok( numCharsSent != SOCKET_ERROR, "socket error" );
                   if(numCharsSent == SOCKET_ERROR) {
                           printf("error code: %d",WSAGetLastError());
                   }
                   totCharsSent += numCharsSent;
                   //printf("sent %d block\n", numCharsSent);
           }
           printf("server data transfer completed\n");
   
           bClosed = close(t->ConnectedSocket);
         //ok(bClosed,"Error closing socket");         //ok(bClosed,"Error closing socket");
 } }
  
Line 175 
Line 199 
         int ListenReturn;         int ListenReturn;
  
         StartNetworkApp(SOCK_STREAM, &sock, &server);         StartNetworkApp(SOCK_STREAM, &sock, &server);
         *port = server.sin_port;  
  
         Threads = malloc(sizeof(struct ServerThread) * NUM_CLIENTS);         Threads = malloc(sizeof(struct ServerThread) * NUM_CLIENTS);
         memset(Threads, 0, sizeof(struct ServerThread) * NUM_CLIENTS);         memset(Threads, 0, sizeof(struct ServerThread) * NUM_CLIENTS);
  
         ListenReturn = listen(sock, 5);          ListenReturn = listen(sock, NUM_CLIENTS);
         ok(ListenReturn != SOCKET_ERROR, "error listening on socket");         ok(ListenReturn != SOCKET_ERROR, "error listening on socket");
  
         for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++)          *port = server.sin_port;
         {  
           for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {
                           printf("server waiting for connection %d\n", ThreadIndex+1);
                         Threads[ThreadIndex].ConnectedSocket = accept(sock, (SOCKADDR *) &Threads[ThreadIndex].Client, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket                         Threads[ThreadIndex].ConnectedSocket = accept(sock, (SOCKADDR *) &Threads[ThreadIndex].Client, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket
                         ok(Threads[ThreadIndex].ConnectedSocket != INVALID_SOCKET, "error accepting socket");                         ok(Threads[ThreadIndex].ConnectedSocket != INVALID_SOCKET, "error accepting socket");
                           printf("server accepted connection %d\n", ThreadIndex + 1);
                         Threads[ThreadIndex].ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &(Threads[ThreadIndex].ConnectedSocket), 0, &Threads[ThreadIndex].ServerThreadID);                          Threads[ThreadIndex].ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &Threads[ThreadIndex], 0, &Threads[ThreadIndex].ServerThreadID);
         }         }
  
         // network code here         // network code here
  
           while (clientsDone != NUM_CLIENTS)
                   ;
   
         free(Threads);         free(Threads);
         trace("blocking server done\n");         trace("blocking server done\n");
 } }
Line 204 
Line 232 
         struct Thread ServerThread;         struct Thread ServerThread;
         struct Thread *ClientThreads;         struct Thread *ClientThreads;
  
         ServerThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ServerThread.ID);  
   
         ClientThreads = malloc(sizeof(struct Thread) * NUM_CLIENTS);         ClientThreads = malloc(sizeof(struct Thread) * NUM_CLIENTS);
         memset(ClientThreads, 0, sizeof(struct Thread) * NUM_CLIENTS);         memset(ClientThreads, 0, sizeof(struct Thread) * NUM_CLIENTS);
  
         for(ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {  
                 ClientThreads[ThreadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ClientThreads[ThreadIndex].ID);                 ClientThreads[ThreadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ClientThreads[ThreadIndex].ID);
   
           for(ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {
                   printf("created client thread %d\n",ThreadIndex + 1);
                   ServerThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ServerThread.ID);
         }         }
  
         trace("test_ClientServerBlocking_1 done\n");         trace("test_ClientServerBlocking_1 done\n");

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