Skip to content

Fixed crash bug on client disconnect #1

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
ortluk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed crash bug on client disconnect #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c988ef1
Fixed crash bug on client disconnect
ortluk Apr 8, 2018
cad13a3
Update server.cpp
ortluk Apr 26, 2018
c28fb62
Update server.cpp
ortluk Apr 26, 2018
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
20 changes: 17 additions & 3 deletions src/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ bool Server::Connect(int port)
bool Server::PollSockets()
{
static struct timeval tv;

Socket* sclose = NULL;
// copy the permanent descriptor set
memcpy(&rSet, &fSet, sizeof(fd_set));

Expand All @@ -92,13 +92,27 @@ bool Server::PollSockets()
for (Socket* sock: socketList)
{

// if previous socket marked for close, then close it
if (sclose)
{
CloseSocket(sclose);
sclose = NULL; //reset close pointer
}
// attempt to read from this socket if pending incoming data
if (FD_ISSET(sock->GetControl(), &rSet))
{

// if read fails, close the connection
// if read fails, close the connection, after iterater advances
if (sock->Read() == false)
CloseSocket(sock);
{
if(sock == socketList.back())
{
CloseSocket(sock);
}
else
{
sclose = sock;
}
}
}

Expand Down