TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-11 00:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

net.ssl: implement SSLConn.peer_addr() (#19333)

Browse Source
This commit is contained in:
pancake 2023-09-13 11:16:46 +02:00 committed by GitHub
parent f8ba4ba1fe
commit 0244ae6fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/net/address.v
View File

@ -294,14 +294,24 @@ pub fn (a Addr) str() string {
// addr_from_socket_handle returns an address, based on the given integer socket `handle` // addr_from_socket_handle returns an address, based on the given integer socket `handle`
pub fn addr_from_socket_handle(handle int) Addr { pub fn addr_from_socket_handle(handle int) Addr {
addr := Addr{ mut addr := Addr{
addr: AddrData{ addr: AddrData{
Ip6: Ip6{} Ip6: Ip6{}
} }
} }
size := sizeof(addr) mut size := sizeof(addr)
C.getsockname(handle, voidptr(&addr), &size) 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 return addr
} }

5
vlib/net/mbedtls/ssl_connection.v
View File

@ -405,6 +405,11 @@ pub fn (mut s SSLConn) dial(hostname string, port int) ! {
s.opened = true 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` // socket_read_into_ptr reads `len` bytes into `buf`
pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &u8, len int) !int { pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &u8, len int) !int {
mut res := 0 mut res := 0

5
vlib/net/openssl/ssl_connection.v
View File

@ -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 { pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &u8, len int) !int {
mut res := 0 mut res := 0
$if trace_ssl ? { $if trace_ssl ? {

13
vlib/net/tcp.v
View File

@ -4,7 +4,7 @@ import time
import io import io
import strings import strings
const ( pub const (
tcp_default_read_timeout = 30 * time.second tcp_default_read_timeout = 30 * time.second
tcp_default_write_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 { pub fn (c &TcpConn) peer_addr() !Addr {
mut addr := Addr{ return peer_addr_from_socket_handle(c.sock.handle)
addr: AddrData{
Ip6: Ip6{}
}
}
mut size := sizeof(Addr)
socket_error_message(C.getpeername(c.sock.handle, voidptr(&addr), &size), 'peer_addr failed')!
return addr
} }
// peer_ip retrieves the ip address used by the peer, and returns it as a string
pub fn (c &TcpConn) peer_ip() !string { pub fn (c &TcpConn) peer_ip() !string {
return c.peer_addr()!.str() return c.peer_addr()!.str()
} }