Fixed wrong behaviour of EthernetClient::flush().

cmaglie · cmaglie · commit 88def54082e3 · 2013-09-23T15:46:51.000+02:00
Fixes #1576
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
@@ -4,6 +4,7 @@ ARDUINO 1.5.5 BETA
 [libraries]
 * avr: Fixed buffer overflow in File::doBuffer() (dreggy)
 * avr: Fixed timeout in Bridge::transfer()
+* avr: Fixed behavior of EthernetClient::flush()
 
 ARDUINO 1.5.4 BETA 2013.09.10
 
diff --git a/libraries/Ethernet/arch/avr/utility/socket.cpp b/libraries/Ethernet/arch/avr/utility/socket.cpp
@@ -310,6 +310,12 @@ uint16_t recvfrom(SOCKET s, uint8_t *buf, uint16_t len, uint8_t *addr, uint16_t
   return data_len;
 }
 
+/**
+ * @brief	Wait for buffered transmission to complete.
+ */
+void flush(SOCKET s) {
+  // TODO
+}
 
 uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len)
 {
diff --git a/libraries/Ethernet/arch/sam/utility/socket.cpp b/libraries/Ethernet/arch/sam/utility/socket.cpp
@@ -310,6 +310,12 @@ uint16_t recvfrom(SOCKET s, uint8_t *buf, uint16_t len, uint8_t *addr, uint16_t
   return data_len;
 }
 
+/**
+ * @brief	Wait for buffered transmission to complete.
+ */
+void flush(SOCKET s) {
+  // TODO
+}
 
 uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len)
 {
diff --git a/libraries/Ethernet/src/EthernetClient.cpp b/libraries/Ethernet/src/EthernetClient.cpp
@@ -120,8 +120,7 @@ int EthernetClient::peek() {
 }
 
 void EthernetClient::flush() {
-  while (available())
-    read();
+  ::flush(_sock);
 }
 
 void EthernetClient::stop() {
diff --git a/libraries/Ethernet/src/utility/socket.h b/libraries/Ethernet/src/utility/socket.h
@@ -13,6 +13,7 @@ extern int16_t recv(SOCKET s, uint8_t * buf, int16_t len);	// Receive data (TCP)
 extern uint16_t peek(SOCKET s, uint8_t *buf);
 extern uint16_t sendto(SOCKET s, const uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t port); // Send data (UDP/IP RAW)
 extern uint16_t recvfrom(SOCKET s, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t *port); // Receive data (UDP/IP RAW)
+extern void flush(SOCKET s); // Wait for transmission to complete
 
 extern uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len);
 

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,12 @@ uint16_t recvfrom(SOCKET s, uint8_t buf, uint16_t len, uint8_t addr, uint16_t`
`310`	`310`	`return data_len;`
`311`	`311`	`}`
`312`	`312`
	`313`	`+/**`
	`314`	`+ * @brief Wait for buffered transmission to complete.`
	`315`	`+ */`
	`316`	`+void flush(SOCKET s) {`
	`317`	`+ // TODO`
	`318`	`+}`
`313`	`319`
`314`	`320`	`uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len)`
`315`	`321`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,7 @@ int EthernetClient::peek() {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`void EthernetClient::flush() {`
`123`		`- while (available())`
`124`		`- read();`
	`123`	`+ ::flush(_sock);`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`void EthernetClient::stop() {`