From 3ab6c5fd095d555df2d69e4102f3b76498302b6d Mon Sep 17 00:00:00 2001
From: AnotherTest <ali.mpfard@gmail.com>
Date: Mon, 6 Apr 2020 10:50:46 +0430
Subject: [PATCH] DHCPClient: Log errors and cleanup the code

Prior to this, we ran the DHCP client as a high-priority service, but
making the system feel laggy "for some network stuff" is not the
greatest of ideas :^)
---
 Base/etc/SystemServer.ini           |  2 +-
 Servers/DHCPClient/DHCPv4Client.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index 48c2e5f9b8..142d068162 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -21,7 +21,7 @@ KeepAlive=1
 User=lookup
 
 [DHCPClient]
-Priority=high
+Priority=low
 KeepAlive=1
 User=root
 
diff --git a/Servers/DHCPClient/DHCPv4Client.cpp b/Servers/DHCPClient/DHCPv4Client.cpp
index 9f18cca043..6161d02bf3 100644
--- a/Servers/DHCPClient/DHCPv4Client.cpp
+++ b/Servers/DHCPClient/DHCPv4Client.cpp
@@ -37,12 +37,12 @@ static void send(const InterfaceDescriptor& iface, const DHCPv4Packet& packet, C
 {
     int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
     if (fd < 0) {
-        dbg() << "ERROR: socket";
+        dbg() << "ERROR: socket :: " << strerror(errno);
         return;
     }
 
     if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, iface.m_ifname.characters(), IFNAMSIZ) < 0) {
-        dbg() << "ERROR from setsockopt(SO_BINDTODEVICE): " << strerror(errno);
+        dbg() << "ERROR: setsockopt(SO_BINDTODEVICE) :: " << strerror(errno);
         return;
     }
 
@@ -64,7 +64,7 @@ static void set_params(const InterfaceDescriptor& iface, const IPv4Address& ipv4
 {
     int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
     if (fd < 0) {
-        dbg() << "ERROR: socket";
+        dbg() << "ERROR: socket :: " << strerror(errno);
         return;
     }
 
@@ -77,14 +77,14 @@ static void set_params(const InterfaceDescriptor& iface, const IPv4Address& ipv4
     ((sockaddr_in&)ifr.ifr_addr).sin_addr.s_addr = ipv4_addr.to_in_addr_t();
 
     if (ioctl(fd, SIOCSIFADDR, &ifr) < 0) {
-        dbg() << "ERROR: ioctl(SIOCSIFADDR)";
+        dbg() << "ERROR: ioctl(SIOCSIFADDR) :: " << strerror(errno);
     }
 
     // set the network mask
     ((sockaddr_in&)ifr.ifr_netmask).sin_addr.s_addr = netmask.to_in_addr_t();
 
     if (ioctl(fd, SIOCSIFNETMASK, &ifr) < 0) {
-        dbg() << "ERROR: ioctl(SIOCSIFADDR)";
+        dbg() << "ERROR: ioctl(SIOCSIFNETMASK) :: " << strerror(errno);
     }
 
     // set the default gateway
@@ -97,7 +97,7 @@ static void set_params(const InterfaceDescriptor& iface, const IPv4Address& ipv4
     rt.rt_flags = RTF_UP | RTF_GATEWAY;
 
     if (ioctl(fd, SIOCADDRT, &rt) < 0) {
-        dbg() << "Error: ioctl(SIOCADDRT)";
+        dbg() << "Error: ioctl(SIOCADDRT) :: " << strerror(errno);
     }
 }
 
@@ -277,7 +277,7 @@ void DHCPv4Client::dhcp_request(DHCPv4Transaction& transaction, const DHCPv4Pack
     builder.set_message_type(DHCPMessageType::DHCPRequest);
     auto& dhcp_packet = builder.build();
 
-    // broadcast the discover request
+    // broadcast the "request" request
     send(iface, dhcp_packet, this);
     transaction.accepted_offer = true;
 }