(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.26 and 1.27

version 1.26, 2005/02/24 21:47:28 version 1.27, 2005/02/24 21:57:44
Line 73 
Line 73 
 static void test_ClientServerBlocking_1(void); static void test_ClientServerBlocking_1(void);
 static void test_Cleanup(void); static void test_Cleanup(void);
  
 static void StartNetworkApp(int type, SOCKET *sock, SOCKADDR_IN *addr);  static void BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr);
 static void BlockingServer_ProcessConnection(struct ServerInfo *t); static void BlockingServer_ProcessConnection(struct ServerInfo *t);
 static void StartBlockingClients(int *serverPort); static void StartBlockingClients(int *serverPort);
 static void BlockingClient(int *serverPort); static void BlockingClient(int *serverPort);
 static void BlockingServer(); static void BlockingServer();
  
 // StartNetworkApp creates socket sock of type type and returns assigned port number in addr.  
 static void StartNetworkApp(int type, SOCKET *sock, SOCKADDR_IN *addr)  
 {  
         SOCKADDR_IN tmpAddr;  
         int tmpAddrSize;  
         int bindOK;  
   
         // create socket  
         *sock = socket(AF_INET, type, 0);  
         ok( *sock != INVALID_SOCKET , "Error in socket()\n");  
         if (*sock == INVALID_SOCKET) {  
                 WSACleanup();  
                 exit(0);  
         }  
   
         addr->sin_family = AF_INET;  
         addr->sin_addr.s_addr = INADDR_ANY;  
         addr->sin_port = htons(0);  
   
         // bind socket to port  
         bindOK = !bind(*sock, (const SOCKADDR *) addr, sizeof(*addr));  
         ok( bindOK , "Error binding client to socket\n");  
         if( !bindOK ) {  
                 WSACleanup();  
                 exit(0);  
         }  
   
         // get port number  
         tmpAddrSize = sizeof(tmpAddr);  
         getsockname(*sock, (SOCKADDR *) &tmpAddr, &tmpAddrSize);  
         addr->sin_port = tmpAddr.sin_port;  
 }  
   
 static void BlockingClient(int *serverPort) static void BlockingClient(int *serverPort)
 { {
         SOCKET sock;         SOCKET sock;
Line 157 
Line 124 
         }         }
 } }
  
 static void BlockingServer_ProcessConnection(struct ServerInfo *t)  // BlockingServer_Init creates socket sock of type type and returns assigned port number in addr.
   static void BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr)
 { {
         // this will handle all connections to the server, it's in its own function to allow for multithreading          SOCKADDR_IN tmpAddr;
         int bClosed;          int bindOK;
         int totCharsSent = 0;          int listenReturn;
         int numCharsSent;  
         const int charsPerSend = 2000;  
   
         // loop and send data  
         while( totCharsSent < TEST_DATA_SIZE ) {  
                 numCharsSent = send(t->connectedSocket, gTestData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0);  
                 ok( numCharsSent != SOCKET_ERROR, "socket error\n" );  
  
                 // pass if send buffer is full          // create socket
                 if(numCharsSent == 0) {          *sock = socket(AF_INET, type, 0);
                         Sleep(100);          ok( *sock != INVALID_SOCKET , "Error in socket()\n");
           if (*sock == INVALID_SOCKET) {
                   WSACleanup();
                   exit(0);
                 }                 }
  
                 totCharsSent += numCharsSent;          addr->sin_family = AF_INET;
           addr->sin_addr.s_addr = INADDR_ANY;
           addr->sin_port = htons(0);
   
           // bind socket to port
           bindOK = !bind(*sock, (const SOCKADDR *) addr, sizeofSOCKADDR_IN);
           ok( bindOK , "Error binding client to socket\n");
           if( !bindOK ) {
                   WSACleanup();
                   exit(0);
         }         }
  
         bClosed = !closesocket(t->connectedSocket);          // get port number
         ok(bClosed,"Error closing socket\n");          getsockname(*sock, (SOCKADDR *) &tmpAddr, &sizeofSOCKADDR_IN);
           addr->sin_port = tmpAddr.sin_port;
   
           // listen on port
           listenReturn = listen(*sock, NUM_CLIENTS);
           ok(listenReturn != SOCKET_ERROR, "error listening on socket\n");
 } }
  
 static void BlockingServer() // listens for incoming connections and accepts up to NUM_CLIENTS connections at once static void BlockingServer() // listens for incoming connections and accepts up to NUM_CLIENTS connections at once
Line 190 
Line 168 
  
         SOCKET sock;         SOCKET sock;
         SOCKADDR_IN server;         SOCKADDR_IN server;
         int listenReturn;  
  
         StartNetworkApp(SOCK_STREAM, &sock, &server);          BlockingServer_Init(SOCK_STREAM, &sock, &server);
  
         // allocate enough space to keep track of NUM_CLIENTS connections         // allocate enough space to keep track of NUM_CLIENTS connections
         threads = malloc(sizeof(struct ServerInfo) * NUM_CLIENTS);         threads = malloc(sizeof(struct ServerInfo) * NUM_CLIENTS);
         memset(threads, 0, sizeof(struct ServerInfo) * NUM_CLIENTS);         memset(threads, 0, sizeof(struct ServerInfo) * NUM_CLIENTS);
  
         // listen on port  
         listenReturn = listen(sock, NUM_CLIENTS);  
         ok(listenReturn != SOCKET_ERROR, "error listening on socket\n");  
   
         // set the port parameter; clients now know we're ready to accept connections         // set the port parameter; clients now know we're ready to accept connections
         serverPort = server.sin_port;         serverPort = server.sin_port;
  
Line 226 
Line 199 
         free(threads);         free(threads);
 } }
  
   static void BlockingServer_ProcessConnection(struct ServerInfo *t)
   {
           // this will handle all connections to the server, it's in its own function to allow for multithreading
           int bClosed;
           int totCharsSent = 0;
           int numCharsSent;
           const int charsPerSend = 2000;
   
           // loop and send data
           while( totCharsSent < TEST_DATA_SIZE ) {
                   numCharsSent = send(t->connectedSocket, gTestData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0);
                   ok( numCharsSent != SOCKET_ERROR, "socket error\n" );
   
                   // pass if send buffer is full
                   if(numCharsSent == 0) {
                           Sleep(100);
                   }
   
                   totCharsSent += numCharsSent;
           }
   
           bClosed = !closesocket(t->connectedSocket);
           ok(bClosed,"Error closing socket\n");
   }
   
 static void StartBlockingClients(int *serverPort) static void StartBlockingClients(int *serverPort)
 { {
         int threadIndex = 0;         int threadIndex = 0;

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