(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.11 and 1.12

version 1.11, 2005/02/22 04:33:16 version 1.12, 2005/02/22 05:15:01
Line 48 
Line 48 
 #define TRANSFER_SIZE 1000000 #define TRANSFER_SIZE 1000000
  
 int clientsDone = 0; int clientsDone = 0;
   int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN);
  
 struct TestParams { struct TestParams {
         int serverSock;         int serverSock;
Line 61 
Line 62 
         int clientNum; // 1...NUM_CLIENTS         int clientNum; // 1...NUM_CLIENTS
 }; };
  
   struct ServerThread {
           HANDLE* ServerThread;
           DWORD* ServerThreadID;
           SOCKET Socket; // socket to communicate with client
           SOCKADDR_IN Client; // client info
   };
   
 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 110 
         SOCKET sock;         SOCKET sock;
         SOCKADDR_IN client, server;         SOCKADDR_IN client, server;
         HOSTENT *hp;         HOSTENT *hp;
           char* msg="Some message to send to server";
   
         StartNetworkApp(SOCK_STREAM, &sock, &client);         StartNetworkApp(SOCK_STREAM, &sock, &client);
  
         hp = gethostbyname("localhost");         hp = gethostbyname("localhost");
Line 113 
Line 123 
         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){
                   ok( 0 , "Error connecting client to socket\n");
                   WSACleanup();
                   exit(0);
           }
   
           if((send(sock, msg, strlen(msg), 0))==-1){
                   ok( 0 , "Error sending message\n");
                   WSACleanup();
                   exit(0);
           }
   
         trace("blocking client done\n");         trace("blocking client done\n");
         clientsDone++;         clientsDone++;
 } }
Line 127 
Line 149 
  
 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;
         HANDLE* ServerThreads; // the handles for the threads that process connections         HANDLE* ServerThreads; // the handles for the threads that process connections
         DWORD* ServerThreadIDs; // the thread ids 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         SOCKET* ConnectedSockets; // the threads created by accept() that get sent to the processing function
Line 134 
Line 157 
  
         SOCKET sock;         SOCKET sock;
         SOCKADDR_IN server;         SOCKADDR_IN server;
         Handle* ServerThreads;          int ListenReturn;
         DWORD* ServerThreadIDs;  
         int ThreadIndex = 0;  
  
         StartNetworkApp(SOCK_STREAM, &sock, &server);         StartNetworkApp(SOCK_STREAM, &sock, &server);
         *port = server.sin_port;         *port = server.sin_port;
  
           Threads = malloc(sizeof(struct ServerThread) * NUM_CLIENTS);
           memset(Threads, 0, sizeof(struct ServerThread) * NUM_CLIENTS);
   
         ServerThreads = malloc(sizeof(HANDLE) * NUM_CLIENTS);         ServerThreads = malloc(sizeof(HANDLE) * NUM_CLIENTS);
         memset(ServerThreads, 0, sizeof(HANDLE) * NUM_CLIENTS);         memset(ServerThreads, 0, sizeof(HANDLE) * NUM_CLIENTS);
  
Line 157 
Line 181 
  
         for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++)         for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++)
         {         {
                         ConnectedSocket = accept(sock); // this can be modified to include the address of the remote socket                          ConnectedSockets[ThreadIndex] = accept(sock, (SOCKADDR *) &Threads[ThreadIndex].Client, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket
                         ok(ConnectedSocket != INVALID_SOCKET, "error accepting socket");                          ok(ConnectedSockets[ThreadIndex] != INVALID_SOCKET, "error accepting socket");
  
                         ServerThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &ConnectedSockets[ThreadIndex], 0, &ServerThreadIDs[ThreadIndex]);                         ServerThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &ConnectedSockets[ThreadIndex], 0, &ServerThreadIDs[ThreadIndex]);
         }         }

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