link check in set_dhcp

Author: Bongjun Hur

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -176,16 +176,6 @@ def __init__(
         self._src_port = 0
         self._dns = 0
 
-        # First wait link status is on
-        # to avoid the code during DHCP - assert self.link_status, "Ethernet cable disconnected!"
-        start_time = time.monotonic()
-        while True:
-            if self.link_status or ((time.monotonic() - start_time) > 5) :
-                break
-            time.sleep(1)
-            if self._debug:
-                print("My Link is:", self.link_status)
-
         # Set DHCP
         if is_dhcp:
             ret = self.set_dhcp(hostname, dhcp_timeout)
@@ -201,6 +191,17 @@ def set_dhcp(self, hostname=None, response_timeout=3):
         """
         if self._debug:
             print("* Initializing DHCP")
+
+        # First, wait link status is on
+        # to avoid the code during DHCP - assert self.link_status, "Ethernet cable disconnected!"
+        start_time = time.monotonic()
+        while True:
+            if self.link_status or ((time.monotonic() - start_time) > 5) :
+                break
+            time.sleep(1)
+            if self._debug:
+                print("My Link is:", self.link_status)
+
         self._src_port = 68
         # Return IP assigned by DHCP
         _dhcp_client = dhcp.DHCP(

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

@@ -365,11 +365,8 @@ def request_dhcp_lease(
                     print("* DHCP: Parsing OFFER")
                 msg_type, xid = self.parse_dhcp_response(self._response_timeout)
                 if msg_type == DHCP_OFFER:
-                    # # use the _transaction_id the offer returned,
-                    # # rather than the current one
-                    # self._transaction_id = self._transaction_id.from_bytes(xid, "l")
                     if self._debug:
-                        print("* DHCP: Request")
+                        print("* DHCP: Request", xid)
                     self.send_dhcp_message(
                         DHCP_REQUEST, ((time.monotonic() - start_time) / 1000)
                     )