From 3f7d2c8977368de7b2309a511c36d2a5d802f7c9 Mon Sep 17 00:00:00 2001
From: amcewen <amcewen@bcs.org.uk>
Date: Mon, 29 Aug 2011 22:36:28 +0100
Subject: [PATCH] Changed names of the Ethernet classes: Client ->
 EthernetClient, NetClient -> Client, and basic testing performed

---
 cores/arduino/{NetClient.h => Client.h} | 10 ++++++----
 cores/arduino/NetServer.h               | 11 -----------
 cores/arduino/Server.h                  |  9 +++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename cores/arduino/{NetClient.h => Client.h} (77%)
 delete mode 100644 cores/arduino/NetServer.h
 create mode 100644 cores/arduino/Server.h

diff --git a/cores/arduino/NetClient.h b/cores/arduino/Client.h
similarity index 77%
rename from cores/arduino/NetClient.h
rename to cores/arduino/Client.h
index 35bfa0a..ed9e9b4 100644
--- a/cores/arduino/NetClient.h
+++ b/cores/arduino/Client.h
@@ -1,10 +1,10 @@
-#ifndef netclient_h
-#define netclient_h
+#ifndef client_h
+#define client_h
 #include "Print.h"
-#include "NetClient.h"
+#include "Stream.h"
 #include "IPAddress.h"
 
-class NetClient : public Stream {
+class Client : public Stream {
 
 public:
   virtual int connect(IPAddress ip, uint16_t port) =0;
@@ -20,6 +20,8 @@ public:
   virtual void stop() = 0;
   virtual uint8_t connected() = 0;
   virtual operator bool() = 0;
+protected:
+  uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
 };
 
 #endif
diff --git a/cores/arduino/NetServer.h b/cores/arduino/NetServer.h
deleted file mode 100644
index 91f4848..0000000
--- a/cores/arduino/NetServer.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef netserver_h
-#define netserver_h
-
-class NetClient;
-
-class NetServer {
-public:
-  virtual void begin() =0;
-};
-
-#endif
diff --git a/cores/arduino/Server.h b/cores/arduino/Server.h
new file mode 100644
index 0000000..edab726
--- /dev/null
+++ b/cores/arduino/Server.h
@@ -0,0 +1,9 @@
+#ifndef server_h
+#define server_h
+
+class Server {
+public:
+  virtual void begin() =0;
+};
+
+#endif