wine4/wine/dlls/wsock32/tests/wsock32_main.c - diff

Return to wsock32_main.c CVS log

Up to [RizwankCVS] / wine4 / wine / dlls / wsock32 / tests

Diff for /wine4/wine/dlls/wsock32/tests/wsock32_main.c between version 1.6 and 1.10

version 1.6, 2005/02/21 21:18:43

version 1.10, 2005/02/22 02:28:50

Line 24

#include <winsock.h>

#include <wtypes.h>

#include <winerror.h>

#include <string.h>

#ifndef STANDALONE

#include "wine/test.h"

Line 42

Line 43

#define todo_wine

#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 {

int serverSock;

int serverType;

Line 111

Line 114

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

int bClosed;

bClosed = close(ConnectedSocket);

//ok(bClosed,"Error closing socket");

}

void BlockingServer(int *port)

{

SOCKET sock;

HANDLE* ServerThreads;

DWORD* ServerThreadIDs;

int ThreadIndex = 0;

SOCKET sock, ConnectedSocket;

SOCKADDR_IN server;

StartNetworkApp(SOCK_STREAM, &sock, &server);

*port = server.sin_port;

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);

//SOCKADDR_IN RemoteAddress;

// condition for how long we want the test to run goes here

{

ok(listen(sock, 5) != SOCKET_ERROR, "error listening on socket");

//ok(INVALID_SOCKET != (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)

{

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");

}

Line 158

Line 208

trace("test 2 of 2:\n");

test_ClientServerBlocking_1();

trace("all tests done\n");

while (clientsDone != NUM_CLIENTS)

;

}

Legend:

Removed from v.1.6
changed lines
	Added in v.1.10

Rizwan Kassim