Updated to latest version of socket.py.

Author: BiffoBear

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -89,8 +89,8 @@
 SNSR_SOCK_ESTABLISHED = const(0x17)
 SNSR_SOCK_FIN_WAIT = const(0x18)
 _SNSR_SOCK_CLOSING = const(0x1A)
-_SNSR_SOCK_TIME_WAIT = const(0x1B)
-_SNSR_SOCK_CLOSE_WAIT = const(0x1C)
+SNSR_SOCK_TIME_WAIT = const(0x1B)
+SNSR_SOCK_CLOSE_WAIT = const(0x1C)
 _SNSR_SOCK_LAST_ACK = const(0x1D)
 _SNSR_SOCK_UDP = const(0x22)
 _SNSR_SOCK_IPRAW = const(0x32)
@@ -260,7 +260,9 @@ def get_host_by_name(self, hostname: str) -> bytes:
         if isinstance(hostname, str):
             hostname = bytes(hostname, "utf-8")
         # Return IP assigned by DHCP
-        _dns_client = dns.DNS(self, self._dns, debug=self._debug)
+        _dns_client = dns.DNS(
+            self, self.pretty_ip(bytearray(self._dns)), debug=self._debug
+        )
         ret = _dns_client.gethostbyname(hostname)
         debug_msg("* Resolved IP: {}".format(ret), self._debug)
         if ret == -1:
@@ -817,9 +819,9 @@ def socket_open(self, socket_num: int, conn_mode: int = _SNMR_TCP) -> int:
         status = self.read_snsr(socket_num)[0]
         if status in (
             SNSR_SOCK_CLOSED,
-            _SNSR_SOCK_TIME_WAIT,
+            SNSR_SOCK_TIME_WAIT,
             SNSR_SOCK_FIN_WAIT,
-            _SNSR_SOCK_CLOSE_WAIT,
+            SNSR_SOCK_CLOSE_WAIT,
             _SNSR_SOCK_CLOSING,
             _SNSR_SOCK_UDP,
         ):
@@ -897,7 +899,7 @@ def socket_read(self, socket_num: int, length: int) -> Tuple[int, bytes]:
         if ret == 0:
             # no data on socket?
             status = self._read_snmr(socket_num)
-            if status in (SNSR_SOCK_LISTEN, SNSR_SOCK_CLOSED, _SNSR_SOCK_CLOSE_WAIT):
+            if status in (SNSR_SOCK_LISTEN, SNSR_SOCK_CLOSED, SNSR_SOCK_CLOSE_WAIT):
                 # remote end closed its side of the connection, EOF state
                 raise RuntimeError("Lost connection to peer.")
                 # connection is alive, no data waiting to be read
@@ -993,7 +995,7 @@ def socket_write(
         while free_size < ret:
             free_size = self._get_tx_free_size(socket_num)
             status = self.socket_status(socket_num)[0]
-            if status not in (SNSR_SOCK_ESTABLISHED, _SNSR_SOCK_CLOSE_WAIT) or (
+            if status not in (SNSR_SOCK_ESTABLISHED, SNSR_SOCK_CLOSE_WAIT) or (
                 timeout and time.monotonic() - stamp > timeout
             ):
                 ret = 0
@@ -1032,18 +1034,18 @@ def socket_write(
             time.sleep(0.001)
 
         # check data was  transferred correctly
-        while not self._read_snir(socket_num)[0] & _SNIR_SEND_OK:
+        while not self.read_snir(socket_num)[0] & _SNIR_SEND_OK:
             if self.socket_status(socket_num)[0] in (
                 SNSR_SOCK_CLOSED,
-                _SNSR_SOCK_TIME_WAIT,
+                SNSR_SOCK_TIME_WAIT,
                 SNSR_SOCK_FIN_WAIT,
-                _SNSR_SOCK_CLOSE_WAIT,
+                SNSR_SOCK_CLOSE_WAIT,
                 _SNSR_SOCK_CLOSING,
             ):
                 raise RuntimeError("Socket closed before data was sent.")
             if timeout and time.monotonic() - stamp > timeout:
                 raise RuntimeError("Operation timed out. No data sent.")
-            if self._read_snir(socket_num)[0] & _SNIR_TIMEOUT:
+            if self.read_snir(socket_num)[0] & _SNIR_TIMEOUT:
                 raise TimeoutError(
                     "Hardware timeout while sending on socket {}.".format(socket_num)
                 )
@@ -1127,7 +1129,7 @@ def read_snsr(self, sock: int) -> Optional[bytearray]:
         """Read Socket n Status Register."""
         return self._read_socket(sock, _REG_SNSR)
 
-    def _read_snir(self, sock: int) -> Optional[bytearray]:
+    def read_snir(self, sock: int) -> Optional[bytearray]:
         """Read Socket n Interrupt Register."""
         return self._read_socket(sock, _REG_SNIR)
 

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

@@ -24,6 +24,7 @@
 except ImportError:
     pass
 
+
 import gc
 import time
 from random import randint

adafruit_wiznet5k/adafruit_wiznet5k_dns.py

@@ -251,8 +251,8 @@ def gethostbyname(self, hostname: bytes) -> Union[int, bytes]:
         self._query_id, self._query_length, buffer = _build_dns_query(hostname)
 
         # Send DNS request packet
-        self._sock.bind((None, _DNS_PORT))
-        self._sock.connect((self._iface.pretty_ip(self._dns_server), _DNS_PORT))
+        self._sock.bind(("", _DNS_PORT))
+        self._sock.connect((self._dns_server, _DNS_PORT))
         _debug_print(debug=self._debug, message="* DNS: Sending request packet...")
         self._sock.send(buffer)
 
@@ -261,9 +261,11 @@ def gethostbyname(self, hostname: bytes) -> Union[int, bytes]:
         for _ in range(5):
             #  wait for a response
             socket_timeout = time.monotonic() + 1.0
-            packet_size = self._sock.available()
+            packet_size = self._sock._available()  # pylint: disable=protected-access
             while packet_size == 0:
-                packet_size = self._sock.available()
+                packet_size = (
+                    self._sock._available()  # pylint: disable=protected-access
+                )
                 if time.monotonic() > socket_timeout:
                     _debug_print(
                         debug=self._debug,
@@ -273,7 +275,7 @@ def gethostbyname(self, hostname: bytes) -> Union[int, bytes]:
                     return -1
                 time.sleep(0.05)
             # recv packet into buf
-            buffer = self._sock.recv(512)
+            buffer = self._sock.recv(512)  # > UDP payload length
             _debug_print(
                 debug=self._debug,
                 message="DNS Packet Received: {}".format(buffer),

adafruit_wiznet5k/adafruit_wiznet5k_ntp.py

@@ -74,7 +74,7 @@ def get_time(self) -> time.struct_time:
             self._sock.sendto(self._pkt_buf_, (self._ntp_server, 123))
             end_time = time.monotonic() + 0.2 * 2**retry
             while time.monotonic() < end_time:
-                data = self._sock.recv()
+                data = self._sock.recv(64)  # NTP returns a 48 byte message.
                 if data:
                     sec = data[40:44]
                     int_cal = int.from_bytes(sec, "big")