diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-05-27 18:07:34 -0400 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-05-27 19:23:14 -0400 |
| commit | 203f2b67c0bea9646b4cf18bafba6e735df4efe3 (patch) | |
| tree | cf164c300fbb0d843ef3cc238cb15fa40610edae /libdhcp | |
| parent | 7dd869b107af520a5ce6870efab8becce5d81b15 (diff) | |
Pull the ARP-ping from libdhcp to net_iface
Diffstat (limited to 'libdhcp')
| -rw-r--r-- | libdhcp/dhcp_client.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libdhcp/dhcp_client.c b/libdhcp/dhcp_client.c index bf88961..13dc292 100644 --- a/libdhcp/dhcp_client.c +++ b/libdhcp/dhcp_client.c @@ -700,14 +700,6 @@ static ssize_t dhcp_client_recv(struct dhcp_client *client, struct dhcp_recv_msg return 0; } -/** @return true if there's a conflict, false if the addr appears to be unused */ -static bool dhcp_check_conflict(lo_interface net_packet_conn sock, struct net_ip4_addr addr) { - assert(!LO_IS_NULL(sock)); - ssize_t v = LO_CALL(sock, sendto, "CHECK_IP_CONFLICT", 17, addr, 5000); - log_debugln("check_ip_conflict => ", v); - return v != -NET_EARP_TIMEOUT; -} - static void dhcp_client_take_lease(struct dhcp_client *client, struct dhcp_recv_msg *msg, bool ifup) { assert(client); assert(msg); @@ -805,7 +797,7 @@ static void dhcp_client_setstate(struct dhcp_client *client, dhcp_client_setstate(client, STATE_INIT, 0, NULL, scratch_msg); break; case DHCP_MSGTYP_ACK: - if (dhcp_check_conflict(client->sock, client->lease_client_addr)) { + if (LO_CALL(client->iface, arp_ping, client->lease_client_addr)) { log_debugln("IP ", (net_ip4_addr, client->lease_client_addr), " is already in use"); dhcp_client_setstate(client, STATE_INIT, DHCP_MSGTYP_DECLINE, "IP is already in use", scratch_msg); } else { |