(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.6 and 1.13

version 1.6, 2005/02/21 21:18:43 version 1.13, 2005/02/22 05:38:50
Line 24 
Line 24 
 #include <winsock.h> #include <winsock.h>
 #include <wtypes.h> #include <wtypes.h>
 #include <winerror.h> #include <winerror.h>
   #include <string.h>
  
 #ifndef STANDALONE #ifndef STANDALONE
 #include "wine/test.h" #include "wine/test.h"
Line 42 
Line 43 
 #define todo_wine #define todo_wine
 #endif #endif
  
 #define NUM_CLIENTS 5  #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 TRANSFER_SIZE 1000000
  
   int clientsDone = 0;
   int sizeofSOCKADDR_IN = sizeof(SOCKADDR_IN);
   
 struct TestParams { struct TestParams {
         int serverSock;         int serverSock;
         int serverType;         int serverType;
Line 58 
Line 62 
         int clientNum; // 1...NUM_CLIENTS         int clientNum; // 1...NUM_CLIENTS
 }; };
  
   struct ServerThread {
           HANDLE ServerThread;
           DWORD ServerThreadID;
           SOCKET ConnectedSocket; // 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 99 
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 110 
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++;
   }
   
   void ProcessConnection(SOCKET *ConnectedSocket)
   {
           // this will handle all connections to the server, it's in its own function to allow for multithreading
           int bClosed;
           bClosed = close(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;         *port = server.sin_port;
  
           Threads = malloc(sizeof(struct ServerThread) * NUM_CLIENTS);
           memset(Threads, 0, sizeof(struct ServerThread) * NUM_CLIENTS);
   
           ListenReturn = listen(sock, 5);
           ok(ListenReturn != SOCKET_ERROR, "error listening on socket");
   
           for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++)
           {
                           Threads[ThreadIndex].ConnectedSocket = accept(sock, (SOCKADDR *) &Threads[ThreadIndex].Client, &sizeof(SOCKADDR_IN)); // this can be modified to include the address of the remote socket
                           ok(Threads[ThreadIndex].ConnectedSockets != INVALID_SOCKET, "error accepting socket");
   
                           Threads[ThreadIndex].ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &(Threads[ThreadIndex].ConnectedSocket), 0, &Threads[ThreadIndex].ServerThreadID);
           }
   
         // network code here         // network code here
  
           free(Threads);
         trace("blocking server done\n");         trace("blocking server done\n");
 } }
  
 static void test_ClientServerBlocking_1(void) static void test_ClientServerBlocking_1(void)
 { {
         int serverPort = 0;          int ThreadIndex = 0;
   HANDLE Thread1, Thread2;          int serverPort = 0; // I think the server port would work better as a #DEFINE rather than a variable that gets passed around everywhere
   DWORD ThreadId1, ThreadId2;          HANDLE ServerThread;
   Thread1 = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ThreadId1);          DWORD ServerThreadId;
   Thread2 = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ThreadId2);          DWORD *ClientThreadIds;
           HANDLE *ClientThreads;
   
           ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ServerThreadId);
   
           ClientThreads = malloc(sizeof(HANDLE) * NUM_CLIENTS);
           memset(ClientThreads, 0, sizeof(HANDLE) * NUM_CLIENTS);
   
           ClientThreadIds = malloc(sizeof(DWORD) * NUM_CLIENTS);
           memset(ClientThreadIds, 0, sizeof(DWORD) * NUM_CLIENTS);
   
           for(ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++) {
                   ClientThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, &serverPort, 0, &ClientThreadIds[ThreadIndex]);
           }
   
         trace("test_ClientServerBlocking_1 done\n");         trace("test_ClientServerBlocking_1 done\n");
 } }
  
Line 158 
Line 226 
   trace("test 2 of 2:\n");   trace("test 2 of 2:\n");
   test_ClientServerBlocking_1();   test_ClientServerBlocking_1();
   trace("all tests done\n");   trace("all tests done\n");
           while (clientsDone != NUM_CLIENTS)
                   ;
 } }

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