(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.15 and 1.16

version 1.15, 2005/02/22 06:04:46 version 1.16, 2005/02/22 06:33:40
Line 63 
Line 63 
         int clientNum; // 1...NUM_CLIENTS         int clientNum; // 1...NUM_CLIENTS
 }; };
  
   struct Thread {
           HANDLE Handle;
           DWORD ID;
   };
   
 struct ServerThread { struct ServerThread {
         HANDLE ServerThread;         HANDLE ServerThread;
         DWORD ServerThreadID;         DWORD ServerThreadID;
Line 70 
Line 75 
         SOCKADDR_IN Client; // client info         SOCKADDR_IN Client; // client info
 }; };
  
   extern int close(int);
   
 static void test_Startup(void); static void test_Startup(void);
 void BlockingClient(int *serverPort); void BlockingClient(int *serverPort);
 void BlockingServer(int *port); void BlockingServer(int *port);
Line 111 
Line 118 
         SOCKET sock;         SOCKET sock;
         SOCKADDR_IN client, server;         SOCKADDR_IN client, server;
         HOSTENT *hp;         HOSTENT *hp;
           int connectError;
           int totCharsReceived = 0;
           int numCharsReceived;
           int memSame;
           char buf[1001];
         char* msg="Some message to send to server";         char* msg="Some message to send to server";
  
         StartNetworkApp(SOCK_STREAM, &sock, &client);         StartNetworkApp(SOCK_STREAM, &sock, &client);
Line 124 
Line 136 
         server.sin_addr = *(struct in_addr *) hp->h_addr;         server.sin_addr = *(struct in_addr *) hp->h_addr;
         server.sin_port = *serverPort;         server.sin_port = *serverPort;
  
         if(connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr)) < 0){          connectError = connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr));
                 ok( 0 , "Error connecting client to socket\n");          ok( !connectError , "client cannot connect to host\n");
           if(connectError) {
                 WSACleanup();                 WSACleanup();
                 exit(0);                 exit(0);
         }         }
  
         if((send(sock, msg, strlen(msg), 0))==-1){          while( totCharsReceived < TEST_DATA_SIZE ) {
                 ok( 0 , "Error sending message\n");                  numCharsReceived = recv(sock, buf, 1000, 0);
                 WSACleanup();                  ok( numCharsReceived > 0, "socket was closed unexpectedly" );
                 exit(0);  
                   memSame = ! memcmp(buf,testData+totCharsReceived,numCharsReceived);
                   ok( memSame, "data integrity lost during transfer" );
   
                   totCharsReceived += numCharsReceived;
         }         }
  
         trace("blocking client done\n");         trace("blocking client done\n");
Line 184 
Line 201 
 { {
         int ThreadIndex = 0;         int ThreadIndex = 0;
         int serverPort = 0; // I think the server port would work better as a #DEFINE rather than a variable that gets passed around everywhere         int serverPort = 0; // I think the server port would work better as a #DEFINE rather than a variable that gets passed around everywhere
         HANDLE ServerThread;          struct Thread ServerThread;
         DWORD ServerThreadId;          struct Thread *ClientThreads;
         DWORD *ClientThreadIds;  
         HANDLE *ClientThreads;  
   
         ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ServerThreadId);  
  
         ClientThreads = malloc(sizeof(HANDLE) * NUM_CLIENTS);          ServerThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ServerThread.ID);
         memset(ClientThreads, 0, sizeof(HANDLE) * NUM_CLIENTS);  
  
         ClientThreadIds = malloc(sizeof(DWORD) * NUM_CLIENTS);          ClientThreads = malloc(sizeof(struct Thread) * NUM_CLIENTS);
         memset(ClientThreadIds, 0, sizeof(DWORD) * NUM_CLIENTS);          memset(ClientThreads, 0, sizeof(struct Thread) * NUM_CLIENTS);
  
         for(ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {         for(ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {
                 ClientThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ClientThreadIds[ThreadIndex]);                  ClientThreads[ThreadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ClientThreads[ThreadIndex].ID);
         }         }
  
         trace("test_ClientServerBlocking_1 done\n");         trace("test_ClientServerBlocking_1 done\n");

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