version 1.28, 2005/02/24 22:20:13
|
version 1.29, 2005/02/24 23:33:35
|
|
|
DWORD ID; | DWORD ID; |
}; | }; |
| |
struct ServerInfo { |
struct BlockingServerConnection { |
HANDLE threadHandle; |
struct ThreadInfo serverThread; |
DWORD threadID; |
|
SOCKET connectedSocket; // socket to communicate with client | SOCKET connectedSocket; // socket to communicate with client |
SOCKADDR_IN clientAddr; // client info | SOCKADDR_IN clientAddr; // client info |
}; | }; |
|
|
static void BlockingClient(int *serverPort); | static void BlockingClient(int *serverPort); |
static int BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr); | static int BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr); |
static void BlockingServer(SOCKET *sock); | static void BlockingServer(SOCKET *sock); |
static void BlockingServer_ProcessConnection(struct ServerInfo *t); |
static struct BlockingServerConnection * BlockingServerConnection_New(SOCKET sock, SOCKADDR_IN clientAddr); |
|
static void BlockingServerConnection_Run(struct BlockingServerConnection *t); |
|
static void BlockingServerConnection_Delete(struct BlockingServerConnection *c); |
| |
static void BlockingClient(int *serverPort) | static void BlockingClient(int *serverPort) |
{ | { |
|
|
} | } |
} | } |
| |
// BlockingServer_Init creates socket sock of type type and returns assigned port number in addr. |
|
// returns server port number |
|
static int BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr) | static int BlockingServer_Init(int type, SOCKET *sock, SOCKADDR_IN *addr) |
{ | { |
|
// BlockingServer_Init creates socket sock of type type and returns assigned port number in addr. |
|
// returns server port number |
|
|
SOCKADDR_IN tmpAddr; | SOCKADDR_IN tmpAddr; |
int bindOK; | int bindOK; |
int listenReturn; | int listenReturn; |
|
|
| |
static void BlockingServer(SOCKET *sock) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once | static void BlockingServer(SOCKET *sock) // listens for incoming connections and accepts up to NUM_CLIENTS connections at once |
{ | { |
struct ServerInfo *threads; |
struct BlockingServerConnection *connections[NUM_CLIENTS]; |
int threadIndex = 0; |
int connIndex = 0; |
|
SOCKET tmpSock; |
// allocate enough space to keep track of NUM_CLIENTS connections |
SOCKADDR_IN tmpSockAddr; |
threads = malloc(sizeof(struct ServerInfo) * NUM_CLIENTS); |
|
memset(threads, 0, sizeof(struct ServerInfo) * NUM_CLIENTS); |
|
| |
// we require one connection from each client thread | // we require one connection from each client thread |
for (threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) { |
for (connIndex = 0; connIndex < NUM_CLIENTS; connIndex++) { |
// accept connection | // accept connection |
threads[threadIndex].connectedSocket = accept(*sock, (SOCKADDR *) &threads[threadIndex].clientAddr, &sizeofSOCKADDR_IN); // this can be modified to include the address of the remote socket |
tmpSock = accept(*sock, (SOCKADDR *) &tmpSockAddr, &sizeofSOCKADDR_IN); |
ok(threads[threadIndex].connectedSocket != INVALID_SOCKET, "error accepting socket\n"); |
ok(tmpSock != INVALID_SOCKET, "error accepting socket\n"); |
| |
// spawn thread to handle sending data |
// handle new connection |
threads[threadIndex].threadHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServer_ProcessConnection, &threads[threadIndex], 0, &threads[threadIndex].threadID); |
connections[connIndex] = BlockingServerConnection_New(tmpSock, tmpSockAddr); |
} | } |
| |
// wait for all clients to receive data before cleaning up |
// clean up connections |
for(threadIndex = 0; threadIndex < NUM_CLIENTS; threadIndex++) { |
for(connIndex = 0; connIndex < NUM_CLIENTS; connIndex++) { |
WaitForSingleObject(threads[threadIndex].threadHandle, INFINITE); |
BlockingServerConnection_Delete(connections[connIndex]); |
} | } |
|
} |
|
|
|
static struct BlockingServerConnection * BlockingServerConnection_New(SOCKET sock, SOCKADDR_IN clientAddr) |
|
{ |
|
struct BlockingServerConnection *connection; |
|
connection = malloc(sizeof(struct BlockingServerConnection)); |
|
memset(connection, 0, sizeof(struct BlockingServerConnection)); |
|
|
|
connection->connectedSocket = sock; |
|
connection->clientAddr = clientAddr; |
|
|
|
// spawn thread to handle sending data |
|
connection->serverThread.Handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) &BlockingServerConnection_Run, connection, 0, &connection->serverThread.ID); |
| |
free(threads); |
return connection; |
} | } |
| |
static void BlockingServer_ProcessConnection(struct ServerInfo *t) |
static void BlockingServerConnection_Run(struct BlockingServerConnection *connection) |
{ | { |
// this will handle all connections to the server, it's in its own function to allow for multithreading | // this will handle all connections to the server, it's in its own function to allow for multithreading |
int bClosed; | int bClosed; |
|
|
| |
// loop and send data | // loop and send data |
while( totCharsSent < TEST_DATA_SIZE ) { | while( totCharsSent < TEST_DATA_SIZE ) { |
numCharsSent = send(t->connectedSocket, gTestData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0); |
numCharsSent = send(connection->connectedSocket, gTestData+totCharsSent, (totCharsSent + charsPerSend <= TEST_DATA_SIZE) ? charsPerSend : TEST_DATA_SIZE - totCharsSent, 0); |
ok( numCharsSent != SOCKET_ERROR, "socket error\n" ); | ok( numCharsSent != SOCKET_ERROR, "socket error\n" ); |
| |
// pass if send buffer is full | // pass if send buffer is full |
|
|
totCharsSent += numCharsSent; | totCharsSent += numCharsSent; |
} | } |
| |
bClosed = !closesocket(t->connectedSocket); |
bClosed = !closesocket(connection->connectedSocket); |
ok(bClosed,"Error closing socket\n"); | ok(bClosed,"Error closing socket\n"); |
} | } |
| |
|
static void BlockingServerConnection_Delete(struct BlockingServerConnection *c) |
|
{ |
|
// wait for client to receive data before cleaning up |
|
WaitForSingleObject(c->serverThread.Handle, INFINITE); |
|
|
|
free(c); |
|
} |
|
|
static void test_ClientServerBlocking_1(void) | static void test_ClientServerBlocking_1(void) |
{ | { |
struct ThreadInfo serverThread; | struct ThreadInfo serverThread; |
|
struct ThreadInfo *clientThreads; |
DWORD waitStatus; | DWORD waitStatus; |
SOCKET sock; | SOCKET sock; |
SOCKADDR_IN server; | SOCKADDR_IN server; |
int serverPort; | int serverPort; |
int threadIndex = 0; | int threadIndex = 0; |
struct ThreadInfo *clientThreads; |
|
| |
// create socket, bind server and start listening | // create socket, bind server and start listening |
serverPort = BlockingServer_Init(SOCK_STREAM, &sock, &server); | serverPort = BlockingServer_Init(SOCK_STREAM, &sock, &server); |