(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.4 and 1.9

version 1.4, 2005/02/20 22:33:10 version 1.9, 2005/02/22 02:19:39
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
   #define TRANSFER_SIZE 1000000
   
   int clientsDone = 0;
  
 struct TestParams { struct TestParams {
         int sock;          int serverSock;
         int type;          int serverType;
         int serverPort;         int serverPort;
         int clientPort[NUM_CLIENTS];         int clientPort[NUM_CLIENTS];
 }; };
Line 57 
Line 62 
 }; };
  
 static void test_Startup(void); static void test_Startup(void);
 void BlockingClient();  void BlockingClient(int *serverPort);
 void BlockingServer();  void BlockingServer(int *port);
 static void test_ClientServerBlocking_1(void); static void test_ClientServerBlocking_1(void);
 static void test_Startup(void); static void test_Startup(void);
  
 void BlockingClient()  // StartNetworkApp creates socket sock of type type and returns assigned port number in addr.
   void StartNetworkApp(int type, SOCKET *sock, SOCKADDR_IN *addr)
 { {
         SOCKET sock;          SOCKADDR_IN tmpAddr;
         SOCKADDR_IN client;          int tmpAddrSize;
  
         sock = socket(AF_INET, SOCK_DGRAM, 0);          *sock = socket(AF_INET, type, 0);
         if (sock == INVALID_SOCKET) {          if (*sock == INVALID_SOCKET) {
                 ok( 0 , "Error in socket()");                 ok( 0 , "Error in socket()");
                 WSACleanup();                 WSACleanup();
                 exit(0);                 exit(0);
         }         }
         trace("socket() ok\n");         trace("socket() ok\n");
  
         client.sin_family = AF_INET;          addr->sin_family = AF_INET;
         client.sin_addr.s_addr = INADDR_ANY;          addr->sin_addr.s_addr = INADDR_ANY;
         client.sin_port = htons(0);          addr->sin_port = htons(0);
   
         bind(sock, (const SOCKADDR *) &client, sizeof(client));  
  
           if( bind(*sock, (const SOCKADDR *) addr, sizeof(*addr)) ) {
                   ok( 0 , "Error binding client to socket");
                   WSACleanup();
                   exit(0);
           }
  
           // get port number
           tmpAddrSize = sizeof(tmpAddr);
           getsockname(*sock, (SOCKADDR *) &tmpAddr, &tmpAddrSize);
           addr->sin_port = tmpAddr.sin_port;
   }
  
     //while(1)  void BlockingClient(int *serverPort)
     {     {
         printf("Thread 1\n");          SOCKET sock;
           SOCKADDR_IN client, server;
           HOSTENT *hp;
           StartNetworkApp(SOCK_STREAM, &sock, &client);
   
           hp = gethostbyname("localhost");
   
           while(*serverPort == 0) ;
   
           // network code here
           server.sin_family = AF_INET;
           server.sin_addr = *(struct in_addr *) hp->h_addr;
           server.sin_port = *serverPort;
   
           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
           close(ConnectedSocket);
 } }
  
 void BlockingServer()  void BlockingServer(int *port)
   {
           SOCKET sock;
           SOCKADDR_IN server;
           StartNetworkApp(SOCK_STREAM, &sock, &server);
           *port = server.sin_port;
   
           Handle* ServerThreads;
           ServerThreads = malloc(sizeof(Handle) * 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;
   
           //SOCKADDR_IN RemoteAddress;
   
           // condition for how long we want the test to run goes here
 { {
         trace("blocking server\n");                          ok(listen(sock, 5) != SOCKET_ERROR, "error listening on socket");
                           ok(INVALID_SOCK != (ConnectedSocket = accept(sock)), "error accepting socket"); // this can be modified to include the address of the remote socket
                           ServerThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, ConnectedSocket, 0, &ServerThreadIDs[ThreadIndex]);
                           // the line above needs to be cleaned up, it currently copies the connected socket into the called function
                           // 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
   
           free(ServerThreads);
           free(ServerThreadIDs);
           trace("blocking server done\n");
 } }
  
 static void test_ClientServerBlocking_1(void) static void test_ClientServerBlocking_1(void)
 { {
   HANDLE Thread1, Thread2;          int ThreadIndex = 0;
   DWORD ThreadId1, ThreadId2;          int serverPort = 0; // I think the server port would work better as a #DEFINE rather than a variable that gets passed around everywhere
   Thread1 = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, NULL, 0, &ThreadId1);    HANDLE ServerThread;
   Thread2 = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer, NULL, 0, &ThreadId2);    DWORD ServerThreadId;
         //trace("In test_ClientServerBlocking_1\n");          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");
 } }
  
 static void test_Startup(void) static void test_Startup(void)
Line 126 
Line 206 
   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.4  
changed lines
  Added in v.1.9

Rizwan Kassim
Powered by
ViewCVS 0.9.2