diff --git a/net/inet/ipv4_getpeername.c b/net/inet/ipv4_getpeername.c
new file mode 100644
index 0000000000..1560b2f7da
--- /dev/null
+++ b/net/inet/ipv4_getpeername.c
@@ -0,0 +1,154 @@
+/****************************************************************************
+ * net/inet/ipv4_getpeername.c
+ *
+ * Copyright (C) 2017 Pinecone Inc. All rights reserved.
+ * Author: Guiding Li
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+#include "netdev/netdev.h"
+#include "socket/socket.h"
+#include "udp/udp.h"
+#include "tcp/tcp.h"
+#include "inet/inet.h"
+
+#ifdef CONFIG_NET_IPv4
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ipv4_getpeername
+ *
+ * Description:
+ * The ipv4_getpeername() function retrieves the locally-bound name of the
+ * specified PF_NET socket.
+ *
+ * Parameters:
+ * psock Point to the socket structure instance [in]
+ * addr sockaddr structure to receive data [out]
+ * addrlen Length of sockaddr structure [in/out]
+ *
+ * Returned Value:
+ * On success, 0 is returned, the 'addr' argument points to the address
+ * of the socket, and the 'addrlen' argument points to the length of the
+ * address. Otherwise, a negated errno value is returned. See
+ * getpeername() for the list of returned error values.
+ *
+ ****************************************************************************/
+
+int ipv4_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
+ FAR socklen_t *addrlen)
+{
+#if defined(NET_TCP_HAVE_STACK) || defined(NET_UDP_HAVE_STACK)
+ FAR struct sockaddr_in *outaddr = (FAR struct sockaddr_in *)addr;
+ in_addr_t ripaddr;
+
+ /* Check if enough space has been provided for the full address */
+
+ if (*addrlen < sizeof(struct sockaddr_in))
+ {
+ /* This function is supposed to return the partial address if
+ * a smaller buffer has been provided. This support has not
+ * been implemented.
+ */
+
+ return -ENOSYS;
+ }
+
+ /* Verify that the socket has been connected */
+
+ if ((psock->s_flags & _SF_CONNECTED) == 0)
+ {
+ return -ENOTCONN;
+ }
+
+ /* Set the port number */
+
+ switch (psock->s_type)
+ {
+#ifdef NET_TCP_HAVE_STACK
+ case SOCK_STREAM:
+ {
+ FAR struct tcp_conn_s *tcp_conn = (FAR struct tcp_conn_s *)psock->s_conn;
+
+ outaddr->sin_port = tcp_conn->rport; /* Already in network byte order */
+ ripaddr = tcp_conn->u.ipv4.raddr;
+ }
+ break;
+#endif
+
+#ifdef NET_UDP_HAVE_STACK
+ case SOCK_DGRAM:
+ {
+ FAR struct udp_conn_s *udp_conn = (FAR struct udp_conn_s *)psock->s_conn;
+
+ outaddr->sin_port = udp_conn->rport; /* Already in network byte order */
+ ripaddr = udp_conn->u.ipv4.raddr;
+ }
+ break;
+#endif
+
+ default:
+ return -EOPNOTSUPP;
+ }
+
+ /* Set the address family and the IP address */
+
+ outaddr->sin_family = psock->s_domain;
+ outaddr->sin_addr.s_addr = ripaddr;
+ *addrlen = sizeof(struct sockaddr_in);
+
+ /* Return success */
+
+ return OK;
+#else
+ return -EOPNOTSUPP;
+#endif
+}
+
+#endif /* CONFIG_NET_IPv4 */
diff --git a/net/inet/ipv6_getpeername.c b/net/inet/ipv6_getpeername.c
new file mode 100644
index 0000000000..f0685c8fcf
--- /dev/null
+++ b/net/inet/ipv6_getpeername.c
@@ -0,0 +1,150 @@
+/****************************************************************************
+ * net/inet/ipv6_getpeername.c
+ *
+ * Copyright (C) 2017 Pinecone Inc. All rights reserved.
+ * Author: Guiding Li
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+#include "netdev/netdev.h"
+#include "socket/socket.h"
+#include "udp/udp.h"
+#include "tcp/tcp.h"
+#include "inet/inet.h"
+
+#ifdef CONFIG_NET_IPv6
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ipv6_getpeername
+ *
+ * Description:
+ * The ipv6_getpeername() function retrieves the locally-bound name of the
+ * specified PF_NET6 socket.
+ *
+ * Parameters:
+ * psock Point to the socket structure instance [in]
+ * addr sockaddr structure to receive data [out]
+ * addrlen Length of sockaddr structure [in/out]
+ *
+ * Returned Value:
+ * On success, 0 is returned, the 'addr' argument points to the address
+ * of the socket, and the 'addrlen' argument points to the length of the
+ * address. Otherwise, a negated errno value is returned. See
+ * getpeername() for the list of returned error values.
+ *
+ ****************************************************************************/
+
+int ipv6_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
+ FAR socklen_t *addrlen)
+{
+ FAR struct sockaddr_in6 *outaddr = (FAR struct sockaddr_in6 *)addr;
+ net_ipv6addr_t *ripaddr;
+
+ /* Check if enough space has been provided for the full address */
+
+ if (*addrlen < sizeof(struct sockaddr_in6))
+ {
+ /* This function is supposed to return the partial address if
+ * a smaller buffer has been provided. This support has not
+ * been implemented.
+ */
+
+ return -ENOSYS;
+ }
+
+ /* Verify that the socket has been connected */
+
+ if ((psock->s_flags & _SF_CONNECTED) == 0)
+ {
+ return -ENOTCONN;
+ }
+
+ /* Set the port number */
+
+ switch (psock->s_type)
+ {
+#ifdef NET_TCP_HAVE_STACK
+ case SOCK_STREAM:
+ {
+ FAR struct tcp_conn_s *tcp_conn = (FAR struct tcp_conn_s *)psock->s_conn;
+
+ outaddr->sin6_port = tcp_conn->lport; /* Already in network byte order */
+ ripaddr = &tcp_conn->u.ipv6.raddr;
+ }
+ break;
+#endif
+
+#ifdef NET_UDP_HAVE_STACK
+ case SOCK_DGRAM:
+ {
+ FAR struct udp_conn_s *udp_conn = (FAR struct udp_conn_s *)psock->s_conn;
+
+ outaddr->sin6_port = udp_conn->lport; /* Already in network byte order */
+ ripaddr = &udp_conn->u.ipv6.raddr;
+ }
+ break;
+#endif
+
+ default:
+ return -EOPNOTSUPP;
+ }
+
+ /* Set the address family and the IP address */
+
+ outaddr->sin6_family = AF_INET6;
+ memcpy(outaddr->sin6_addr.in6_u.u6_addr8, ripaddr, 16);
+ *addrlen = sizeof(struct sockaddr_in6);
+
+ /* Return success */
+
+ return OK;
+}
+
+#endif /* CONFIG_NET_IPv6 */
diff --git a/net/socket/getpeername.c b/net/socket/getpeername.c
new file mode 100644
index 0000000000..9ee2fb020c
--- /dev/null
+++ b/net/socket/getpeername.c
@@ -0,0 +1,178 @@
+/****************************************************************************
+ * nuttx/net/socket/getpeername.c
+ *
+ * Copyright (C) 2018 Pinecone Inc. All rights reserved.
+ * Author: Guiding Li
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+
+#include "socket/socket.h"
+
+#ifdef CONFIG_NET
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: psock_getpeername
+ *
+ * Description:
+ * The psock_getpeername() function retrieves the remote-connected name of the
+ * specified socket, stores this address in the sockaddr structure pointed
+ * to by the 'addr' argument, and stores the length of this address in the
+ * object pointed to by the 'addrlen' argument.
+ *
+ * If the actual length of the address is greater than the length of the
+ * supplied sockaddr structure, the stored address will be truncated.
+ *
+ * If the socket has not been bound to a local name, the value stored in
+ * the object pointed to by address is unspecified.
+ *
+ * Parameters:
+ * psock Socket structure of socket to operate on
+ * addr sockaddr structure to receive data [out]
+ * addrlen Length of sockaddr structure [in/out]
+ *
+ * Returned Value:
+ * On success, 0 is returned, the 'addr' argument points to the address
+ * of the socket, and the 'addrlen' argument points to the length of the
+ * address. Otherwise, -1 is returned and errno is set to indicate the error.
+ * Possible errno values that may be returned include:
+ *
+ * EBADF - The socket argument is not a valid file descriptor.
+ * ENOTSOCK - The socket argument does not refer to a socket.
+ * EOPNOTSUPP - The operation is not supported for this socket's protocol.
+ * EINVAL - The socket has been shut down.
+ * ENOBUFS - Insufficient resources were available in the system to
+ * complete the function.
+ *
+ ****************************************************************************/
+
+int psock_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
+{
+ /* Verify that the psock corresponds to valid, allocated socket */
+
+ if (psock == NULL || psock->s_crefs <= 0)
+ {
+ return -EBADF;
+ }
+
+ /* Some sanity checking... Shouldn't need this on a buckled up embedded
+ * system (?)
+ */
+
+#ifdef CONFIG_DEBUG_FEATURES
+ if (addr == NULL || addrlen <= 0)
+ {
+ return -EINVAL;
+ }
+#endif
+
+ /* Let the address family's send() method handle the operation */
+
+ DEBUGASSERT(psock->s_sockif != NULL);
+
+ if (psock->s_sockif->si_getpeername == NULL)
+ {
+ return -EOPNOTSUPP;
+ }
+
+ return psock->s_sockif->si_getpeername(psock, addr, addrlen);
+}
+
+/****************************************************************************
+ * Name: getpeername
+ *
+ * Description:
+ * The getpeername() function retrieves the remote-connected name of the
+ * specified socket, stores this address in the sockaddr structure pointed
+ * to by the 'addr' argument, and stores the length of this address in the
+ * object pointed to by the 'addrlen' argument.
+ *
+ * If the actual length of the address is greater than the length of the
+ * supplied sockaddr structure, the stored address will be truncated.
+ *
+ * If the socket has not been bound to a local name, the value stored in
+ * the object pointed to by address is unspecified.
+ *
+ * Parameters:
+ * sockfd Socket descriptor of socket [in]
+ * addr sockaddr structure to receive data [out]
+ * addrlen Length of sockaddr structure [in/out]
+ *
+ * Returned Value:
+ * On success, 0 is returned, the 'addr' argument points to the address
+ * of the socket, and the 'addrlen' argument points to the length of the
+ * address. Otherwise, -1 is returned and errno is set to indicate the error.
+ * Possible errno values that may be returned include:
+ *
+ * EBADF - The socket argument is not a valid file descriptor.
+ * ENOTSOCK - The socket argument does not refer to a socket.
+ * EOPNOTSUPP - The operation is not supported for this socket's protocol.
+ * EINVAL - The socket has been shut down.
+ * ENOBUFS - Insufficient resources were available in the system to
+ * complete the function.
+ *
+ ****************************************************************************/
+
+int getpeername(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
+{
+ FAR struct socket *psock = sockfd_socket(sockfd);
+ int ret;
+
+ /* Let psock_getpeername() do all of the work */
+
+ ret = psock_getpeername(psock, addr, addrlen);
+ if (ret < 0)
+ {
+ set_errno(-ret);
+ return ERROR;
+ }
+
+ return OK;
+}
+
+#endif /* CONFIG_NET */