RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:24:57 +00:00
Code Issues Activity Actions

Utilities/netstat: Replace uses of JsonObject::get_deprecated()/get_ptr

Browse source
This commit is contained in:
Sam Atkins 2022-12-22 14:28:33 +00:00 • committed by Tim Flynn
parent f14a1da633
commit 39f3a15022
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Userland/Utilities/netstat.cpp
View file

@ -163,16 +163,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Vector<JsonValue> sorted_regions = json.as_array().values();
quick_sort(sorted_regions, [](auto& a, auto& b) {
return a.as_object().get_deprecated("local_port"sv).to_u32() < b.as_object().get_deprecated("local_port"sv).to_u32();
return a.as_object().get_u32("local_port"sv).value_or(0) < b.as_object().get_u32("local_port"sv).value_or(0);
});
for (auto& value : sorted_regions) {
auto& if_object = value.as_object();
auto bytes_in = if_object.get_deprecated("bytes_in"sv).to_deprecated_string();
auto bytes_out = if_object.get_deprecated("bytes_out"sv).to_deprecated_string();
auto bytes_in = if_object.get_deprecated_string("bytes_in"sv).value_or({});
auto bytes_out = if_object.get_deprecated_string("bytes_out"sv).value_or({});
auto peer_address = if_object.get_deprecated("peer_address"sv).to_deprecated_string();
auto peer_address = if_object.get_deprecated_string("peer_address"sv).value_or({});
if (!flag_numeric) {
auto from_string = IPv4Address::from_string(peer_address);
auto addr = from_string.value().to_in_addr_t();
@ -184,9 +184,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto peer_port = if_object.get_deprecated("peer_port"sv).to_deprecated_string();
auto peer_port = if_object.get_deprecated_string("peer_port"sv).value_or({});
if (!flag_numeric) {
auto service = getservbyport(htons(if_object.get_deprecated("peer_port"sv).to_u32()), "tcp");
auto service = getservbyport(htons(if_object.get_u32("peer_port"sv).value_or(0)), "tcp");
if (service != nullptr) {
auto s_name = StringView { service->s_name, strlen(service->s_name) };
if (!s_name.is_empty())
@ -194,7 +194,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto local_address = if_object.get_deprecated("local_address"sv).to_deprecated_string();
auto local_address = if_object.get_deprecated_string("local_address"sv).value_or({});
if (!flag_numeric) {
auto from_string = IPv4Address::from_string(local_address);
auto addr = from_string.value().to_in_addr_t();
@ -206,9 +206,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto local_port = if_object.get_deprecated("local_port"sv).to_deprecated_string();
auto local_port = if_object.get_deprecated_string("local_port"sv).value_or({});
if (!flag_numeric) {
auto service = getservbyport(htons(if_object.get_deprecated("local_port"sv).to_u32()), "tcp");
auto service = getservbyport(htons(if_object.get_u32("local_port"sv).value_or(0)), "tcp");
if (service != nullptr) {
auto s_name = StringView { service->s_name, strlen(service->s_name) };
if (!s_name.is_empty())
@ -216,8 +216,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto state = if_object.get_deprecated("state"sv).to_deprecated_string();
auto origin_pid = (if_object.has("origin_pid"sv)) ? if_object.get_deprecated("origin_pid"sv).to_u32() : -1;
auto state = if_object.get_deprecated_string("state"sv).value_or({});
auto origin_pid = (if_object.has("origin_pid"sv)) ? if_object.get_u32("origin_pid"sv).value_or(0) : -1;
if (!flag_all && ((state == "Listen" && !flag_list) || (state != "Listen" && flag_list)))
continue;
@ -250,13 +250,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Vector<JsonValue> sorted_regions = json.as_array().values();
quick_sort(sorted_regions, [](auto& a, auto& b) {
return a.as_object().get_deprecated("local_port"sv).to_u32() < b.as_object().get_deprecated("local_port"sv).to_u32();
return a.as_object().get_u32("local_port"sv).value_or(0) < b.as_object().get_u32("local_port"sv).value_or(0);
});
for (auto& value : sorted_regions) {
auto& if_object = value.as_object();
auto local_address = if_object.get_deprecated("local_address"sv).to_deprecated_string();
auto local_address = if_object.get_deprecated_string("local_address"sv).value_or({});
if (!flag_numeric) {
auto from_string = IPv4Address::from_string(local_address);
auto addr = from_string.value().to_in_addr_t();
@ -268,9 +268,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto local_port = if_object.get_deprecated("local_port"sv).to_deprecated_string();
auto local_port = if_object.get_deprecated_string("local_port"sv).value_or({});
if (!flag_numeric) {
auto service = getservbyport(htons(if_object.get_deprecated("local_port"sv).to_u32()), "udp");
auto service = getservbyport(htons(if_object.get_u32("local_port"sv).value_or(0)), "udp");
if (service != nullptr) {
auto s_name = StringView { service->s_name, strlen(service->s_name) };
if (!s_name.is_empty())
@ -278,7 +278,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto peer_address = if_object.get_deprecated("peer_address"sv).to_deprecated_string();
auto peer_address = if_object.get_deprecated_string("peer_address"sv).value_or({});
if (!flag_numeric) {
auto from_string = IPv4Address::from_string(peer_address);
auto addr = from_string.value().to_in_addr_t();
@ -290,9 +290,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto peer_port = if_object.get_deprecated("peer_port"sv).to_deprecated_string();
auto peer_port = if_object.get_deprecated_string("peer_port"sv).value_or({});
if (!flag_numeric) {
auto service = getservbyport(htons(if_object.get_deprecated("peer_port"sv).to_u32()), "udp");
auto service = getservbyport(htons(if_object.get_u32("peer_port"sv).value_or(0)), "udp");
if (service != nullptr) {
auto s_name = StringView { service->s_name, strlen(service->s_name) };
if (!s_name.is_empty())
@ -300,7 +300,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
}
auto origin_pid = (if_object.has("origin_pid"sv)) ? if_object.get_deprecated("origin_pid"sv).to_u32() : -1;
auto origin_pid = (if_object.has("origin_pid"sv)) ? if_object.get_u32("origin_pid"sv).value_or(0) : -1;
if (protocol_column != -1)
columns[protocol_column].buffer = "udp";