prune extra from get_socket, just allocate a socket from the chipset

Author: brentru

adafruit_wiznet5k/adafruit_wiznet5k.py

@@ -219,7 +219,6 @@ def set_dhcp(self, response_timeout=1):
                                                                                     _subnet_mask,
                                                                                     _gw_addr,
                                                                                     self._dns))
-            self._src_port = 0
             return 0
         return -1
 
@@ -496,14 +495,10 @@ 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, port, conn_mode=conn_mode)
+        res = self.socket_open(socket_num, dest, 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)
@@ -544,7 +539,7 @@ def get_socket(self, sockets):
             print("Allocated socket #{}".format(sock))
         return sock
 
-    def socket_open(self, socket_num, port, conn_mode=SNMR_TCP):
+    def socket_open(self, socket_num, dest, 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.
         """
@@ -553,19 +548,23 @@ def socket_open(self, socket_num, 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={}".format(conn_mode, port))
+                print("w5k socket begin, protocol={}, port={}, ip={}".format(conn_mode, port,
+                                                                             self.pretty_ip(dest)))
             time.sleep(0.00025)
 
             self._write_snmr(socket_num, conn_mode)
             self._write_snir(socket_num, 0xFF)
 
-            if port > 0:
-                # write to defined port
-                self._write_sock_port(socket_num, port)
+            if self._src_port > 0:
+                # write to socket source port
+                self._write_sock_port(socket_num, self._src_port)
             else:
-                # if source port is not set, set the local port number
                 self._write_sock_port(socket_num, randint(49152, 65535))
 
+            # set socket destination IP and port
+            self._write_sndipr(socket_num, dest)
+            self._write_sndport(socket_num, port)
+
             # open socket
             self._write_sncr(socket_num, CMD_SOCK_OPEN)
             self._read_sncr(socket_num)
@@ -581,7 +580,6 @@ 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."""