roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-28 21:07:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: do not reallocate Client and fix segfault on iterator

Browse Source
This commit is contained in:
3lswear
2022-02-24 00:05:29 +03:00
parent a6b046a460
commit 6ce3b81f6a
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Server/Server.cpp
View File

@@ -113,7 +113,7 @@ int Server::delete_client(std::map<int, Client *> &client_map, int fd)
delete (client_map[fd]); delete (client_map[fd]);
client_map.erase(fd); client_map.erase(fd);
DBOUT << WARNING << getDebugTime() << OKCYAN DBOUT << WARNING << getDebugTime() << OKCYAN
<< " deleting client " << " completely deleting client "
<< fd << fd
<< ENDL; << ENDL;
return (ret); return (ret);
@@ -132,31 +132,37 @@ int Server::delete_client(std::map<int, Client *> &client_map, int fd)
tmp_fd = new t_tmp_fd; tmp_fd = new t_tmp_fd;
tmp_fd->ip_port = client_map[fd]->getIpPort(); tmp_fd->ip_port = client_map[fd]->getIpPort();
gettimeofday(&tmp_fd->last_modif, NULL); gettimeofday(&tmp_fd->last_modif, NULL);
free_socket[fd] = tmp_fd; vacant_fds[fd] = tmp_fd;
//Удаляю клиента //Удаляю клиента
client_map[fd]->clear(); client_map[fd]->clear();
delete (client_map[fd]); // delete (client_map[fd]);
client_map.erase(fd); client_map[fd]->~Client();
// client_map.erase(fd);
DBOUT << WARNING << getDebugTime() << OKCYAN DBOUT << WARNING << getDebugTime() << OKCYAN
<< " deleting client " << " deleting only client "
<< fd << fd
<< ENDL; << ENDL;
return (ret); return (ret);
} }
} }
int Server::delete_fd(std::map<int, t_tmp_fd *> &map, std::map<int, t_tmp_fd *>::iterator &it)
int Server::delete_fd(std::map<int, t_tmp_fd *> &map,
std::map<int, t_tmp_fd *>::iterator &it,
std::map<int, Client *> &client_map)
{ {
int ret; int ret;
ret = epoll_ctl(_epoll_fd, EPOLL_CTL_DEL, it->first, NULL); ret = epoll_ctl(_epoll_fd, EPOLL_CTL_DEL, it->first, NULL);
// delete map[fd]; // delete map[fd];
delete it->second; delete it->second;
close(it->first);
map.erase(it++);
DBOUT << WARNING << getDebugTime() << OKCYAN DBOUT << WARNING << getDebugTime() << OKCYAN
<< " deleting fd " << " deleting fd "
<< it->first << it->first
<< ENDL; << ENDL;
close(it->first);
// delete (client_map[it->first]);
client_map.erase(it->first);
map.erase(it++);
return (ret); return (ret);
} }
@@ -243,7 +249,7 @@ void Server::run(void)
std::map<int, Client*> client_map; std::map<int, Client*> client_map;
std::map<int, Socket> configurations_map; std::map<int, Socket> configurations_map;
std::map<int, t_tmp_fd *>::iterator free_it; std::map<int, t_tmp_fd *>::iterator fd_it;
unsigned int client_events = EPOLLIN; unsigned int client_events = EPOLLIN;
@@ -287,12 +293,14 @@ void Server::run(void)
} }
else else
{ {
free_it = free_socket.find(fd); fd_it = vacant_fds.find(fd);
if (free_it != free_socket.end()) if (fd_it != vacant_fds.end())
{ {
client_map[fd] = new Client(free_it->second->ip_port); // client_map[fd] = new Client(fd_it->second->ip_port);
delete free_it->second; // DBOUT << "addr of client_map[fd] " << client_map[fd] << ENDL;
free_socket.erase(fd); new (client_map[fd]) Client(fd_it->second->ip_port);
delete fd_it->second;
vacant_fds.erase(fd);
} }
else if (events & EPOLLIN) else if (events & EPOLLIN)
{ {
@@ -300,8 +308,8 @@ void Server::run(void)
if (client_map[fd]->done) if (client_map[fd]->done)
{ {
delete_client(client_map, fd); delete_client(client_map, fd);
std::map<int, t_tmp_fd *>::iterator it = free_socket.find(fd); std::map<int, t_tmp_fd *>::iterator it = vacant_fds.find(fd);
delete_fd(free_socket, it); delete_fd(vacant_fds, it, client_map);
} }
else if (client_map[fd]->readyToSend()) else if (client_map[fd]->readyToSend())
{ {
@@ -327,12 +335,13 @@ void Server::run(void)
} }
} }
} }
free_it = free_socket.begin(); fd_it = vacant_fds.begin();
while (free_it != free_socket.end()) while (fd_it != vacant_fds.end())
{ {
if (TimeToDie(free_it->second->last_modif, LIFE_TIME)) if (TimeToDie(fd_it->second->last_modif, LIFE_TIME))
delete_fd(free_socket, free_it); delete_fd(vacant_fds, fd_it, client_map);
++free_it; else
++fd_it;
} }
} }
DBOUT << RED << "end;" << ENDL; DBOUT << RED << "end;" << ENDL;