Skip to content
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

Use helper function from aws-c-common to read "special files" #100

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Use helper function from aws-c-common to read "special files" #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75af2b0
Use aws_byte_buf_init_from_special_file()
graebm Oct 12, 2023
cb76b4a
function was renamed
graebm Oct 12, 2023
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
46 changes: 2 additions & 44 deletions source/linux/network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,48 +105,6 @@ void get_network_total_delta(
delta->packets_out = curr_total->packets_out - prev_total->packets_out;
}

int read_proc_net_from_file(
struct aws_byte_buf *out_buf,
struct aws_allocator *allocator,
size_t size_hint,
const char *filename) {
AWS_ZERO_STRUCT(*out_buf);
int return_value = AWS_OP_ERR;

if (aws_byte_buf_init(out_buf, allocator, size_hint)) {
return aws_raise_error(aws_last_error());
}

FILE *fp = fopen(filename, "r");
if (fp) {
size_t read = fread(out_buf->buffer, 1, out_buf->capacity, fp);
out_buf->len += read;
while (read == size_hint) {
int aws_error = 0;
if (AWS_OP_SUCCESS != (aws_error = aws_byte_buf_reserve_relative(out_buf, size_hint))) {
return_value = aws_error;
goto cleanup;
}
read = fread(out_buf->buffer + out_buf->len, 1, size_hint, fp);
size_hint += size_hint;
}
if (ferror(fp)) {
return_value = aws_translate_and_raise_io_error(errno);
goto cleanup;
}
return_value = AWS_OP_SUCCESS;
}

cleanup:
fclose(fp);
if (AWS_OP_SUCCESS != return_value) {
aws_byte_buf_clean_up_secure(out_buf);
return aws_raise_error(return_value);
}

return return_value;
}

int get_net_connections_from_proc_buf(
struct aws_array_list *net_conns,
struct aws_allocator *allocator,
Expand Down Expand Up @@ -282,7 +240,7 @@ int get_network_connections(
AWS_ZERO_STRUCT(net_udp);
int return_code = AWS_OP_ERR;

if (read_proc_net_from_file(&net_tcp, allocator, s_proc_net_tcp_size_hint, "/proc/net/tcp")) {
if (aws_byte_buf_init_from_file_with_size_hint(&net_tcp, allocator, "/proc/net/tcp", s_proc_net_tcp_size_hint)) {
AWS_LOGF_ERROR(
AWS_LS_IOTDEVICE_NETWORK_CONFIG,
"id=%p: Failed to retrieve network configuration: %s",
Expand All @@ -292,7 +250,7 @@ int get_network_connections(
}
s_proc_net_tcp_size_hint = net_tcp.len * PROC_NET_HINT_FACTOR;

if (read_proc_net_from_file(&net_udp, allocator, s_proc_net_udp_size_hint, "/proc/net/udp")) {
if (aws_byte_buf_init_from_file_with_size_hint(&net_udp, allocator, "/proc/net/udp", s_proc_net_udp_size_hint)) {
AWS_LOGF_ERROR(
AWS_LS_IOTDEVICE_NETWORK_CONFIG,
"id=%p: Failed to retrieve network configuration: %s",
Expand Down