diff --git a/vlib/net/address.v b/vlib/net/address.v
index 39d8d6e5bffa0b..0f2ac491a153be 100644
--- a/vlib/net/address.v
+++ b/vlib/net/address.v
@@ -294,14 +294,24 @@ pub fn (a Addr) str() string {
 
 // addr_from_socket_handle returns an address, based on the given integer socket `handle`
 pub fn addr_from_socket_handle(handle int) Addr {
-	addr := Addr{
+	mut addr := Addr{
 		addr: AddrData{
 			Ip6: Ip6{}
 		}
 	}
-	size := sizeof(addr)
-
+	mut size := sizeof(addr)
 	C.getsockname(handle, voidptr(&addr), &size)
+	return addr
+}
 
+// peer_addr_from_socket_handle retrieves the ip address and port number, given a socket handle
+pub fn peer_addr_from_socket_handle(handle int) !Addr {
+	mut addr := Addr{
+		addr: AddrData{
+			Ip6: Ip6{}
+		}
+	}
+	mut size := sizeof(Addr)
+	socket_error_message(C.getpeername(handle, voidptr(&addr), &size), 'peer_addr_from_socket_handle failed')!
 	return addr
 }
diff --git a/vlib/net/mbedtls/ssl_connection.v b/vlib/net/mbedtls/ssl_connection.v
index ae1f3162421120..34197dea7404f2 100644
--- a/vlib/net/mbedtls/ssl_connection.v
+++ b/vlib/net/mbedtls/ssl_connection.v
@@ -405,6 +405,11 @@ pub fn (mut s SSLConn) dial(hostname string, port int) ! {
 	s.opened = true
 }
 
+// peer_addr retrieves the ip address and port number used by the peer
+pub fn (s &SSLConn) peer_addr() !net.Addr {
+	return net.peer_addr_from_socket_handle(s.handle)
+}
+
 // socket_read_into_ptr reads `len` bytes into `buf`
 pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &u8, len int) !int {
 	mut res := 0
diff --git a/vlib/net/openssl/ssl_connection.v b/vlib/net/openssl/ssl_connection.v
index d82a198c116350..08c6e2a1742435 100644
--- a/vlib/net/openssl/ssl_connection.v
+++ b/vlib/net/openssl/ssl_connection.v
@@ -280,6 +280,11 @@ fn (mut s SSLConn) complete_connect() ! {
 	}
 }
 
+// peer_addr retrieves the ip address and port number used by the peer
+pub fn (s &SSLConn) peer_addr() !net.Addr {
+	return net.peer_addr_from_socket_handle(s.handle)
+}
+
 pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &u8, len int) !int {
 	mut res := 0
 	$if trace_ssl ? {
diff --git a/vlib/net/tcp.v b/vlib/net/tcp.v
index 6dd7d903832f2b..697f0dfd3ecc2f 100644
--- a/vlib/net/tcp.v
+++ b/vlib/net/tcp.v
@@ -4,7 +4,7 @@ import time
 import io
 import strings
 
-const (
+pub const (
 	tcp_default_read_timeout  = 30 * time.second
 	tcp_default_write_timeout = 30 * time.second
 )
@@ -252,17 +252,12 @@ pub fn (mut c TcpConn) set_sock() ! {
 	}
 }
 
+// peer_addr retrieves the ip address and port number used by the peer
 pub fn (c &TcpConn) peer_addr() !Addr {
-	mut addr := Addr{
-		addr: AddrData{
-			Ip6: Ip6{}
-		}
-	}
-	mut size := sizeof(Addr)
-	socket_error_message(C.getpeername(c.sock.handle, voidptr(&addr), &size), 'peer_addr failed')!
-	return addr
+	return peer_addr_from_socket_handle(c.sock.handle)
 }
 
+// peer_ip retrieves the ip address used by the peer, and returns it as a string
 pub fn (c &TcpConn) peer_ip() !string {
 	return c.peer_addr()!.str()
 }