Merge remote-tracking branch 'amcewen/wifly_integration' into new-extension

Author: damellis

Dhcp.cpp

@@ -271,11 +271,19 @@ uint8_t DhcpClass::parseDHCPResponse(unsigned long responseTimeout, uint32_t& tr
                 case routersOnSubnet :
                     opt_len = _dhcpUdpSocket.read();
                     _dhcpUdpSocket.read(_dhcpGatewayIp, 4);
+                    for (int i = 0; i < opt_len-4; i++)
+                    {
+                        _dhcpUdpSocket.read();
+                    }
                     break;
 
                 case dns :
                     opt_len = _dhcpUdpSocket.read();
                     _dhcpUdpSocket.read(_dhcpDnsServerIp, 4);
+                    for (int i = 0; i < opt_len-4; i++)
+                    {
+                        _dhcpUdpSocket.read();
+                    }
                     break;
 
                 case dhcpServerIdentifier :

Dhcp.h

@@ -4,7 +4,7 @@
 #ifndef Dhcp_h
 #define Dhcp_h
 
-#include "Udp.h"
+#include "EthernetUdp.h"
 
 /* DHCP state machine. */
 #define STATE_DHCP_START 0
@@ -139,7 +139,7 @@ class DhcpClass {
   uint8_t  _dhcpGatewayIp[4];
   uint8_t  _dhcpDhcpServerIp[4];
   uint8_t  _dhcpDnsServerIp[4];
-  UDP _dhcpUdpSocket;
+  EthernetUDP _dhcpUdpSocket;
 
   void presend_DHCP();
   void send_DHCP_MESSAGE(uint8_t, uint16_t);

Dns.cpp

@@ -3,7 +3,7 @@
 // Released under Apache License, version 2.0
 
 #include "w5100.h"
-#include "Udp.h"
+#include "EthernetUdp.h"
 #include "util.h"
 
 #include "Dns.h"

Dns.h

@@ -5,7 +5,7 @@
 #ifndef DNSClient_h
 #define DNSClient_h
 
-#include <Udp.h>
+#include <EthernetUdp.h>
 
 class DNSClient
 {
@@ -35,7 +35,7 @@ class DNSClient
 
     IPAddress iDNSServer;
     uint16_t iRequestId;
-    UDP iUdp;
+    EthernetUDP iUdp;
 };
 
 #endif

Ethernet.cpp

@@ -33,27 +33,37 @@ int EthernetClass::begin(uint8_t *mac_address)
 }
 
 void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip)
+{
+  // Assume the DNS server will be the machine on the same network as the local IP
+  // but with last octet being '1'
+  IPAddress dns_server = local_ip;
+  dns_server[3] = 1;
+  begin(mac_address, local_ip, dns_server);
+}
+
+void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server)
 {
   // Assume the gateway will be the machine on the same network as the local IP
   // but with last octet being '1'
   IPAddress gateway = local_ip;
   gateway[3] = 1;
-  begin(mac_address, local_ip, gateway);
+  begin(mac_address, local_ip, dns_server, gateway);
 }
 
-void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress gateway)
+void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway)
 {
   IPAddress subnet(255, 255, 255, 0);
-  begin(mac_address, local_ip, gateway, subnet);
+  begin(mac_address, local_ip, dns_server, gateway, subnet);
 }
 
-void EthernetClass::begin(uint8_t *mac, IPAddress local_ip, IPAddress gateway, IPAddress subnet)
+void EthernetClass::begin(uint8_t *mac, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet)
 {
   W5100.init();
   W5100.setMACAddress(mac);
   W5100.setIPAddress(local_ip._address);
   W5100.setGatewayIp(gateway._address);
   W5100.setSubnetMask(subnet._address);
+  _dnsServerAddress = dns_server;
 }
 
 IPAddress EthernetClass::localIP()

Ethernet.h

@@ -4,8 +4,8 @@
 #include <inttypes.h>
 //#include "w5100.h"
 #include "IPAddress.h"
-#include "Client.h"
-#include "Server.h"
+#include "EthernetClient.h"
+#include "EthernetServer.h"
 
 #define MAX_SOCK_NUM 4
 
@@ -20,16 +20,17 @@ class EthernetClass {
   // Returns 0 if the DHCP configuration failed, and 1 if it succeeded
   int begin(uint8_t *mac_address);
   void begin(uint8_t *mac_address, IPAddress local_ip);
-  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress gateway);
-  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress gateway, IPAddress subnet);
+  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server);
+  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway);
+  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet);
 
   IPAddress localIP();
   IPAddress subnetMask();
   IPAddress gatewayIP();
   IPAddress dnsServerIP();
 
-  friend class Client;
-  friend class Server;
+  friend class EthernetClient;
+  friend class EthernetServer;
 };
 
 extern EthernetClass Ethernet;

Client.cpp renamed to EthernetClient.cpp

@@ -8,19 +8,19 @@ extern "C" {
 #include "Arduino.h"
 
 #include "Ethernet.h"
-#include "Client.h"
-#include "Server.h"
+#include "EthernetClient.h"
+#include "EthernetServer.h"
 #include "Dns.h"
 
-uint16_t Client::_srcport = 1024;
+uint16_t EthernetClient::_srcport = 1024;
 
-Client::Client() : _sock(MAX_SOCK_NUM) {
+EthernetClient::EthernetClient() : _sock(MAX_SOCK_NUM) {
 }
 
-Client::Client(uint8_t sock) : _sock(sock) {
+EthernetClient::EthernetClient(uint8_t sock) : _sock(sock) {
 }
 
-int Client::connect(const char* host, uint16_t port) {
+int EthernetClient::connect(const char* host, uint16_t port) {
   // Look up the host first
   int ret = 0;
   DNSClient dns;
@@ -35,7 +35,7 @@ int Client::connect(const char* host, uint16_t port) {
   }
 }
 
-int Client::connect(IPAddress ip, uint16_t port) {
+int EthernetClient::connect(IPAddress ip, uint16_t port) {
   if (_sock != MAX_SOCK_NUM)
     return 0;
 
@@ -54,7 +54,7 @@ int Client::connect(IPAddress ip, uint16_t port) {
   if (_srcport == 0) _srcport = 1024;
   socket(_sock, SnMR::TCP, _srcport, 0);
 
-  if (!::connect(_sock, ip.raw_address(), port)) {
+  if (!::connect(_sock, rawIPAddress(ip), port)) {
     _sock = MAX_SOCK_NUM;
     return 0;
   }
@@ -70,15 +70,15 @@ int Client::connect(IPAddress ip, uint16_t port) {
   return 1;
 }
 
-size_t Client::write(uint8_t b) {
+size_t EthernetClient::write(uint8_t b) {
   return write(&b, 1);
 }
 
-size_t Client::write(const char *str) {
+size_t EthernetClient::write(const char *str) {
   return write((const uint8_t *) str, strlen(str));
 }
 
-size_t Client::write(const uint8_t *buf, size_t size) {
+size_t EthernetClient::write(const uint8_t *buf, size_t size) {
   if (_sock == MAX_SOCK_NUM) {
     setWriteError();
     return 0;
@@ -90,13 +90,13 @@ size_t Client::write(const uint8_t *buf, size_t size) {
   return size;
 }
 
-int Client::available() {
+int EthernetClient::available() {
   if (_sock != MAX_SOCK_NUM)
     return W5100.getRXReceivedSize(_sock);
   return 0;
 }
 
-int Client::read() {
+int EthernetClient::read() {
   uint8_t b;
   if ( recv(_sock, &b, 1) > 0 )
   {
@@ -110,11 +110,11 @@ int Client::read() {
   }
 }
 
-int Client::read(uint8_t *buf, size_t size) {
+int EthernetClient::read(uint8_t *buf, size_t size) {
   return recv(_sock, buf, size);
 }
 
-int Client::peek() {
+int EthernetClient::peek() {
   uint8_t b;
   // Unlike recv, peek doesn't check to see if there's any data available, so we must
   if (!available())
@@ -123,12 +123,12 @@ int Client::peek() {
   return b;
 }
 
-void Client::flush() {
+void EthernetClient::flush() {
   while (available())
     read();
 }
 
-void Client::stop() {
+void EthernetClient::stop() {
   if (_sock == MAX_SOCK_NUM)
     return;
 
@@ -148,22 +148,22 @@ void Client::stop() {
   _sock = MAX_SOCK_NUM;
 }
 
-uint8_t Client::connected() {
+uint8_t EthernetClient::connected() {
   if (_sock == MAX_SOCK_NUM) return 0;
 
   uint8_t s = status();
   return !(s == SnSR::LISTEN || s == SnSR::CLOSED || s == SnSR::FIN_WAIT ||
     (s == SnSR::CLOSE_WAIT && !available()));
 }
 
-uint8_t Client::status() {
+uint8_t EthernetClient::status() {
   if (_sock == MAX_SOCK_NUM) return SnSR::CLOSED;
   return W5100.readSnSR(_sock);
 }
 
 // the next function allows us to use the client returned by
-// Server::available() as the condition in an if-statement.
+// EthernetServer::available() as the condition in an if-statement.
 
-Client::operator bool() {
+EthernetClient::operator bool() {
   return _sock != MAX_SOCK_NUM;
 }

Client.h renamed to EthernetClient.h

@@ -1,17 +1,19 @@
-#ifndef client_h
-#define client_h
+#ifndef ethernetclient_h
+#define ethernetclient_h
 #include "Arduino.h"	
 #include "Print.h"
+#include "Client.h"
+#include "IPAddress.h"
 
-class Client : public Stream {
+class EthernetClient : public Client {
 
 public:
-  Client();
-  Client(uint8_t sock);
+  EthernetClient();
+  EthernetClient(uint8_t sock);
 
   uint8_t status();
-  int connect(IPAddress ip, uint16_t port);
-  int connect(const char *host, uint16_t port);
+  virtual int connect(IPAddress ip, uint16_t port);
+  virtual int connect(const char *host, uint16_t port);
   virtual size_t write(uint8_t);
   virtual size_t write(const char *str);
   virtual size_t write(const uint8_t *buf, size_t size);
@@ -20,11 +22,11 @@ class Client : public Stream {
   virtual int read(uint8_t *buf, size_t size);
   virtual int peek();
   virtual void flush();
-  void stop();
-  uint8_t connected();
-  operator bool();
+  virtual void stop();
+  virtual uint8_t connected();
+  virtual operator bool();
 
-  friend class Server;
+  friend class EthernetServer;
 
 private:
   static uint16_t _srcport;