cdez/CS460-Projects
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished? assignment 2. Needs to be tested with multiple clients, but also for the original client connection.

Browse source
This commit is contained in:
Charles Descamps 2025-02-19 19:33:45 -07:00
parent dbb1883420
commit 3d8ce59327
2 changed files with 116 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

175
echoserver/echoserver.c
View file

@ -34,10 +34,9 @@ int main(int argc, char **argv)
} }
// use the setsockopt function to make the socket accept different configurations // use the setsockopt function to make the socket accept different configurations
// allow for the reuse of the address/bind. // allow for the reuse of the address/bind.
// setsockopt(socketEchoFD, SOL_SOCKET, SO_REUSEADDR, &reuseAddrOpt, sizeof(reuseAddrOpt)); setsockopt(socketEchoFD, SOL_SOCKET, SO_REUSEADDR, &reuseAddrOpt, sizeof(reuseAddrOpt));
// also need to set the socket to keepalive using setsockopt // also need to set the socket to keepalive using setsockopt
setsockopt(socketEchoFD, SOL_SOCKET, SO_KEEPALIVE, &keepAliveOpt, sizeof(keepAliveOpt)); setsockopt(socketEchoFD, SOL_SOCKET, SO_KEEPALIVE, &keepAliveOpt, sizeof(keepAliveOpt));
// CODE HERE
// bind the TCP socket to port 8888 / ECHOPORT // bind the TCP socket to port 8888 / ECHOPORT
serverAddr.sin_family = AF_INET; serverAddr.sin_family = AF_INET;
serverAddr.sin_addr.s_addr = INADDR_ANY; serverAddr.sin_addr.s_addr = INADDR_ANY;
@ -48,76 +47,130 @@ int main(int argc, char **argv)
printf("Unable to bind the socket to the port or address.\n Is either in use?"); printf("Unable to bind the socket to the port or address.\n Is either in use?");
return -1; return -1;
} }
// use fnctl to set the non-blocking flag for the socket
// CODE HERE
fcntl(socketEchoFD, F_SETFL, O_NONBLOCK);
// the server will now accept client connections by listening. // the server will now accept client connections by listening.
listen(socketEchoFD, MAX_CONNECT_QUEUE); listen(socketEchoFD, MAX_CONNECT_QUEUE);
// create a file descriptor set, to keep track of the sockets in use using fd_set and FD_ZERO?
// CODE HERE
fd_set socketList;
FD_ZERO(&socketList);
// add the socketEchoFD to the file descriptor set using fd_set
// CODE HERE
FD_SET(socketEchoFD, &socketList);
// somehow have a max file descriptor, set this?
// CODE HERE
int maxFD = socketEchoFD;
// while loop that will continue to listen for messages from clients. // while loop that will continue to listen for messages from clients.
printf("Echoserver listening on port: %d\n", ECHOPORT); printf("Echoserver listening on port: %d\n", ECHOPORT);
// while(quitFlag)
// {
// int clientAddrLen;
// int receivedDataLen;
// // grab the data from the client
// receivedDataLen = recvfrom(socketEchoFD, message, BUFFER_SIZE, MSG_WAITALL, &clientAddr, &clientAddrLen);
// message[receivedDataLen] = '\0';
// // if "01189998811991197253\r\n" is received, then close the server.
// if(strcmp(message, "01189998811991197253\n") == 0 || strcmp(message, "01189998811991197253\r\n") == 0)
// {
// // if the server recv'd the close command, then close the server.
// printf("\nServer received close.\n");
// quitFlag = false;
// }
// // otherwise, repeat/echo back the message to the client.
// // setup the reply message
// char reply[BUFFER_SIZE];
// // add the current time to the reply
// sprintf(reply, "%d", time(NULL));
// // send the reply to the requestee
// sendto(socketEchoFD, (const char *)reply, strlen(reply), 0, (const struct sockaddr *)&clientAddr, clientAddrLen);
// // log the time command recv'd
// printf("\nServer received time. Replied with: %d\n", time(NULL));
// }
while (quitFlag) while (quitFlag)
{ {
// grab the size of the listened clients // somehow use the set of file descriptor sockets here
clientSize = sizeof(clientAddr); // CODE HERE
// grab the client's socket information // use the select() function here to check the set of sockets
clientEchoFD = accept(socketEchoFD, &clientAddr, &clientSize); // CODE HERE
// check to see if the client socket is actually connected int selectedFD = select(maxFD+1, &socketList, NULL, NULL, NULL);
if(clientEchoFD == -1) // check to make sure select() didn't error out.
// CODE HERE
if(selectedFD == -1)
{ {
printf("\nUnable to accept from the client.\n"); //
printf("\nUnable to select socket to listen to.\n");
return -1; return -1;
} }
else // for loop that loops up to the max file descriptor.
for(int fileIter = 0; fileIter < maxFD; fileIter++)
{ {
printf("\nConnection received from client.\n"); // check to see if the file descriptor is in the set of sockets using FD_ISSET()
if(FD_ISSET(fileIter, &socketList))
{
// if the server socket is being written to/read from,
if(fileIter == socketEchoFD)
{
// create a client socket using accept
clientSize = sizeof(clientAddr);
clientEchoFD = accept(socketEchoFD, &clientAddr, &clientSize);
// check to see if the client socket is connected (-1)
if(clientEchoFD == -1)
{
printf("\nCould not connect the client to a socket.\n");
return -1;
}
else
{
// set the non blocking flag using fnctl
fcntl(clientEchoFD, F_SETFL, O_NONBLOCK);
// add the client socket to the set of file descriptor sockets
FD_SET(clientEchoFD, &socketList);
// check to see if the new socket FD is greater than the current max (clientSocket > maxFD)
if(clientEchoFD > maxFD)
{
// if it is, set the new max.
maxFD = clientEchoFD;
}
}
}
// if the client socket(s) are being written to/read from,
else
{
// grab the size of the listening client (not needed?)
// grab the client's socket information (not needed?)
// check to see if the client socket is actually connected (not needed?)
// grab the data from the client, save to message.
messageBytes = recv(fileIter, message, BUFFER_SIZE, 0);
// make sure that the connection is still open before attempting to send.
if(messageBytes <= 0)
{
// if it is not open, close the socket and remove the socket from the socket list using FD_CLR()
close(fileIter);
FD_CLR(fileIter, &socketList);
printf("\nClient has closed connection.\n");
}
else
{
// if it is open, send the message back to the client over the client socket
send(fileIter, message, sizeof(message), 0);
printf("\nMessage has been sent back to client.\n");
}
}
}
} }
// grab the data from the client, save to message.
messageBytes = recv(clientEchoFD, message, BUFFER_SIZE, 0); // OLD CODE HERE
// if "01189998811991197253\r\n" is received, then close the server. // // grab the size of the listened clients
if (strcmp(message, "01189998811991197253\n") == 0 || strcmp(message, "01189998811991197253\r\n") == 0) // clientSize = sizeof(clientAddr);
{ // // grab the client's socket information
// if the server recv'd the close command, then close the server. // clientEchoFD = accept(socketEchoFD, &clientAddr, &clientSize);
printf("\nServer received close.\n"); // // check to see if the client socket is actually connected
quitFlag = false; // if(clientEchoFD == -1)
} // {
// otherwise, repeat/echo back the message to the client. // printf("\nUnable to accept from the client.\n");
// NEW CODE HERE // return -1;
// make sure that the connection is still open before attempting to send. // }
if(messageBytes <= 0) // else
{ // {
printf("\nERROR\n"); // printf("\nConnection received from client.\n");
// this means that the connection is closed, or had another error. // }
return -1; // // grab the data from the client, save to message.
} // messageBytes = recv(clientEchoFD, message, BUFFER_SIZE, 0);
else // // otherwise, repeat/echo back the message to the client.
{ // // make sure that the connection is still open before attempting to send.
// send back the message over the clientEcho socket. // if(messageBytes <= 0)
send(clientEchoFD, message, sizeof(message), 0); // {
printf("\nMessage has been sent back to client.\n"); // printf("\nERROR\n");
} // // this means that the connection is closed, or had another error.
// close the accepted listening socket since it is no longer needed. // return -1;
close(clientEchoFD); // }
// else
// {
// // send back the message over the clientEcho socket.
// send(clientEchoFD, message, sizeof(message), 0);
// printf("\nMessage has been sent back to client.\n");
// }
// // close the accepted listening socket since it is no longer needed.
// close(clientEchoFD);
// END OLD CODE HERE
} }
// close the socket // close the socket
close(socketEchoFD); close(socketEchoFD);

2
echoserver/echoserver.h
View file

@ -9,12 +9,14 @@
#include <stdbool.h> #include <stdbool.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/select.h>
#include <netdb.h> #include <netdb.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h>
// data structures // data structures