Merge branch 'master' of github.com:arduino/Arduino

Author: cmaglie

hardware/arduino/cores/arduino/Client.h

@@ -19,9 +19,6 @@ class Client : public Stream {
   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(); };
 };

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);
-}

libraries/Ethernet/EthernetClient.h

@@ -25,9 +25,7 @@ class EthernetClient : public Client {
   virtual uint8_t connected();
   virtual operator bool();
   virtual bool operator==(const EthernetClient&);
-  virtual uint16_t localPort();
-  virtual IPAddress remoteIP();
-  virtual uint16_t remotePort();
+  virtual bool operator!=(const EthernetClient& rhs) { return !this->operator==(rhs); };
 
   friend class EthernetServer;
 

libraries/Ethernet/examples/AdvancedChatServer/AdvancedChatServer.ino

@@ -75,22 +75,15 @@ void loop() {
       for (byte i=0;i<4;i++) {
         if (!clients[i] && clients[i]!=client) {
           clients[i] = client;
+          // clead out the input buffer:
+          client.flush();
+          Serial.println("We have a new client");
+          client.print("Hello, client number: ");
+          client.print(i);
+          client.println();
           break;
         }
       }
-
-      // clead out the input buffer:
-      client.flush();
-      Serial.println("We have a new client");
-      client.println("Hello, client!");
-      client.print("my IP: ");
-      client.println(Ethernet.localIP());
-      client.print("my port: ");
-      client.println(client.localPort());
-      client.print("your IP: ");
-      client.println(client.remoteIP());
-      client.print("your port: ");
-      client.println(client.remotePort());
     }
 
     if (client.available() > 0) {