testing port configuration tweaks

Author: brentru

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -219,6 +219,7 @@ def set_dhcp(self, response_timeout=1):
                                                                                     _subnet_mask,
                                                                                     _gw_addr,
                                                                                     self._dns))
+            self._src_port = 0
             return 0
         return -1
 
@@ -495,10 +496,14 @@ def socket_connect(self, socket_num, dest, port, conn_mode=SNMR_TCP):
             print("*** Connecting: Socket# {}, conn_mode: {}".format(socket_num, conn_mode))
 
         # initialize a socket and set the mode
-        res = self.socket_open(socket_num, dest, port, conn_mode=conn_mode)
+        res = self.socket_open(socket_num, port, conn_mode=conn_mode)
         if res == 1:
             raise RuntimeError('Failed to initalize a connection with the socket.')
 
+
+        self._write_sndipr(socket_num, dest)
+        self._write_sndport(socket_num, port)
+
         if conn_mode == SNMR_TCP:
             # TCP client - connect socket
             self._send_socket_cmd(socket_num, CMD_SOCK_CONNECT)
@@ -535,14 +540,11 @@ def get_socket(self, sockets):
                 sock = _sock
                 break
 
-        if self._src_port == 0:
-            # Dynamic ports 49152 to 65535.
-            self._src_port += randint(49152, 65535)
         if self._debug:
-            print("Allocated socket #{}:{}".format(sock, self._src_port))
+            print("Allocated socket #{}".format(sock))
         return sock
 
-    def socket_open(self, socket_num, dest, port, conn_mode=SNMR_TCP):
+    def socket_open(self, socket_num, port, conn_mode=SNMR_TCP):
         """Opens a socket to a destination IP address or hostname. By default, we use
         'conn_mode'=SNMR_TCP but we may also use SNMR_UDP.
         """
@@ -551,23 +553,18 @@ def socket_open(self, socket_num, dest, port, conn_mode=SNMR_TCP):
             print("*** Opening socket %d"%socket_num)
         if self._read_snsr(socket_num)[0] == SNSR_SOCK_CLOSED:
             if self._debug:
-                print("w5k socket begin, protocol={}, port={}, ip={}".format(conn_mode, port,
-                                                                             self.pretty_ip(dest)))
+                print("w5k socket begin, protocol={}, port={}".format(conn_mode, port))
             time.sleep(0.00025)
 
             self._write_snmr(socket_num, conn_mode)
             self._write_snir(socket_num, 0xFF)
 
-            if self._src_port > 0:
-                # write to socket source port
-                self._write_sock_port(socket_num, self._src_port)
+            if port > 0:
+                # write to defined port
+                self._write_sock_port(socket_num, port)
             else:
                 # if source port is not set, set the local port number
-                self._write_sock_port(socket_num, LOCAL_PORT)
-
-            # set socket destination IP and port
-            self._write_sndipr(socket_num, dest)
-            self._write_sndport(socket_num, port)
+                self._write_sock_port(socket_num, randint(49152, 65535))
 
             # open socket
             self._write_sncr(socket_num, CMD_SOCK_OPEN)
@@ -584,6 +581,7 @@ def socket_close(self, socket_num):
             print("*** Closing socket #%d" % socket_num)
         self._write_sncr(socket_num, CMD_SOCK_CLOSE)
         self._read_sncr(socket_num)
+        self._src_port = 0
 
     def socket_disconnect(self, socket_num):
         """Disconnect a TCP connection."""

adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py

@@ -253,6 +253,7 @@ def parse_dhcp_response(self, response_timeout): # pylint: disable=too-many-bran
 
         xid = _BUFF[4:8]
         if bytes(xid) < self._initial_xid:
+            print("f")
             return 0, 0
 
         self.local_ip = _BUFF[16:20]

adafruit_wiznet5k/adafruit_wiznet5k_dns.py

@@ -95,7 +95,7 @@ def gethostbyname(self, hostname):
         # wait and retry 3 times for a response
         retries = 0
         addr = -1
-        while (retries < 3) and (addr == -1):
+        while (retries < 5) and (addr == -1):
             addr = self._parse_dns_response()
             if addr == -1 and self._debug:
                 print("* DNS ERROR: Failed to resolve DNS response, retrying...")