From fbdf3a18ee84ae93f2f3227a557345ad5aa5acbf Mon Sep 17 00:00:00 2001 From: ntruchsess Date: Fri, 6 Dec 2013 19:05:31 +0100 Subject: [PATCH] remove all Changes besides operator== --- hardware/arduino/cores/arduino/Client.h | 3 --- libraries/Ethernet/EthernetClient.cpp | 17 ----------------- libraries/Ethernet/EthernetClient.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/hardware/arduino/cores/arduino/Client.h b/hardware/arduino/cores/arduino/Client.h index 3f686f942..ea134838a 100644 --- a/hardware/arduino/cores/arduino/Client.h +++ b/hardware/arduino/cores/arduino/Client.h @@ -19,9 +19,6 @@ public: virtual void stop() = 0; virtual uint8_t connected() = 0; virtual operator bool() = 0; - virtual uint16_t localPort() = 0; - virtual IPAddress remoteIP() = 0; - virtual uint16_t remotePort() = 0; protected: uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); }; }; diff --git a/libraries/Ethernet/EthernetClient.cpp b/libraries/Ethernet/EthernetClient.cpp index c14e60024..ef3d19b8b 100644 --- a/libraries/Ethernet/EthernetClient.cpp +++ b/libraries/Ethernet/EthernetClient.cpp @@ -167,20 +167,3 @@ EthernetClient::operator bool() { bool EthernetClient::operator==(const EthernetClient& rhs) { return _sock == rhs._sock && _sock != MAX_SOCK_NUM && rhs._sock != MAX_SOCK_NUM; } - -uint16_t EthernetClient::localPort() { - if (_sock == MAX_SOCK_NUM) return 0; - return W5100.readSnPORT(_sock); -} - -IPAddress EthernetClient::remoteIP() { - if (_sock == MAX_SOCK_NUM) return IPAddress(0,0,0,0); - uint32_t _destaddress; - W5100.readSnDIPR(_sock,(uint8_t*) &_destaddress); - return IPAddress(_destaddress); -} - -uint16_t EthernetClient::remotePort() { - if (_sock == MAX_SOCK_NUM) return 0; - return W5100.readSnDPORT(_sock); -} diff --git a/libraries/Ethernet/EthernetClient.h b/libraries/Ethernet/EthernetClient.h index 8d51a49f2..e2037c3b2 100644 --- a/libraries/Ethernet/EthernetClient.h +++ b/libraries/Ethernet/EthernetClient.h @@ -25,9 +25,6 @@ public: virtual uint8_t connected(); virtual operator bool(); virtual bool operator==(const EthernetClient&); - virtual uint16_t localPort(); - virtual IPAddress remoteIP(); - virtual uint16_t remotePort(); friend class EthernetServer;