get_socket parses through CIPSTATUS socket states, returns socket if state is valid

Author: brentru

adafruit_fona/adafruit_fona.py

@@ -528,19 +528,26 @@ def get_host_by_name(self, hostname):
 
     ### Socket API (TCP, UDP) ###
 
-    def get_socket(self, sockets):
-        """Returns the first avaliable (unused) socket
-        by the socket module.
+    def get_socket(self):
+        """Returns an avaliable socket (INITIAL or CLOSED state).
 
         """
         if self._debug:
             print("*** Allocating Socket")
-        sock = 0
+
+        self._uart.write(b"AT+CIPSTATUS\r\n")
+        self._read_line(100) # OK
+        self._read_line(100) # table header
+
         for sock in range(0, FONA_MAX_SOCKETS):
-            if sock not in sockets:
+            # parse and check for INITIAL client state
+            self._read_line(100)
+            self._parse_reply(b'C:', idx=5)
+            if self._buf.strip('\"') == "INITIAL" or self._buf.strip('\"') == "CLOSED":
                 break
-        if self._debug:
-            print("Allocated socket #", sock)
+        # read out the rest of the responses
+        for _ in range(sock, FONA_MAX_SOCKETS):
+            self._read_line(100)
         return sock
 
     def remote_ip(self, sock_num):

adafruit_fona/adafruit_fona_socket.py

@@ -103,7 +103,7 @@ def __init__(
         self._buffer = b""
         self._timeout = 0
 
-        self._socknum = _the_interface.get_socket(SOCKETS)
+        self._socknum = _the_interface.get_socket()
         SOCKETS.append(self._socknum)
         self.settimeout(self._timeout)
 
@@ -210,7 +210,7 @@ def recv(self, bufsize=0):
 
     def readline(self):
         """Attempt to return as many bytes as we can up to but not including '\r\n'"""
-        # print("Socket readline")
+        print("Socket readline")
         stamp = time.monotonic()
         while b"\r\n" not in self._buffer:
             # there's no line already in there, read some more