Merge pull request #70 from johannrichard/ethernet-close_wait

damellis · damellis · commit 2a48aa5cbc7f · 2012-05-06T15:08:39.000-07:00
EthernetClient: recycle sockets in CLOSE_WAIT status
diff --git a/libraries/Ethernet/EthernetClient.cpp b/libraries/Ethernet/EthernetClient.cpp
@@ -41,7 +41,7 @@ int EthernetClient::connect(IPAddress ip, uint16_t port) {
 
   for (int i = 0; i < MAX_SOCK_NUM; i++) {
     uint8_t s = W5100.readSnSR(i);
-    if (s == SnSR::CLOSED || s == SnSR::FIN_WAIT) {
+    if (s == SnSR::CLOSED || s == SnSR::FIN_WAIT || s == SnSR::CLOSE_WAIT) {
       _sock = i;
       break;
     }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ int EthernetClient::connect(IPAddress ip, uint16_t port) {`
`41`	`41`
`42`	`42`	`for (int i = 0; i < MAX_SOCK_NUM; i++) {`
`43`	`43`	`uint8_t s = W5100.readSnSR(i);`
`44`		`- if (s == SnSR::CLOSED \|\| s == SnSR::FIN_WAIT) {`
	`44`	`+ if (s == SnSR::CLOSED \|\| s == SnSR::FIN_WAIT \|\| s == SnSR::CLOSE_WAIT) {`
`45`	`45`	`_sock = i;`
`46`	`46`	`break;`
`47`	`47`	`}`