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.9 and 1.11

version 1.9, 2005/02/22 02:19:39

version 1.11, 2005/02/22 04:33:16

Line 117

clientsDone++;

}

void ProcessConnection(SOCKET ConnectedSocket)

void ProcessConnection(SOCKET *ConnectedSocket)

{

// this will handle all connections to the server, it's in its own function to allow for multithreading

close(ConnectedSocket);

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

{

HANDLE* ServerThreads; // the handles 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

int ThreadIndex = 0;

SOCKET sock;

SOCKADDR_IN server;

Handle* ServerThreads;

DWORD* ServerThreadIDs;

int ThreadIndex = 0;

StartNetworkApp(SOCK_STREAM, &sock, &server);

*port = server.sin_port;

Handle* ServerThreads;

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)

DWORD* ServerThreadIDs;

ServerThreadIDs = malloc(sizeof(DWORD) * NUM_CLIENTS);

memset(ServerThreadIDs, 0, sizeof(DWORD) * NUM_CLIENTS);

int ThreadIndex = 0;

ConnectedSockets = malloc(sizeof(DWORD) * NUM_CLIENTS);

memset(ConnectedSockets, 0, sizeof(DWORD) * NUM_CLIENTS);

//SOCKADDR_IN RemoteAddress;

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

ListenReturn = listen(sock, 5);

ok(ListenReturn != SOCKET_ERROR, "error listening on socket");

for (ThreadIndex = 0; ThreadIndex < NUM_CLIENTS; ThreadIndex++)

{

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

ConnectedSocket = accept(sock); // this can be modified to include the address of the remote socket

ok(INVALID_SOCK != (ConnectedSocket = accept(sock)), "error accepting socket"); // this can be modified to include the address of the remote socket

ok(ConnectedSocket != INVALID_SOCKET, "error accepting 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

ServerThreads[ThreadIndex] = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &ProcessConnection, &ConnectedSockets[ThreadIndex], 0, &ServerThreadIDs[ThreadIndex]);

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

free(ConnectedSockets);

trace("blocking server done\n");

}

Line 170

Line 182

ServerThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingClient, &serverPort, 0, &ServerThreadId);

ClientThreads = malloc(sizeof(Handle) * NUM_CLIENTS);

ClientThreads = malloc(sizeof(HANDLE) * NUM_CLIENTS);

memset(ClientThreads, 0, sizeof(Handle) * NUM_CLIENTS)

memset(ClientThreads, 0, sizeof(HANDLE) * NUM_CLIENTS);

ClientThreadIds = malloc(sizeof(DWORD) * NUM_CLIENTS);

memset(ClientThreadIds, 0, sizeof(DWORD) * NUM_CLIENTS);

Legend:

Removed from v.1.9
changed lines
	Added in v.1.11

Rizwan Kassim