Merge branch 'new-extension' of https://github.com/arduino/Arduino

Author: amcewen

Client.cpp

@@ -70,19 +70,24 @@ int Client::connect(IPAddress ip, uint16_t port) {
   return 1;
 }
 
-void Client::write(uint8_t b) {
-  if (_sock != MAX_SOCK_NUM)
-    send(_sock, &b, 1);
+size_t Client::write(uint8_t b) {
+  return write(&b, 1);
 }
 
-void Client::write(const char *str) {
-  if (_sock != MAX_SOCK_NUM)
-    send(_sock, (const uint8_t *)str, strlen(str));
+size_t Client::write(const char *str) {
+  return write((const uint8_t *) str, strlen(str));
 }
 
-void Client::write(const uint8_t *buf, size_t size) {
-  if (_sock != MAX_SOCK_NUM)
-    send(_sock, buf, size);
+size_t Client::write(const uint8_t *buf, size_t size) {
+  if (_sock == MAX_SOCK_NUM) {
+    setWriteError();
+    return 0;
+  }
+  if (!send(_sock, buf, size)) {
+    setWriteError();
+    return 0;
+  }
+  return size;
 }
 
 int Client::available() {

Client.h

@@ -12,9 +12,9 @@ class Client : public Stream {
   uint8_t status();
   int connect(IPAddress ip, uint16_t port);
   int connect(const char *host, uint16_t port);
-  virtual void write(uint8_t);
-  virtual void write(const char *str);
-  virtual void write(const uint8_t *buf, size_t size);
+  virtual size_t write(uint8_t);
+  virtual size_t write(const char *str);
+  virtual size_t write(const uint8_t *buf, size_t size);
   virtual int available();
   virtual int read();
   virtual int read(uint8_t *buf, size_t size);

IPAddress.cpp

@@ -42,13 +42,15 @@ bool IPAddress::operator==(const uint8_t* addr)
     return memcmp(addr, _address, sizeof(_address)) == 0;
 }
 
-void IPAddress::printTo(Print& p) const
+size_t IPAddress::printTo(Print& p) const
 {
+    size_t n = 0;
     for (int i =0; i < 3; i++)
     {
-        p.print(_address[i], DEC);
-        p.print('.');
+        n += p.print(_address[i], DEC);
+        n += p.print('.');
     }
-    p.print(_address[3], DEC);
+    n += p.print(_address[3], DEC);
+    return n;
 }
 

IPAddress.h

@@ -60,7 +60,7 @@ class IPAddress : public Printable {
     IPAddress& operator=(const uint8_t *address);
     IPAddress& operator=(uint32_t address);
 
-    virtual void printTo(Print& p) const;
+    virtual size_t printTo(Print& p) const;
 
     friend class EthernetClass;
     friend class UDP;

Server.cpp

@@ -67,26 +67,30 @@ Client Server::available()
   return Client(MAX_SOCK_NUM);
 }
 
-void Server::write(uint8_t b) 
+size_t Server::write(uint8_t b) 
 {
   write(&b, 1);
 }
 
-void Server::write(const char *str) 
+size_t Server::write(const char *str) 
 {
   write((const uint8_t *)str, strlen(str));
 }
 
-void Server::write(const uint8_t *buffer, size_t size) 
+size_t Server::write(const uint8_t *buffer, size_t size) 
 {
+  size_t n = 0;
+  
   accept();
 
   for (int sock = 0; sock < MAX_SOCK_NUM; sock++) {
     Client client(sock);
 
     if (EthernetClass::_server_port[sock] == _port &&
       client.status() == SnSR::ESTABLISHED) {
-      client.write(buffer, size);
+      n += client.write(buffer, size);
     }
   }
+  
+  return n;
 }

Server.h

@@ -14,9 +14,9 @@ public Print {
   Server(uint16_t);
   Client available();
   void begin();
-  virtual void write(uint8_t);
-  virtual void write(const char *str);
-  virtual void write(const uint8_t *buf, size_t size);
+  virtual size_t write(uint8_t);
+  virtual size_t write(const char *str);
+  virtual size_t write(const uint8_t *buf, size_t size);
 };
 
 #endif

Udp.cpp

@@ -102,21 +102,22 @@ int UDP::endPacket()
   return sendUDP(_sock);
 }
 
-void UDP::write(uint8_t byte)
+size_t UDP::write(uint8_t byte)
 {
-  write(&byte, 1);
+  return write(&byte, 1);
 }
 
-void UDP::write(const char *str)
+size_t UDP::write(const char *str)
 {
   size_t len = strlen(str);
-  write((const uint8_t *)str, len);
+  return write((const uint8_t *)str, len);
 }
 
-void UDP::write(const uint8_t *buffer, size_t size)
+size_t UDP::write(const uint8_t *buffer, size_t size)
 {
   uint16_t bytes_written = bufferData(_sock, _offset, buffer, size);
   _offset += bytes_written;
+  return bytes_written;
 }
 
 int UDP::parsePacket()

Udp.h

@@ -67,11 +67,11 @@ class UDP : public Stream {
   // Returns 1 if the packet was sent successfully, 0 if there was an error
   int endPacket();
   // Write a single byte into the packet
-  virtual void write(uint8_t);
+  virtual size_t write(uint8_t);
   // Write a string of characters into the packet
-  virtual void write(const char *str);
+  virtual size_t write(const char *str);
   // Write size bytes from buffer into the packet
-  virtual void write(const uint8_t *buffer, size_t size);
+  virtual size_t write(const uint8_t *buffer, size_t size);
 
   // Start processing the next available incoming packet
   // Returns the size of the packet in bytes, or 0 if no packets are available