Skip to content

fix: avoid getting 0 馃拃 #35

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vantavoids merged 1 commit into from
Jan 30, 2026
Merged

fix: avoid getting 0 馃拃 #35

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
1 change: 1 addition & 0 deletions incs/core/Server.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class Server : public IServer
std::map< int, IClient* > m_clients;
std::map< std::string, IClient* > m_clientsByNick;
std::map< std::string, IChannel* > m_channels;
std::set< int > m_pendingDisconnects;

IClient* getClient(int fd);
void onIrcLine(int fd, const std::string& line);
Expand Down
35 changes: 19 additions & 16 deletions srcs/core/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ void Server::deleteChannelIfEmpty(IChannel* channel)
void Server::checkClientTimeouts()
{
std::time_t now = std::time(NULL);
std::vector< int > to_disconnect;

for (std::map< int, IClient* >::iterator it = m_clients.begin(); it != m_clients.end(); ++it)
{
Expand All @@ -60,6 +59,8 @@ void Server::checkClientTimeouts()

if (client_fd == m_listenFd)
continue;
if (m_pendingDisconnects.count(client_fd))
continue;

std::time_t last_ping = client->getLastPingSent();
std::time_t last_activity = client->getLastActivity();
Expand All @@ -70,8 +71,9 @@ void Server::checkClientTimeouts()
<< std::endl;
std::string error_msg = "ERROR :You didn't respond to my ping and that's mean :( "
"Therefore you're gonna die :D\r\n";
send(client_fd, error_msg.c_str(), error_msg.length(), MSG_NOSIGNAL);
to_disconnect.push_back(client_fd);
client->getBuffer().appendWrite(error_msg);
m_sm->modifySocket(client_fd, EPOLLIN | EPOLLOUT);
m_pendingDisconnects.insert(client_fd);
continue;
}
else if (last_ping == 0 && (now - last_activity) > PING_TIMEOUT)
Expand All @@ -85,9 +87,6 @@ void Server::checkClientTimeouts()
m_sm->modifySocket(client_fd, EPOLLIN | EPOLLOUT);
}
}

for (size_t i = 0; i < to_disconnect.size(); i++)
disconnectClient(to_disconnect[i]);
}

IChannel* Server::createChannel(const std::string& name, IClient* creator)
Expand Down Expand Up @@ -188,15 +187,13 @@ void Server::onIrcLine(int fd, const std::string& line)

static void setNonBlocking(int fd)
{
int flags = fcntl(fd, F_GETFL, 0);
if (flags == -1)
throw std::runtime_error("Function fcntl with command F_GETFL failed\n");
if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1)
if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1)
throw std::runtime_error("Function fcntl with command F_SETFL failed\n");
}

void Server::disconnectClient(int fd)
{
m_pendingDisconnects.erase(fd);
try
{
m_sm->removeSocket(fd);
Expand Down Expand Up @@ -238,6 +235,11 @@ void Server::writeClientsData(int fd)
const std::string& out = client->getBuffer().getWriteBuffer();
if (out.empty())
{
if (m_pendingDisconnects.count(fd))
{
disconnectClient(fd);
return;
}
m_sm->modifySocket(fd, EPOLLIN);
return;
}
Expand All @@ -248,7 +250,14 @@ void Server::writeClientsData(int fd)
{
client->getBuffer().consumeWriteBuffer((size_t)sent);
if (client->getBuffer().getWriteBuffer().empty())
{
if (m_pendingDisconnects.count(fd))
{
disconnectClient(fd);
return;
}
m_sm->modifySocket(fd, EPOLLIN);
}
else
m_sm->modifySocket(fd, EPOLLIN | EPOLLOUT);
}
Expand Down Expand Up @@ -451,12 +460,6 @@ Server::~Server()
LOG_NOTICE << "Cleaning up my stuff" << std::endl;
for (std::map< int, IClient* >::iterator it = m_clients.begin(); it != m_clients.end(); it++)
{
if (it->first != m_listenFd)
{
std::string goodbye =
"ERROR :Server shutting down. Say goodbye. (sike it's too late :p)\r\n";
send(it->first, goodbye.c_str(), goodbye.length(), MSG_NOSIGNAL);
}
close(it->first);
delete (it->second);
}
Expand Down