adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clients list in file handler is now a vector.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2026-01-10 03:04:51 -05:00
parent 616c871002
commit a93b762110
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dpi/file.cc
+7 -12
View File
@@ -116,7 +116,7 @@ static const char *File_content_type(const char *filename);
static int DPIBYE = 0; static int DPIBYE = 0;
static int OLD_STYLE = 0; static int OLD_STYLE = 0;
/* A list for the clients we are serving */ /* A list for the clients we are serving */
static Dlist *Clients; static std::vector< std::unique_ptr< ClientInfo > > Clients;
/* Set of filedescriptors we're working on */ /* Set of filedescriptors we're working on */
fd_set read_set, write_set; fd_set read_set, write_set;
@@ -894,9 +894,9 @@ static ClientInfo *File_add_client(int sock_fd)
new_client->flags = FILE_READ; new_client->flags = FILE_READ;
new_client->old_style = OLD_STYLE; new_client->old_style = OLD_STYLE;
dList_append(Clients, new_client.get()); Clients.push_back( std::move( new_client ) );
return new_client.release(); return Clients.back().get();
} }
/* /*
@@ -904,9 +904,7 @@ static ClientInfo *File_add_client(int sock_fd)
*/ */
static void File_remove_client(ClientInfo *client) static void File_remove_client(ClientInfo *client)
{ {
dList_remove(Clients, (void *)client); Clients.erase( std::find_if( begin( Clients ), end( Clients ), [client] ( const auto &c ) { return client == c.get(); } ) );
delete client;
} }
ClientInfo::~ClientInfo() ClientInfo::~ClientInfo()
@@ -996,7 +994,7 @@ static void File_serve_clients(void)
int i, f_read, f_write; int i, f_read, f_write;
ClientInfo *client; ClientInfo *client;
for (i = 0; (client = reinterpret_cast< ClientInfo * >( dList_nth_data(Clients, i) )); ++i) { for (i = 0; i < Clients.size() and ( client = Clients.at( i ).get() ); ++i) {
f_read = FD_ISSET(client->sh->fd_in, &read_set); f_read = FD_ISSET(client->sh->fd_in, &read_set);
f_write = FD_ISSET(client->sh->fd_out, &write_set); f_write = FD_ISSET(client->sh->fd_out, &write_set);
if (!f_read && !f_write) if (!f_read && !f_write)
@@ -1025,13 +1023,13 @@ static int File_check_fds(uint_t seconds)
FD_ZERO (&read_set); FD_ZERO (&read_set);
FD_ZERO (&write_set); FD_ZERO (&write_set);
FD_SET (STDIN_FILENO, &read_set); FD_SET (STDIN_FILENO, &read_set);
for (i = 0; (client = reinterpret_cast< ClientInfo * >( dList_nth_data(Clients, i) )); ++i) { for (i = 0; i < Clients.size() and ( client = Clients.at( i ).get() ); ++i) {
if (client->flags & FILE_READ) if (client->flags & FILE_READ)
FD_SET (client->sh->fd_in, &read_set); FD_SET (client->sh->fd_in, &read_set);
if (client->flags & FILE_WRITE) if (client->flags & FILE_WRITE)
FD_SET (client->sh->fd_out, &write_set); FD_SET (client->sh->fd_out, &write_set);
} }
_MSG("Watching %d fds\n", dList_length(Clients) + 1); _MSG("Watching %d fds\n", Clients.size() + 1);
/* Initialize the timeout data structure. */ /* Initialize the timeout data structure. */
timeout.tv_sec = seconds; timeout.tv_sec = seconds;
@@ -1080,9 +1078,6 @@ int main(void)
/* Set STDIN socket nonblocking (to ensure accept() never blocks) */ /* Set STDIN socket nonblocking (to ensure accept() never blocks) */
fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK | fcntl(STDIN_FILENO, F_GETFL)); fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK | fcntl(STDIN_FILENO, F_GETFL));
/* initialize Clients list */
Clients = dList_new(512);
/* some OSes may need this... */ /* some OSes may need this... */
sin_sz = sizeof(sin); sin_sz = sizeof(sin);