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

version 1.9, 2005/02/22 02:19:39 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 TRANSFER_SIZE 1000000  #define TEST_DATA_SIZE 14554
  
 int clientsDone = 0; int clientsDone = 0;
   int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN);
   char *testData;
  
 struct TestParams { struct TestParams {
         int serverSock;         int serverSock;
Line 61 
Line 63 
         int clientNum; // 1...NUM_CLIENTS         int clientNum; // 1...NUM_CLIENTS
 }; };
  
   struct Thread {
           HANDLE Handle;
           DWORD ID;
   };
   
   struct ServerThread {
           HANDLE ServerThread;
           DWORD ServerThreadID;
           SOCKET ConnectedSocket; // socket to communicate with client
           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 102 
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];
   
         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;
         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;
  
           connectError = connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr));
           ok( !connectError , "client cannot connect to host\n");
           if(connectError) {
                   WSACleanup();
                   exit(0);
           }
           printf("client starting data transfer\n");
           while( totCharsReceived < TEST_DATA_SIZE ) {
                   numCharsReceived = recv(sock, buf, 1000, 0);
                   ok( numCharsReceived > 0, "socket was closed unexpectedly" );
   
                   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" );
   
   
                   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(SOCKET ConnectedSocket)  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
         close(ConnectedSocket);          int bClosed;
           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");
 } }
  
 void BlockingServer(int *port)  void BlockingServer(int *port) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once
 { {
           struct ServerThread *Threads;
           int ThreadIndex = 0;
   
         SOCKET sock;         SOCKET sock;
         SOCKADDR_IN server;         SOCKADDR_IN server;
           int ListenReturn;
   
         StartNetworkApp(SOCK_STREAM, &sock, &server);         StartNetworkApp(SOCK_STREAM, &sock, &server);
         *port = server.sin_port;  
  
         Handle* ServerThreads;          Threads = malloc(sizeof(struct ServerThread) * NUM_CLIENTS);
         ServerThreads = malloc(sizeof(Handle) * NUM_CLIENTS);          memset(Threads, 0, sizeof(struct ServerThread) * NUM_CLIENTS);
         memset(ServerThreads, 0, sizeof(Handle) * NUM_CLIENTS)  
   
         DWORD* ServerThreadIDs;  
         ServerThreadIDs = malloc(sizeof(DWORD) * NUM_CLIENTS);  
         memset(ServerThreadIDs, 0, sizeof(DWORD) * NUM_CLIENTS);  
  
         int ThreadIndex = 0;          ListenReturn = listen(sock, NUM_CLIENTS);
           ok(ListenReturn != SOCKET_ERROR, "error listening on socket");
  
         //SOCKADDR_IN RemoteAddress;          *port = server.sin_port;
  
         // condition for how long we want the test to run goes here          for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {
         {                          printf("server waiting for connection %d\n", ThreadIndex+1);
                         ok(listen(sock, 5) != SOCKET_ERROR, "error listening on 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(INVALID_SOCK != (ConnectedSocket = accept(sock)), "error accepting socket"); // this can be modified to include the address of the remote socket                          ok(Threads[ThreadIndex].ConnectedSocket != INVALID_SOCKET, "error accepting socket");
                         ServerThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, ConnectedSocket, 0, &ServerThreadIDs[ThreadIndex]);                          printf("server accepted connection %d\n", ThreadIndex + 1);
                         // the line above needs to be cleaned up, it currently copies the connected socket into the called function                          Threads[ThreadIndex].ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &Threads[ThreadIndex], 0, &Threads[ThreadIndex].ServerThreadID);
                         // and will then overwrite the local variable.  I'm thinking maybe it needs an array of sockets to handle this  
                         // and then it can pass the address of the socket.  
         }         }
  
         // network code here         // network code here
  
         free(ServerThreads);          while (clientsDone != NUM_CLIENTS)
         free(ServerThreadIDs);                  ;
   
           free(Threads);
         trace("blocking server done\n");         trace("blocking server done\n");
 } }
  
Line 163 
Line 229 
 { {
         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);          ClientThreads = malloc(sizeof(struct Thread) * NUM_CLIENTS);
         memset(ClientThreads, 0, sizeof(Handle) * NUM_CLIENTS)          memset(ClientThreads, 0, sizeof(struct Thread) * NUM_CLIENTS);
  
         ClientThreadIds = malloc(sizeof(DWORD) * NUM_CLIENTS);          ClientThreads[ThreadIndex].Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ClientThreads[ThreadIndex].ID);
         memset(ClientThreadIds, 0, sizeof(DWORD) * 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]);                  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");
Line 187 
Line 249 
 { {
         // initialize application         // initialize application
         WSADATA wsaData;         WSADATA wsaData;
   int wsastartup_result = WSAStartup(MAKEWORD(1,1), &wsaData);    int wsastartup_result;
         if ( (LOBYTE(wsaData.wVersion) != 1) && (HIBYTE(wsaData.wVersion) != 1) )          int versionOK;
         {  
                 ok( 0 , "WSAStartup returns an incompatible sockets version");          wsastartup_result = WSAStartup(MAKEWORD(1,1), &wsaData);
           versionOK = (LOBYTE(wsaData.wVersion) == 1) && (HIBYTE(wsaData.wVersion) == 1);
   
           ok( versionOK , "WSAStartup returns an incompatible sockets version");
           if ( !versionOK ) {
                 WSACleanup();                 WSACleanup();
                 exit(0);                 exit(0);
         }         }
Line 198 
Line 264 
    ok((wsastartup_result == NO_ERROR), "Error in WSAStartup()");    ok((wsastartup_result == NO_ERROR), "Error in WSAStartup()");
 } }
  
   
 START_TEST(wsock32_main) START_TEST(wsock32_main)
 { {
           testData = malloc(TEST_DATA_SIZE);
   trace("test 1 of 2:\n");   trace("test 1 of 2:\n");
   test_Startup();   test_Startup();
   trace("test 2 of 2:\n");   trace("test 2 of 2:\n");

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