Adding HttpClient

hardware/arduino/cores/arduino/Print.cpp

@@ -46,6 +46,10 @@ size_t Print::print(const __FlashStringHelper *ifsh)
   while (1) {
     unsigned char c = pgm_read_byte(p++);
     if (c == 0) break;
+    if (attachedPrint)
+    {
+      attachedPrint->print(c);
+    }
     n += write(c);
   }
   return n;
@@ -55,18 +59,30 @@ size_t Print::print(const String &s)
 {
   size_t n = 0;
   for (uint16_t i = 0; i < s.length(); i++) {
+    if (attachedPrint)
+    {
+      attachedPrint->print(s[i]);
+    }
     n += write(s[i]);
   }
   return n;
 }
 
 size_t Print::print(const char str[])
 {
+  if (attachedPrint)
+  {
+    attachedPrint->print(str);
+  }
   return write(str);
 }
 
 size_t Print::print(char c)
 {
+  if (attachedPrint)
+  {
+    attachedPrint->print(c);
+  }
   return write(c);
 }
 
@@ -88,6 +104,10 @@ size_t Print::print(unsigned int n, int base)
 size_t Print::print(long n, int base)
 {
   if (base == 0) {
+    if (attachedPrint)
+    {
+      attachedPrint->print(n);
+    }
     return write(n);
   } else if (base == 10) {
     if (n < 0) {
@@ -103,7 +123,14 @@ size_t Print::print(long n, int base)
 
 size_t Print::print(unsigned long n, int base)
 {
-  if (base == 0) return write(n);
+  if (base == 0)
+  {
+    if (attachedPrint)
+    {
+      attachedPrint->print(n);
+    }
+    return write(n);
+  }
   else return printNumber(n, base);
 }
 
@@ -219,6 +246,10 @@ size_t Print::printNumber(unsigned long n, uint8_t base) {
     *--str = c < 10 ? c + '0' : c + 'A' - 10;
   } while(n);
 
+  if (attachedPrint)
+  {
+    attachedPrint->print(str);
+  }
   return write(str);
 }
 

hardware/arduino/cores/arduino/Print.h

@@ -38,9 +38,11 @@ class Print
     size_t printNumber(unsigned long, uint8_t);
     size_t printFloat(double, uint8_t);
   protected:
+    Print* attachedPrint; // if non-NULL, points to a Print instance where we should output
+                          // any sent/received data
     void setWriteError(int err = 1) { write_error = err; }
   public:
-    Print() : write_error(0) {}
+    Print() : write_error(0), attachedPrint(NULL) {}
 
     int getWriteError() { return write_error; }
     void clearWriteError() { setWriteError(0); }
@@ -49,6 +51,8 @@ class Print
     size_t write(const char *str) { return write((const uint8_t *)str, strlen(str)); }
     virtual size_t write(const uint8_t *buffer, size_t size);
 
+    void attach(Print& aPrint) { attachedPrint = &aPrint; };
+
     size_t print(const __FlashStringHelper *);
     size_t print(const String &);
     size_t print(const char[]);

hardware/arduino/cores/arduino/Stream.cpp

@@ -244,3 +244,27 @@ size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length)
   return index; // return number of characters, not including null terminator
 }
 
+String Stream::readString()
+{
+  String ret;
+  int c = timedRead();
+  while (c >= 0)
+  {
+    ret += (char)c;
+    c = timedRead();
+  }
+  return ret;
+}
+
+String Stream::readStringUntil(char terminator)
+{
+  String ret;
+  int c = timedRead();
+  while (c >= 0 && c != terminator)
+  {
+    ret += (char)c;
+    c = timedRead();
+  }
+  return ret;
+}
+

hardware/arduino/cores/arduino/Stream.h

@@ -82,6 +82,8 @@ class Stream : public Print
   // returns the number of characters placed in the buffer (0 means no valid data found)
 
   // Arduino String functions to be added here
+  String readString();
+  String readStringUntil(char terminator);
 
   protected:
   long parseInt(char skipChar); // as above but the given skipChar is ignored

libraries/Ethernet/EthernetClient.cpp

@@ -97,6 +97,10 @@ int EthernetClient::read() {
   if ( recv(_sock, &b, 1) > 0 )
   {
     // recv worked
+    if (attachedPrint)
+    {
+      attachedPrint->print((char)b);
+    }
     return b;
   }
   else
@@ -107,7 +111,18 @@ int EthernetClient::read() {
 }
 
 int EthernetClient::read(uint8_t *buf, size_t size) {
-  return recv(_sock, buf, size);
+  int ret = recv(_sock, buf, size);
+  if (ret > 0)
+  {
+    if (attachedPrint)
+    {
+      for (int i=0; i < ret; i++)
+      {
+        attachedPrint->print((char)buf[i]);
+      }
+    }
+  }
+  return ret;
 }
 
 int EthernetClient::peek() {