Skip to content

add a CLI for clients #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

add a CLI for clients #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed Client
View file
Open in desktop
Binary file not shown.
Binary file removed Server
View file
Open in desktop
Binary file not shown.
Binary file removed a.out
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ int main() {
break;
} else {
buffer[bytes_received] = '\0';
cout<<"Received message: "<<buffer<<endl;
cout<<buffer<<endl;
// cout<<"\n";
}
}
}
Expand Down
29 changes: 23 additions & 6 deletions server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
#include <string.h>
#include <sys/select.h>
#include <vector>
#include <ctime>
#include <cstdio>
#include <cstring>

using namespace std;

Expand Down Expand Up @@ -36,7 +39,7 @@ class Client
{
name = s;
}
void send_message(char* msg);
void send_message(char* msg, string nam);
void handle_commands(char* cmd, int fd);
void leave_client();
};
Expand Down Expand Up @@ -116,9 +119,14 @@ void trim_buffer(char *msg, int length)
}
}

void Client::send_message(char* msg)
void Client::send_message(char* msg, string nam)
{
sprintf(msg, "%s\n", msg);
std::time_t now = std::time(nullptr);
char timestamp[20];
std::strftime(timestamp, sizeof(timestamp), "%H:%M:%S", std::localtime(&now));

char formatted_msg[BUFFER_SIZE];
std::sprintf(formatted_msg, "\n%s at %s : %s\n", nam.c_str(),timestamp, msg);
for(int i = 0; i<MAX_CLIENTS; i++)
{
if(clients_fd[i] == fd || clients_fd[i] == 0)
Expand All @@ -127,7 +135,7 @@ void Client::send_message(char* msg)
}
else
{
write(clients_fd[i], msg, strlen(msg));
write(clients_fd[i], formatted_msg, strlen(formatted_msg));
}
}
}
Expand Down Expand Up @@ -357,6 +365,15 @@ int main(int argc, char* argv[])
cout<<Client_pointers[i].uid;
}
bzero(buffer, BUFFER_SIZE);
string banner=R"(
██╗ ██╗███████╗██╗ ██████╗ ██████╗ ███╗ ███╗███████╗
██║ ██║██╔════╝██║ ██╔════╝██╔═══██╗████╗ ████║██╔════╝
██║ █╗ ██║█████╗ ██║ ██║ ██║ ██║██╔████╔██║█████╗
██║███╗██║██╔══╝ ██║ ██║ ██║ ██║██║╚██╔╝██║██╔══╝
╚███╔███╔╝███████╗███████╗╚██████╗╚██████╔╝██║ ╚═╝ ██║███████╗
╚══╝╚══╝ ╚══════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝
)";
write(new_client,banner.c_str(), strlen(banner.c_str()));
}
else
{
Expand All @@ -371,7 +388,7 @@ int main(int argc, char* argv[])
int iter = search_by_fd(clients_fd[i]);
Client* cli;
cli = &Client_pointers[iter];

if(iter == Client_pointers.size())
{
cout<<"error fd not found\n";
Expand All @@ -398,7 +415,7 @@ int main(int argc, char* argv[])
}
else
{
cli->send_message(buffer);
cli->send_message(buffer,cli->name);
bzero(buffer, BUFFER_SIZE);
break;
}
Expand Down