An improved patch for the Client part of issue 416 (adding a multi-byte read). This one moves all of the checking into recv, so that single-byte reads also benefit. It also returns -1 if there's no data available unless we've reached EOF, in which case it returns 0.

amcewen · amcewen · commit 81b6c69f295f · 2011-01-02T22:21:24.000Z
diff --git a/libraries/Ethernet/Client.cpp b/libraries/Ethernet/Client.cpp
@@ -77,14 +77,25 @@ int Client::available() {
 
 int Client::read() {
   uint8_t b;
-  if (!available())
+  if ( recv(_sock, &b, 1) )
+  {
+    // recv worked
+    return b;
+  }
+  else
+  {
+    // No data available
     return -1;
-  recv(_sock, &b, 1);
-  return b;
+  }
+}
+
+int Client::read(uint8_t *buf, size_t size) {
+  return recv(_sock, buf, size);
 }
 
 int Client::peek() {
   uint8_t b;
+  // Unlike recv, peek doesn't check to see if there's any data available, so we must
   if (!available())
     return -1;
   ::peek(_sock, &b);
diff --git a/libraries/Ethernet/Client.h b/libraries/Ethernet/Client.h
@@ -17,6 +17,7 @@ class Client : public Stream {
   virtual void write(const uint8_t *buf, size_t size);
   virtual int available();
   virtual int read();
+  virtual int read(uint8_t *buf, size_t size);
   virtual int peek();
   virtual void flush();
   void stop();
diff --git a/libraries/Ethernet/utility/socket.cpp b/libraries/Ethernet/utility/socket.cpp
@@ -146,13 +146,17 @@ uint16_t send(SOCKET s, const uint8_t * buf, uint16_t len)
  */
 uint16_t recv(SOCKET s, uint8_t *buf, uint16_t len)
 {
-  uint16_t ret=0;
+  // Check how much data is available
+  uint16_t ret = W5100.getRXReceivedSize(s);
+  if (ret > len)
+  {
+    ret = len;
+  }
 
-  if ( len > 0 )
+  if ( ret > 0 )
   {
-    W5100.recv_data_processing(s, buf, len);
+    W5100.recv_data_processing(s, buf, ret);
     W5100.execCmdSn(s, Sock_RECV);
-    ret = len;
   }
   return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -146,13 +146,17 @@ uint16_t send(SOCKET s, const uint8_t * buf, uint16_t len)`
`146`	`146`	`*/`
`147`	`147`	`uint16_t recv(SOCKET s, uint8_t *buf, uint16_t len)`
`148`	`148`	`{`
`149`		`- uint16_t ret=0;`
	`149`	`+ // Check how much data is available`
	`150`	`+ uint16_t ret = W5100.getRXReceivedSize(s);`
	`151`	`+ if (ret > len)`
	`152`	`+ {`
	`153`	`+ ret = len;`
	`154`	`+ }`
`150`	`155`
`151`		`- if ( len > 0 )`
	`156`	`+ if ( ret > 0 )`
`152`	`157`	`{`
`153`		`- W5100.recv_data_processing(s, buf, len);`
	`158`	`+ W5100.recv_data_processing(s, buf, ret);`
`154`	`159`	`W5100.execCmdSn(s, Sock_RECV);`
`155`		`- ret = len;`
`156`	`160`	`}`
`157`	`161`	`return ret;`
`158`	`162`	`}`