Implement remoteIP() in Ethernet and WiFi

Author: facchinm

libraries/Ethernet/src/EthernetClient.cpp

@@ -31,6 +31,7 @@ int arduino::EthernetClient::connect(SocketAddress socketAddress) {
 	}
 	//sock->sigio(mbed::callback(this, &EthernetClient::getStatus));
 	//sock->set_blocking(false);
+	address = socketAddress;
 	sock->set_timeout(SOCKET_TIMEOUT);		
 	nsapi_error_t returnCode = static_cast<TCPSocket*>(sock)->connect(socketAddress);
 	return returnCode == NSAPI_ERROR_OK ? 1 : 0;
@@ -134,7 +135,7 @@ uint8_t arduino::EthernetClient::connected() {
 }
 
 IPAddress arduino::EthernetClient::remoteIP() {
-	return IPAddress((uint32_t)0);
+	return Ethernet.ipAddressFromSocketAddress(address);
 }
 
 uint16_t arduino::EthernetClient::remotePort() {

libraries/Ethernet/src/EthernetClient.h

@@ -80,6 +80,7 @@ class EthernetClient : public arduino::Client {
   RingBufferN<256> rxBuffer;
   uint8_t _status;
   mbed::Callback<int(void)> beforeConnect;
+  SocketAddress address;
 
   void getStatus();
 };

libraries/Ethernet/src/EthernetUdp.cpp

@@ -1,6 +1,6 @@
 #include "EthernetUdp.h"
 
-extern arduino::EthernetClass WiFi;
+extern arduino::EthernetClass Ethernet;
 
 #ifndef ETHERNET_UDP_BUFFER_SIZE
 #define ETHERNET_UDP_BUFFER_SIZE        508
@@ -198,4 +198,4 @@ int arduino::EthernetUDP::peek(){
   }
 
   return _current_packet[0];
-}
+}

libraries/WiFi/src/WiFiClient.cpp

@@ -37,7 +37,8 @@ int arduino::WiFiClient::connect(SocketAddress socketAddress) {
 	}
 	//sock->sigio(mbed::callback(this, &WiFiClient::getStatus));
 	//sock->set_blocking(false);
-	sock->set_timeout(SOCKET_TIMEOUT);		
+	address = socketAddress;
+	sock->set_timeout(SOCKET_TIMEOUT);
 	nsapi_error_t returnCode = static_cast<TCPSocket*>(sock)->connect(socketAddress);
 	return returnCode == NSAPI_ERROR_OK ? 1 : 0;
 }
@@ -140,7 +141,7 @@ uint8_t arduino::WiFiClient::connected() {
 }
 
 IPAddress arduino::WiFiClient::remoteIP() {
-	return IPAddress((uint32_t)0);
+	return WiFi.ipAddressFromSocketAddress(address);
 }
 
 uint16_t arduino::WiFiClient::remotePort() {

libraries/WiFi/src/WiFiClient.h

@@ -81,6 +81,7 @@ class WiFiClient : public arduino::Client {
   RingBufferN<256> rxBuffer;
   uint8_t _status;
   mbed::Callback<int(void)> beforeConnect;
+  SocketAddress address;
 
   void getStatus();
 };