From db605dd18b11ecfb5cd9f92c721c52cb70543384 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Mon, 1 Jun 2009 08:32:11 +0000
Subject: First integration of the Arduino code in Processing 5503:
 PreProcessor and Compiler have been integrated with changes to the Sketch.
 Compilation still has problems (Thread error on success, and can't handle
 non-pde files in a sketch). Modified the Mac OS X make.sh to copy the
 hardware, avr tools, and example over. Removing some of the antlr stuff.
 Disabling the Commander (command-line execution) for now. Added Library,
 LibraryManager, and Target. Added support for prefixed preferences (e.g. for
 boards and programmers).

---
 libraries/Ethernet/Client.cpp | 140 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 libraries/Ethernet/Client.cpp

(limited to 'libraries/Ethernet/Client.cpp')

diff --git a/libraries/Ethernet/Client.cpp b/libraries/Ethernet/Client.cpp
new file mode 100644
index 0000000..ebbb08d
--- /dev/null
+++ b/libraries/Ethernet/Client.cpp
@@ -0,0 +1,140 @@
+extern "C" {
+  #include "types.h"
+  #include "w5100.h"
+  #include "socket.h"
+  #include "string.h"
+}
+
+#include "WProgram.h"
+
+#include "Ethernet.h"
+#include "Client.h"
+#include "Server.h"
+
+uint16_t Client::_srcport = 0;
+
+Client::Client(uint8_t sock) {
+  _sock = sock;
+}
+
+Client::Client(uint8_t *ip, uint16_t port) {
+  _ip = ip;
+  _port = port;  
+  _sock = 255;
+}
+
+uint8_t Client::connect() {
+  if (_sock != 255)
+    return 0;
+  
+  for (int i = 0; i < MAX_SOCK_NUM; i++) {
+    uint8_t s = getSn_SR(i);
+    if (s == SOCK_CLOSED || s == SOCK_FIN_WAIT) {
+      _sock = i;
+      break;
+    }
+  }
+  
+  if (_sock == 255)
+    return 0;
+    
+  _srcport++;
+  if (_srcport + 1024 == 0) _srcport = 0;
+  socket(_sock, Sn_MR_TCP, _srcport + 1024, 0);
+  
+  if (!::connect(_sock, _ip, _port)) {
+    _sock = 255;
+    return 0;
+  }
+    
+  while (status() != SOCK_ESTABLISHED) {
+    delay(1);
+    if (status() == SOCK_CLOSED) {
+      _sock = 255;
+      return 0;
+    }
+  }
+  
+  return 1;
+}
+
+void Client::write(uint8_t b) {
+  if (_sock != 255)
+    send(_sock, &b, 1);
+}
+
+void Client::write(const char *str) {
+  if (_sock != 255)
+    send(_sock, (const uint8_t *)str, strlen(str));
+}
+
+void Client::write(const uint8_t *buf, size_t size) {
+  if (_sock != 255)
+    send(_sock, buf, size);
+}
+
+int Client::available() {
+  if (_sock != 255)
+    return getSn_RX_RSR(_sock);
+  return 0;
+}
+
+int Client::read() {
+  uint8_t b;
+  if (!available())
+    return -1;
+  recv(_sock, &b, 1);
+  return b;
+}
+
+void Client::flush() {
+  while (available())
+    read();
+}
+
+void Client::stop() {
+  if (_sock == 255)
+    return;
+  
+  // attempt to close the connection gracefully (send a FIN to other side)
+  disconnect(_sock);
+  unsigned long start = millis();
+  
+  // wait a second for the connection to close
+  while (status() != SOCK_CLOSED && millis() - start < 1000)
+    delay(1);
+    
+  // if it hasn't closed, close it forcefully
+  if (status() != SOCK_CLOSED)
+    close(_sock);
+  
+  EthernetClass::_server_port[_sock] = 0;
+  _sock = 255;
+}
+
+uint8_t Client::connected() {
+  uint8_t s = status();
+  return !(s == SOCK_LISTEN || s == SOCK_CLOSED || s == SOCK_FIN_WAIT ||
+    (s == SOCK_CLOSE_WAIT && !available()));
+}
+
+uint8_t Client::status() {
+  return getSn_SR(_sock);
+}
+
+// the next three functions are a hack so we can compare the client returned
+// by Server::available() to null, or use it as the condition in an
+// if-statement.  this lets us stay compatible with the Processing network
+// library.
+
+uint8_t Client::operator==(int p) {
+  return _sock == 255;
+}
+
+uint8_t Client::operator!=(int p) {
+  return _sock != 255;
+}
+
+Client::operator bool() {
+  return _sock != 255;
+}
-- 
cgit v1.2.3-18-g5258


From c3baee9f63f7876bb30d128ee6e59cc0266312a9 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Mon, 15 Jun 2009 20:11:13 +0000
Subject: Fixing Client::connected() and Client::status() to return reasonable
 values when the Client isn't associated with a valid socket: issue #34.

---
 libraries/Ethernet/Client.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'libraries/Ethernet/Client.cpp')

diff --git a/libraries/Ethernet/Client.cpp b/libraries/Ethernet/Client.cpp
index ebbb08d..0511c7b 100644
--- a/libraries/Ethernet/Client.cpp
+++ b/libraries/Ethernet/Client.cpp
@@ -113,13 +113,21 @@ void Client::stop() {
 }
 
 uint8_t Client::connected() {
-  uint8_t s = status();
-  return !(s == SOCK_LISTEN || s == SOCK_CLOSED || s == SOCK_FIN_WAIT ||
-    (s == SOCK_CLOSE_WAIT && !available()));
+  if (_sock == 255) {
+    return 0;
+  } else {
+    uint8_t s = status();
+    return !(s == SOCK_LISTEN || s == SOCK_CLOSED || s == SOCK_FIN_WAIT ||
+      (s == SOCK_CLOSE_WAIT && !available()));
+  }
 }
 
 uint8_t Client::status() {
-  return getSn_SR(_sock);
+  if (_sock == 255) {
+    return SOCK_CLOSED;
+  } else {
+    return getSn_SR(_sock);
+  }
 }
 
 // the next three functions are a hack so we can compare the client returned
-- 
cgit v1.2.3-18-g5258