Update server client ref to match client class.

tdicola · tdicola · commit 796ac1ec8944 · 2014-08-15T16:11:23.000-07:00
diff --git a/Adafruit_CC3000.cpp b/Adafruit_CC3000.cpp
@@ -1300,7 +1300,7 @@ Adafruit_CC3000_Client Adafruit_CC3000::connectTCP(uint32_t destIP, uint16_t des
 
   //printHex((byte *)&socketAddress, sizeof(socketAddress));
   //if (CC3KPrinter != 0) CC3KPrinter->print(F("Connecting socket ... "));
-  if (-1 == connect(tcp_socket, &socketAddress, sizeof(socketAddress)))
+  if (-1 == ::connect(tcp_socket, &socketAddress, sizeof(socketAddress)))
   {
     CHECK_PRINTER {
       CC3KPrinter->println(F("Connection error"));
@@ -1350,7 +1350,7 @@ Adafruit_CC3000_Client Adafruit_CC3000::connectUDP(uint32_t destIP, uint16_t des
   }
 
   //printHex((byte *)&socketAddress, sizeof(socketAddress));
-  if (-1 == connect(udp_socket, &socketAddress, sizeof(socketAddress)))
+  if (-1 == ::connect(udp_socket, &socketAddress, sizeof(socketAddress)))
   {
     CHECK_PRINTER {
       CC3KPrinter->println(F("Connection error"));
@@ -1390,7 +1390,80 @@ void Adafruit_CC3000_Client::operator=(const Adafruit_CC3000_Client& other) {
   memcpy(_rx_buf, other._rx_buf, RXBUFFERSIZE);
 }
 
-bool Adafruit_CC3000_Client::connected(void) { 
+Adafruit_CC3000_Client::operator bool()
+{
+  return true;
+}
+
+int Adafruit_CC3000_Client::connect(const char *host, uint16_t port){
+  
+  // if (!_initialised) return 0;
+  // if (!ulCC3000Connected) return 0;
+  // if (!ulCC3000DHCP) return 0;
+
+  uint32_t ip = 0;
+
+  int16_t r = gethostbyname(host, strlen(host), &ip);
+
+  if (ip!=0 && r!=0)
+    return connect(ip, port);
+  else 
+    return 0;
+}
+
+int Adafruit_CC3000_Client::connect(IPAddress destIP, uint16_t destPort)
+{
+  bufsiz = 0;
+  _rx_buf_idx = 0;
+  sockaddr      socketAddress;
+  int32_t       tcp_socket;
+
+  // Create the socket(s)
+  //if (CC3KPrinter != 0) CC3KPrinter->print(F("Creating socket ... "));
+  tcp_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (-1 == tcp_socket)
+  {
+    CHECK_PRINTER {
+      CC3KPrinter->println(F("Failed to open socket"));
+    }
+    return 0;
+  }
+  //CC3KPrinter->print(F("DONE (socket ")); CC3KPrinter->print(tcp_socket); CC3KPrinter->println(F(")"));
+
+  // Try to open the socket
+  memset(&socketAddress, 0x00, sizeof(socketAddress));
+  socketAddress.sa_family = AF_INET;
+  socketAddress.sa_data[0] = (destPort & 0xFF00) >> 8;  // Set the Port Number
+  socketAddress.sa_data[1] = (destPort & 0x00FF);
+  socketAddress.sa_data[2] = destIP >> 24;
+  socketAddress.sa_data[3] = destIP >> 16;
+  socketAddress.sa_data[4] = destIP >> 8;
+  socketAddress.sa_data[5] = destIP;
+
+  CHECK_PRINTER {
+    CC3KPrinter->print(F("\n\rConnect to "));
+    CC3KPrinter->print(destIP);
+    CC3KPrinter->print(':');
+    CC3KPrinter->println(destPort);
+  }
+
+  //printHex((byte *)&socketAddress, sizeof(socketAddress));
+  //if (CC3KPrinter != 0) CC3KPrinter->print(F("Connecting socket ... "));
+  if (-1 == ::connect(tcp_socket, &socketAddress, sizeof(socketAddress)))
+  {
+    CHECK_PRINTER {
+      CC3KPrinter->println(F("Connection error"));
+    }
+    closesocket(tcp_socket);
+    return 0;
+  }
+  // if (CC3KPrinter != 0) CC3KPrinter->println(F("DONE"));
+
+  _socket = tcp_socket;
+  return 1;
+}
+
+uint8_t Adafruit_CC3000_Client::connected(void) { 
   if (_socket < 0) return false;
 
   if (! available() && closed_sockets[_socket] == true) {
@@ -1404,11 +1477,15 @@ bool Adafruit_CC3000_Client::connected(void) {
   else return true;  
 }
 
-int16_t Adafruit_CC3000_Client::write(const void *buf, uint16_t len, uint32_t flags)
+size_t Adafruit_CC3000_Client::write(const void *buf, uint16_t len, uint32_t flags)
 {
   return send(_socket, buf, len, flags);
 }
 
+size_t Adafruit_CC3000_Client::write(const uint8_t *buf, size_t len)
+{
+  return write(buf, len, 0);
+}
 
 size_t Adafruit_CC3000_Client::write(uint8_t c)
 {
@@ -1492,19 +1569,28 @@ size_t Adafruit_CC3000_Client::fastrprintln(char *str) {
   return r;
 }
 
-int16_t Adafruit_CC3000_Client::read(void *buf, uint16_t len, uint32_t flags) 
+int Adafruit_CC3000_Client::read(void *buf, uint16_t len, uint32_t flags) 
 {
   return recv(_socket, buf, len, flags);
 
 }
 
+int Adafruit_CC3000_Client::read(uint8_t *buf, size_t len) 
+{
+  return read(buf, len, 0);
+}
+
 int32_t Adafruit_CC3000_Client::close(void) {
   int32_t x = closesocket(_socket);
   _socket = -1;
   return x;
 }
 
-uint8_t Adafruit_CC3000_Client::read(void) 
+void Adafruit_CC3000_Client::stop(){
+  close();
+}
+
+int Adafruit_CC3000_Client::read(void) 
 {
   while ((bufsiz <= 0) || (bufsiz == _rx_buf_idx)) {
     cc3k_int_poll();
@@ -1523,7 +1609,7 @@ uint8_t Adafruit_CC3000_Client::read(void)
   return ret;
 }
 
-uint8_t Adafruit_CC3000_Client::available(void) {
+int Adafruit_CC3000_Client::available(void) {
   // not open!
   if (_socket < 0) return 0;
 
@@ -1548,6 +1634,28 @@ uint8_t Adafruit_CC3000_Client::available(void) {
   else return 0;  // no data is available
 }
 
+void Adafruit_CC3000_Client::flush(){
+  
+}
+
+int Adafruit_CC3000_Client::peek(){
+  while ((bufsiz <= 0) || (bufsiz == _rx_buf_idx)) {
+    cc3k_int_poll();
+    // buffer in some more data
+    bufsiz = recv(_socket, _rx_buf, sizeof(_rx_buf), 0);
+    if (bufsiz == -57) {
+      close();
+      return 0;
+    }
+    //if (CC3KPrinter != 0) { CC3KPrinter->println("Read "); CC3KPrinter->print(bufsiz); CC3KPrinter->println(" bytes"); }
+    _rx_buf_idx = 0;
+  }
+  uint8_t ret = _rx_buf[_rx_buf_idx];
+
+  //if (CC3KPrinter != 0) { CC3KPrinter->print("("); CC3KPrinter->write(ret); CC3KPrinter->print(")"); }
+  return ret;
+}
+
 void Adafruit_CC3000::setPrinter(Print* p) {
   CC3KPrinter = p;
 }
diff --git a/Adafruit_CC3000.h b/Adafruit_CC3000.h
@@ -29,6 +29,7 @@
 #include "utility/wlan.h"
 #include "utility/netapp.h"
 #include "ccspi.h"
+#include "Client.h"
 
 #if defined(__arm__) && defined(__SAM3X8E__) // Arduino Due
   #define SPI_CLOCK_DIVIDER 6 // used to set the speed for the SPI bus; 6 == 14 Mhz on the Arduino Due
@@ -81,7 +82,7 @@ typedef enum
 
 class Adafruit_CC3000;
 
-class Adafruit_CC3000_Client : public Print {
+class Adafruit_CC3000_Client : public Client {
  public:
   Adafruit_CC3000_Client(uint16_t s);
   Adafruit_CC3000_Client(void);
@@ -91,7 +92,10 @@ class Adafruit_CC3000_Client : public Print {
   // NOTE: If public functions below are added/modified/removed please make sure to update the 
   // Adafruit_CC3000_ClientRef class to match!
 
-  bool connected(void);
+  int connect(IPAddress ip, uint16_t port);
+  int connect(const char *host, uint16_t port);
+
+  uint8_t connected(void);
   size_t write(uint8_t c);
 
   size_t fastrprint(const char *str);
@@ -101,11 +105,18 @@ class Adafruit_CC3000_Client : public Print {
   size_t fastrprint(const __FlashStringHelper *ifsh);
   size_t fastrprintln(const __FlashStringHelper *ifsh);
 
-  int16_t write(const void *buf, uint16_t len, uint32_t flags = 0);
-  int16_t read(void *buf, uint16_t len, uint32_t flags = 0);
-  uint8_t read(void);
+  size_t write(const void *buf, uint16_t len, uint32_t flags = 0);
+  int read(void *buf, uint16_t len, uint32_t flags = 0);
+  int read(void);
   int32_t close(void);
-  uint8_t available(void);
+  int available(void);
+
+  int read(uint8_t *buf, size_t size);
+  size_t write(const uint8_t *buf, size_t size);
+  int peek();
+  void flush();
+  void stop();
+  operator bool();
 
   uint8_t _rx_buf[RXBUFFERSIZE], _rx_buf_idx;
   int16_t bufsiz;
diff --git a/Adafruit_CC3000_Server.cpp b/Adafruit_CC3000_Server.cpp
@@ -39,7 +39,17 @@ Adafruit_CC3000_ClientRef::operator bool() {
 // Below are wrappers around the public client functions.  These hide the fact that users
 // are dealing with a reference to a client instance and allow code to be written using
 // value semantics like in the Ethernet library.
-bool Adafruit_CC3000_ClientRef::connected(void) {
+int Adafruit_CC3000_ClientRef::connect(IPAddress ip, uint16_t port) {
+  HANDLE_NULL(_client, false);
+  return _client->connect(ip, port);
+}
+
+int Adafruit_CC3000_ClientRef::connect(const char *host, uint16_t port) {
+  HANDLE_NULL(_client, false);
+  return _client->connect(host, port);
+}
+
+uint8_t Adafruit_CC3000_ClientRef::connected(void) {
   HANDLE_NULL(_client, false);
   return _client->connected();
 }
@@ -79,17 +89,17 @@ size_t Adafruit_CC3000_ClientRef::fastrprintln(const __FlashStringHelper *ifsh)
   return _client->fastrprintln(ifsh);
 }
 
-int16_t Adafruit_CC3000_ClientRef::write(const void *buf, uint16_t len, uint32_t flags) {
+size_t Adafruit_CC3000_ClientRef::write(const void *buf, uint16_t len, uint32_t flags) {
   HANDLE_NULL(_client, 0);
   return _client->write(buf, len, flags);
 }
 
-int16_t Adafruit_CC3000_ClientRef::read(void *buf, uint16_t len, uint32_t flags) {
+int Adafruit_CC3000_ClientRef::read(void *buf, uint16_t len, uint32_t flags) {
   HANDLE_NULL(_client, 0);
   return _client->read(buf, len, flags);
 }
 
-uint8_t Adafruit_CC3000_ClientRef::read(void) {
+int Adafruit_CC3000_ClientRef::read(void) {
   HANDLE_NULL(_client, 0);
   return _client->read();
 }
@@ -99,11 +109,34 @@ int32_t Adafruit_CC3000_ClientRef::close(void) {
   return _client->close();
 }
 
-uint8_t Adafruit_CC3000_ClientRef::available(void) {
+int Adafruit_CC3000_ClientRef::available(void) {
   HANDLE_NULL(_client, 0);
   return _client->available();
 }
 
+int Adafruit_CC3000_ClientRef::read(uint8_t *buf, size_t size) {
+  HANDLE_NULL(_client, 0);
+  return _client->read(buf, size);
+}
+
+size_t Adafruit_CC3000_ClientRef::write(const uint8_t *buf, size_t size) {
+  HANDLE_NULL(_client, 0);
+  return _client->write(buf, size);
+}
+
+int Adafruit_CC3000_ClientRef::peek() {
+  HANDLE_NULL(_client, 0);
+  return _client->peek();
+}
+
+void Adafruit_CC3000_ClientRef::flush() {
+  if (_client != NULL) _client->flush();
+}
+
+void Adafruit_CC3000_ClientRef::stop() {
+  if (_client != NULL) _client->stop();
+}
+
 
 /**************************************************************************/
 /*
diff --git a/Adafruit_CC3000_Server.h b/Adafruit_CC3000_Server.h
@@ -24,7 +24,7 @@
 
 #include "Adafruit_CC3000.h"
 
-#include "Print.h"
+#include "Client.h"
 #include "Server.h"
 
 // Assume 4 sockets available, 1 of which is used for listening, so at most 3 
@@ -35,14 +35,17 @@
 // and acts like a client instance value.  This is done to mimic the semantics 
 // of the Ethernet library, without running into problems allowing client buffers
 // to be copied and get out of sync.
-class Adafruit_CC3000_ClientRef : public Print {
+class Adafruit_CC3000_ClientRef : public Client {
  public:
   Adafruit_CC3000_ClientRef(Adafruit_CC3000_Client* client);
   // Return true if the referenced client is connected.  This is provided for
   // compatibility with Ethernet library code.
   operator bool();
   // Below are all the public methods of the client class:
-  bool connected(void);
+  int connect(IPAddress ip, uint16_t port);
+  int connect(const char *host, uint16_t port);
+
+  uint8_t connected(void);
   size_t write(uint8_t c);
 
   size_t fastrprint(const char *str);
@@ -52,11 +55,17 @@ class Adafruit_CC3000_ClientRef : public Print {
   size_t fastrprint(const __FlashStringHelper *ifsh);
   size_t fastrprintln(const __FlashStringHelper *ifsh);
 
-  int16_t write(const void *buf, uint16_t len, uint32_t flags = 0);
-  int16_t read(void *buf, uint16_t len, uint32_t flags = 0);
-  uint8_t read(void);
+  size_t write(const void *buf, uint16_t len, uint32_t flags = 0);
+  int read(void *buf, uint16_t len, uint32_t flags = 0);
+  int read(void);
   int32_t close(void);
-  uint8_t available(void);
+  int available(void);
+
+  int read(uint8_t *buf, size_t size);
+  size_t write(const uint8_t *buf, size_t size);
+  int peek();
+  void flush();
+  void stop();
 
  private:
   // Hide the fact that users are really dealing with a pointer to a client
