Merge pull request #2 from ARMmbed/master

catch up from armmbed

Author: ConradBraam

UNITTESTS/features/netsocket/InternetSocket/test_InternetSocket.cpp

@@ -24,10 +24,14 @@ extern std::list<uint32_t> eventFlagsStubNextRetval;
 // InternetSocket is an abstract class, so we have to test it via its child.
 class stubInternetSocket : public InternetSocket {
 protected:
-    nsapi_error_t return_value = 0;
+    nsapi_error_t return_value;
 public:
+    stubInternetSocket() {
+        return_value = 0;
+    }
     virtual nsapi_error_t connect(const SocketAddress &address)
     {
+        _remote_peer = address;
         return return_value;
     }
     virtual nsapi_size_or_error_t send(const void *data, nsapi_size_t size)
@@ -227,3 +231,25 @@ TEST_F(TestInternetSocket, sigio)
     socket->close(); // Trigger event;
     EXPECT_EQ(callback_is_called, true);
 }
+
+TEST_F(TestInternetSocket, getpeername)
+{
+    SocketAddress peer;
+    SocketAddress zero;
+
+    stack.return_value = NSAPI_ERROR_OK;
+
+    EXPECT_EQ(socket->getpeername(&peer), NSAPI_ERROR_NO_SOCKET);
+
+    socket->open((NetworkStack *)&stack);
+    socket->connect(zero);
+
+    EXPECT_EQ(socket->getpeername(&peer), NSAPI_ERROR_NO_CONNECTION);
+
+    const nsapi_addr_t saddr = {NSAPI_IPv4, {192, 168, 0, 1} };
+    const SocketAddress remote(saddr, 1024);
+    socket->connect(remote);
+
+    EXPECT_EQ(socket->getpeername(&peer), NSAPI_ERROR_OK);
+    EXPECT_EQ(remote, peer);
+}

UNITTESTS/stubs/NetworkStack_stub.h

@@ -24,7 +24,12 @@
 class NetworkStackstub : public NetworkStack {
 public:
     std::list<nsapi_error_t> return_values;
-    nsapi_error_t return_value = 0;
+    nsapi_error_t return_value;
+
+    NetworkStackstub() {
+        return_value = 0;
+    }
+
     virtual const char *get_ip_address()
     {
         return "127.0.0.1";

features/netsocket/InternetSocket.cpp

@@ -214,3 +214,15 @@ void InternetSocket::attach(Callback<void()> callback)
 {
     sigio(callback);
 }
+
+nsapi_error_t InternetSocket::getpeername(SocketAddress *address)
+{
+    if (!_socket) {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
+    if (!_remote_peer) {
+        return NSAPI_ERROR_NO_CONNECTION;
+    }
+    *address = _remote_peer;
+    return NSAPI_ERROR_OK;
+}

features/netsocket/InternetSocket.h

@@ -117,6 +117,10 @@ class InternetSocket : public Socket {
      */
     virtual void sigio(mbed::Callback<void()> func);
 
+    /** @copydoc Socket::getpeername
+     */
+    virtual nsapi_error_t getpeername(SocketAddress *address);
+
     /** Register a callback on state change of the socket.
      *
      *  @see Socket::sigio

features/netsocket/Socket.h

@@ -254,6 +254,17 @@ class Socket {
      *  @return         NSAPI_ERROR_OK on success, negative error code on failure
      */
     virtual nsapi_error_t listen(int backlog = 1) = 0;
+
+    /** Get the remote-end peer associated with this socket.
+     *
+     * Copy the remote peer address to a SocketAddress structure pointed by
+     * address parameter. Socket must be connected to have a peer address
+     * associated.
+     *
+     *  @param address  Pointer to SocketAddress structure.
+     *  @return         NSAPI_ERROR_OK on success, negative error code on failure.
+     */
+    virtual nsapi_error_t getpeername(SocketAddress *address) = 0;
 };
 
 

features/netsocket/TLSSocketWrapper.cpp

@@ -291,16 +291,16 @@ nsapi_size_or_error_t TLSSocketWrapper::recvfrom(SocketAddress *address, void *d
     return recv(data, size);
 }
 
-void TLSSocketWrapper::print_mbedtls_error(const char *name, int err)
+void TLSSocketWrapper::print_mbedtls_error(MBED_UNUSED const char *name, MBED_UNUSED int err)
 {
-#ifdef MBEDTLS_ERROR_C
+// Avoid pulling in mbedtls_strerror when trace is not enabled
+#if defined FEA_TRACE_SUPPORT && defined MBEDTLS_ERROR_C
     char *buf = new char[128];
     mbedtls_strerror(err, buf, 128);
     tr_err("%s() failed: -0x%04x (%d): %s", name, -err, err, buf);
     delete[] buf;
 #else
-    (void)name;
-    (void)err;
+    tr_err("%s() failed: -0x%04x (%d)", name, -err, err);
 #endif
 }
 
@@ -577,4 +577,12 @@ nsapi_error_t TLSSocketWrapper::listen(int)
     return NSAPI_ERROR_UNSUPPORTED;
 }
 
+nsapi_error_t TLSSocketWrapper::getpeername(SocketAddress *address)
+{
+    if (!_handshake_completed) {
+        return NSAPI_ERROR_NO_CONNECTION;
+    }
+    return _transport->getpeername(address);
+}
+
 #endif /* MBEDTLS_SSL_CLI_C */

features/netsocket/TLSSocketWrapper.h

@@ -132,6 +132,7 @@ class TLSSocketWrapper : public Socket {
     virtual nsapi_error_t getsockopt(int level, int optname, void *optval, unsigned *optlen);
     virtual Socket *accept(nsapi_error_t *error = NULL);
     virtual nsapi_error_t listen(int backlog = 1);
+    virtual nsapi_error_t getpeername(SocketAddress *address);
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C) || defined(DOXYGEN)
     /** Get own certificate directly from Mbed TLS

targets/TARGET_ARM_FM/TARGET_FVP_MPS2/flash_api.c

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "string.h"
 #include "device.h"
 #include "flash_api.h"
 #include "memory_zones.h"
@@ -22,7 +23,7 @@
  * The implementation emulates flash over SRAM.
  */
 
-#define FLASH_PAGE_SIZE   256
+#define FLASH_PAGE_SIZE   4U
 #define FLASH_OFS_START   ZBT_SRAM1_START
 #define FLASH_SECTOR_SIZE 0x1000
 #define FLASH_OFS_END     (ZBT_SRAM1_START + ZBT_SRAM1_SIZE)