LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-29 14:14:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Utilities: Update arp to use newer APIs

Browse Source 
Updates the arp command to use Core::System for the socket and
ioctl calls.

Updates command line arguments to StringView.
This commit is contained in:
brapru 2022-04-05 06:16:28 -04:00 committed by Andreas Kling
parent 26b8155530
commit 3dbb4bc3a6
Notes: sideshowbarker 2024-07-17 14:25:14 +09:00 
Author: https://github.com/brapru
Commit: https://github.com/SerenityOS/serenity/commit/3dbb4bc3a6
Pull-request: https://github.com/SerenityOS/serenity/pull/13521
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Userland/Utilities/arp.cpp
View File

@ -31,8 +31,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
static bool flag_set; static bool flag_set;
static bool flag_delete; static bool flag_delete;
char const* value_ipv4_address = nullptr; StringView value_ipv4_address;
char const* value_hw_address = nullptr; StringView value_hw_address;
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
args_parser.set_general_help("Display or modify the system ARP cache"); args_parser.set_general_help("Display or modify the system ARP cache");
@ -121,7 +121,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
if (flag_set || flag_delete) { if (flag_set || flag_delete) {
if (!value_ipv4_address || !value_hw_address) { if (value_ipv4_address.is_empty() || value_hw_address.is_empty()) {
warnln("No protocol address or hardware address specified."); warnln("No protocol address or hardware address specified.");
return 1; return 1;
} }
@ -138,11 +138,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return 1; return 1;
} }
int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); int fd = TRY(Core::System::socket(AF_INET, SOCK_DGRAM, IPPROTO_IP));
if (fd < 0) {
perror("socket");
return 1;
}
struct arpreq arp_req; struct arpreq arp_req;
memset(&arp_req, 0, sizeof(arp_req)); memset(&arp_req, 0, sizeof(arp_req));
@ -152,19 +148,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
*(MACAddress*)&arp_req.arp_ha.sa_data[0] = hw_address.value(); *(MACAddress*)&arp_req.arp_ha.sa_data[0] = hw_address.value();
int rc = 0;
if (flag_set) if (flag_set)
rc = ioctl(fd, SIOCSARP, &arp_req); TRY(Core::System::ioctl(fd, SIOCSARP, &arp_req));
if (flag_delete) { if (flag_delete)
int rc2 = ioctl(fd, SIOCDARP, &arp_req); TRY(Core::System::ioctl(fd, SIOCDARP, &arp_req));
if (!rc2)
rc = rc2;
}
if (rc < 0) {
perror("ioctl");
return 1;
}
} }
return 0; return 0;