Added release_socket() called to socket.close(), __exit__() and __del__ plus bug fixes.

Author: BiffoBear

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -193,6 +193,13 @@ def __init__(
         self._ch_base_msb = 0
         if self._w5xxx_init() != 1:
             raise RuntimeError("Failed to initialize WIZnet module.")
+        if self._chip_type == "w5100s":
+            WIZNET5K._sockets_reserved = [False] * (_W5100_MAX_SOCK_NUM - 1)
+        elif self._chip_type == "w5500":
+            WIZNET5K._sockets_reserved = [False] * (_W5200_W5500_MAX_SOCK_NUM - 1)
+        else:
+            raise RuntimeError("Unrecognized chip type.")
+
         # Set MAC address
         self.mac_address = mac
         self.src_port = 0
@@ -780,7 +787,7 @@ def release_socket(socket_number):
 
         :param int socket_number: The socket to release.
         """
-        WIZNET5K._sockets_reserved[socket_number] = False
+        WIZNET5K._sockets_reserved[socket_number - 1] = False
 
     def socket_listen(
         self, socket_num: int, port: int, conn_mode: int = _SNMR_TCP

adafruit_wiznet5k/adafruit_wiznet5k_socket.py

@@ -231,14 +231,18 @@ def __init__(
         self._timeout = _default_socket_timeout
         self._listen_port = None
 
-        self._socknum = _the_interface.get_socket()
+        self._socknum = _the_interface.get_socket(reserve_socket=True)
         if self._socknum == _SOCKET_INVALID:
             raise RuntimeError("Failed to allocate socket.")
 
+    def __del__(self):
+        _the_interface.release_socket(self._socknum)
+
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        _the_interface.release_socket(self._socknum)
         if self._sock_type == SOCK_STREAM:
             self._disconnect()
             stamp = time.monotonic()
@@ -601,6 +605,7 @@ def close(self) -> None:
         Mark the socket closed. Once that happens, all future operations on the socket object
         will fail. The remote end will receive no more data.
         """
+        _the_interface.release_socket(self._socknum)
         _the_interface.socket_close(self._socknum)
 
     def _available(self) -> int: