(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.12 and 1.15

version 1.12, 2005/02/22 05:15:01 version 1.15, 2005/02/22 06:04:46
Line 45 
Line 45 
  
 #define NUM_CLIENTS 1 #define NUM_CLIENTS 1
 // 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 100000
  
 int clientsDone = 0; int clientsDone = 0;
 int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN); int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN);
   char *testData;
  
 struct TestParams { struct TestParams {
         int serverSock;         int serverSock;
Line 63 
Line 64 
 }; };
  
 struct ServerThread { struct ServerThread {
         HANDLE* ServerThread;          HANDLE ServerThread;
         DWORD* ServerThreadID;          DWORD ServerThreadID;
         SOCKET Socket; // socket to communicate with client          SOCKET ConnectedSocket; // socket to communicate with client
         SOCKADDR_IN Client; // client info         SOCKADDR_IN Client; // client info
 }; };
  
Line 139 
Line 140 
         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
         int bClosed;         int bClosed;
         bClosed = close(ConnectedSocket);          bClosed = close(t.ConnectedSocket);
         //ok(bClosed,"Error closing socket");         //ok(bClosed,"Error closing socket");
 } }
  
 void BlockingServer(int *port) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once void BlockingServer(int *port) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once
 { {
         struct ServerThread *Threads;         struct ServerThread *Threads;
         HANDLE* ServerThreads; // the handles for the threads that process connections  
         DWORD* ServerThreadIDs; // the thread ids for the threads that process connections  
         SOCKET* ConnectedSockets; // the threads created by accept() that get sent to the processing function  
         int ThreadIndex = 0;         int ThreadIndex = 0;
  
         SOCKET sock;         SOCKET sock;
Line 165 
Line 163 
         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);
  
         ServerThreads = malloc(sizeof(HANDLE) * NUM_CLIENTS);  
         memset(ServerThreads, 0, sizeof(HANDLE) * NUM_CLIENTS);  
   
         ServerThreadIDs = malloc(sizeof(DWORD) * NUM_CLIENTS);  
         memset(ServerThreadIDs, 0, sizeof(DWORD) * NUM_CLIENTS);  
   
         ConnectedSockets = malloc(sizeof(DWORD) * NUM_CLIENTS);  
         memset(ConnectedSockets, 0, sizeof(DWORD) * NUM_CLIENTS);  
   
         //SOCKADDR_IN RemoteAddress;  
   
         ListenReturn = listen(sock, 5);         ListenReturn = listen(sock, 5);
         ok(ListenReturn != SOCKET_ERROR, "error listening on socket");         ok(ListenReturn != SOCKET_ERROR, "error listening on socket");
  
         for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++)         for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++)
         {         {
                         ConnectedSockets[ThreadIndex] = 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(ConnectedSockets[ThreadIndex] != INVALID_SOCKET, "error accepting socket");                          ok(Threads[ThreadIndex].ConnectedSocket != INVALID_SOCKET, "error accepting socket");
  
                         ServerThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &ConnectedSockets[ThreadIndex], 0, &ServerThreadIDs[ThreadIndex]);                          Threads[ThreadIndex].ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &(Threads[ThreadIndex].ConnectedSocket), 0, &Threads[ThreadIndex].ServerThreadID);
         }         }
  
         // network code here         // network code here
  
         free(ServerThreads);          free(Threads);
         free(ServerThreadIDs);  
         free(ConnectedSockets);  
         trace("blocking server done\n");         trace("blocking server done\n");
 } }
  
Line 223 
Line 208 
 { {
         // 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 234 
Line 223 
    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.12  
changed lines
  Added in v.1.15
Rizwan Kassim
 Powered by
ViewCVS 0.9.2