improve visual clarity
This commit is contained in:
21
server.cc
21
server.cc
@@ -26,7 +26,7 @@ waitForClient(void *argss)
|
||||
clientSocketDescriptor =
|
||||
accept(serverSocketDescriptor, (sockaddr *)&args->newSockAddr, &args->newSockAddrSize);
|
||||
if (clientSocketDescriptor >= 0) {
|
||||
writeToFile(logFileName, "client connected");
|
||||
writeToFile(logFileName, "SYSTEM: Client connected.");
|
||||
if (linesInFile(logFileName) > LOG_LENGTH)
|
||||
linePos++;
|
||||
displayFile(logFileName, linePos, LOG_LENGTH);
|
||||
@@ -39,17 +39,22 @@ waitForClient(void *argss)
|
||||
void *
|
||||
pollForClient()
|
||||
{
|
||||
char msg[1024];
|
||||
int b;
|
||||
char msg[1024], msgf[1033];
|
||||
|
||||
while (1) {
|
||||
client_message_loop:
|
||||
// receive a message from the client (listen)
|
||||
memset(&msg, 0, sizeof(msg)); // clear the buffer
|
||||
bytesRead += recv(clientSocketDescriptor, (char *)&msg, sizeof(msg), 0);
|
||||
/* receive a message from the client (listen) */
|
||||
memset(&msg, 0, sizeof(msg)); /* clear buffer */
|
||||
b = recv(clientSocketDescriptor, (char *)&msg, sizeof(msg) - 1, 0);
|
||||
msg[b] = '\0';
|
||||
bytesRead += b;
|
||||
|
||||
if (msg[0] == '\0')
|
||||
goto client_message_loop;
|
||||
|
||||
writeToFile(logFileName, msg);
|
||||
snprintf(msgf, sizeof(msgf), "Client: %s", msg);
|
||||
writeToFile(logFileName, msgf);
|
||||
|
||||
if (linesInFile(logFileName) > LOG_LENGTH)
|
||||
linePos++;
|
||||
@@ -91,7 +96,7 @@ setupServer(int port)
|
||||
fprintf(stderr, "Error binding socket to local address!\n");
|
||||
exit(0);
|
||||
}
|
||||
writeToFile(logFileName, "Waiting for a client to connect...");
|
||||
writeToFile(logFileName, "SYSTEM: Waiting for a client to connect...");
|
||||
// listen for up to 5 requests at a time
|
||||
listen(serverSocketDescriptor, 5);
|
||||
// receive a request from client using accept
|
||||
@@ -105,7 +110,7 @@ setupServer(int port)
|
||||
aaa->newSockAddrSize = newSockAddrSize;
|
||||
int rc = pthread_create(&client_wait_thread, nullptr, waitForClient, aaa);
|
||||
pthread_detach(client_wait_thread);
|
||||
writeToFile(logFileName, "Server started successfully");
|
||||
writeToFile(logFileName, "SYSTEM: Server started successfully.");
|
||||
gettimeofday(&start1, NULL);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user