RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

LibC netdb: Requested Changes

Browse source 
fix all requested changes including:

- remove explicit vector initialization
- change keep_service_file_open to boolean
- closing service file on seek error
- change C level char allocation to use ByteBuffer instead
- simplified getservby* loops to a single loop
- change fill_getserv_buffers return to early-return style
This commit is contained in:
Read H 2020-04-16 09:24:51 -04:00 • committed by Andreas Kling
parent 844e5faf84
commit 1f4e3dd073
1 changed files with 33 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

91
Libraries/LibC/netdb.cpp
View file

@ -25,6 +25,7 @@
*/ */
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/ByteBuffer.h>
#include <AK/ScopeGuard.h> #include <AK/ScopeGuard.h>
#include <AK/String.h> #include <AK/String.h>
#include <Kernel/Net/IPv4.h> #include <Kernel/Net/IPv4.h>
@ -56,9 +57,9 @@ static servent __getserv_buffer;
static char __getserv_name_buffer[512]; static char __getserv_name_buffer[512];
static char __getserv_protocol_buffer[10]; static char __getserv_protocol_buffer[10];
static int __getserv_port_buffer; static int __getserv_port_buffer;
static Vector<String> __getserv_alias_list_buffer = Vector<String>(); static Vector<ByteBuffer> __getserv_alias_list_buffer;
static Vector<char*> __getserv_alias_list = Vector<char*>(); static Vector<char*> __getserv_alias_list;
static int keep_service_file_open = 0; static bool keep_service_file_open = false;
static ssize_t service_file_offset = 0; static ssize_t service_file_offset = 0;
static int connect_to_lookup_server() static int connect_to_lookup_server()
@ -226,6 +227,7 @@ struct servent* getservent()
if (fseek(services_file, service_file_offset, SEEK_SET) != 0) { if (fseek(services_file, service_file_offset, SEEK_SET) != 0) {
perror("error seeking file"); perror("error seeking file");
fclose(services_file);
return nullptr; return nullptr;
} }
char* line = nullptr; char* line = nullptr;
@ -254,33 +256,18 @@ struct servent* getservent()
} }
servent* service_entry = nullptr; servent* service_entry = nullptr;
if (fill_getserv_buffers(line, read)) { if (!fill_getserv_buffers(line, read))
__getserv_buffer.s_name = __getserv_name_buffer; return nullptr;
__getserv_buffer.s_port = __getserv_port_buffer;
__getserv_buffer.s_proto = __getserv_protocol_buffer;
//freeing any previous alias data __getserv_buffer.s_name = __getserv_name_buffer;
for (size_t i = 0; i < __getserv_alias_list.size(); i++) { __getserv_buffer.s_port = __getserv_port_buffer;
free(__getserv_alias_list[i]); __getserv_buffer.s_proto = __getserv_protocol_buffer;
}
__getserv_alias_list.clear();
size_t alias_list_size = __getserv_alias_list_buffer.size();
if (alias_list_size > 0) { for (auto& alias : __getserv_alias_list_buffer) {
for (size_t i = 0; i < alias_list_size; i++) { __getserv_alias_list.append((char*)alias.data());
//Can't get non-const access to underlying String data, must duplicate to conform with servent member requirements
char* alias = strdup(__getserv_alias_list_buffer[i].characters());
if (alias == nullptr) {
perror("error allocating space for alias");
return nullptr;
}
__getserv_alias_list.append(alias);
}
}
__getserv_buffer.s_aliases = __getserv_alias_list.data();
service_entry = &__getserv_buffer;
} }
__getserv_buffer.s_aliases = __getserv_alias_list.data();
service_entry = &__getserv_buffer;
if (!keep_service_file_open) { if (!keep_service_file_open) {
endservent(); endservent();
@ -289,7 +276,7 @@ struct servent* getservent()
} }
struct servent* getservbyname(const char* name, const char* protocol) struct servent* getservbyname(const char* name, const char* protocol)
{ {
int previous_file_open_setting = keep_service_file_open; bool previous_file_open_setting = keep_service_file_open;
setservent(1); setservent(1);
struct servent* current_service = nullptr; struct servent* current_service = nullptr;
auto service_file_handler = ScopeGuard([previous_file_open_setting] { auto service_file_handler = ScopeGuard([previous_file_open_setting] {
@ -298,27 +285,21 @@ struct servent* getservbyname(const char* name, const char* protocol)
} }
}); });
if (!protocol) { while (true) {
do { current_service = getservent();
current_service = getservent(); if (current_service == nullptr)
if (!current_service) { break;
return nullptr; else if (!protocol && strcmp(current_service->s_name, name) == 0)
} break;
} while (strcmp(current_service->s_name, name) != 0); else if (strcmp(current_service->s_name, name) == 0 && strcmp(current_service->s_proto, protocol) == 0)
} else { break;
do {
current_service = getservent();
if (!current_service) {
return nullptr;
}
} while (!(strcmp(current_service->s_name, name) == 0 && strcmp(current_service->s_proto, protocol) == 0));
} }
return current_service; return current_service;
} }
struct servent* getservbyport(int port, const char* protocol) struct servent* getservbyport(int port, const char* protocol)
{ {
int previous_file_open_setting = keep_service_file_open; bool previous_file_open_setting = keep_service_file_open;
setservent(1); setservent(1);
struct servent* current_service = nullptr; struct servent* current_service = nullptr;
auto service_file_handler = ScopeGuard([previous_file_open_setting] { auto service_file_handler = ScopeGuard([previous_file_open_setting] {
@ -326,20 +307,14 @@ struct servent* getservbyport(int port, const char* protocol)
endservent(); endservent();
} }
}); });
if (!protocol) { while (true) {
do { current_service = getservent();
current_service = getservent(); if (current_service == nullptr)
if (!current_service) { break;
return nullptr; else if (!protocol && current_service->s_port == port)
} break;
} while (current_service->s_port != port); else if (current_service->s_port == port && (strcmp(current_service->s_proto, protocol) == 0))
} else { break;
do {
current_service = getservent();
if (!current_service) {
return nullptr;
}
} while (!(current_service->s_port == port && (strcmp(current_service->s_proto, protocol) == 0)));
} }
return current_service; return current_service;
@ -420,7 +395,7 @@ static bool fill_getserv_buffers(char* line, ssize_t read)
if (split_line[i].starts_with('#')) { if (split_line[i].starts_with('#')) {
break; break;
} }
__getserv_alias_list_buffer.append(split_line[i]); __getserv_alias_list_buffer.append(split_line[i].to_byte_buffer());
} }
} }