mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

net.socket: add s.peer_ip()

Browse Source
This commit is contained in:
Delyan Angelov 2020-07-02 22:27:36 +03:00
parent b89cbf3224
commit 5813d2bf72
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vlib/net/init_nix.c.v
View File

@ -3,6 +3,7 @@ module net
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>
fn error_code() int { fn error_code() int {

27
vlib/net/socket.v
View File

@ -70,6 +70,10 @@ fn C.ntohs() int
fn C.getsockname() int fn C.getsockname() int
fn C.inet_ntop(af int, src voidptr, dst charptr, dst_size int) charptr
fn C.getpeername(sockfd int, addr &C.sockaddr_in, addrsize &int) int
// create socket // create socket
pub fn new_socket(family, typ, proto int) ?Socket { pub fn new_socket(family, typ, proto int) ?Socket {
sockfd := C.socket(family, typ, proto) sockfd := C.socket(family, typ, proto)
@ -166,11 +170,9 @@ pub fn (s Socket) accept() ?Socket {
$if debug { $if debug {
println('accept()') println('accept()')
} }
addr := C.sockaddr_storage{} addr := C.sockaddr{}
size := 128 // sizeof(sockaddr_storage) size := sizeof(addr)
tmp := voidptr(&addr) sockfd := C.accept(s.sockfd, &addr, &size)
skaddr := &C.sockaddr(tmp)
sockfd := C.accept(s.sockfd, skaddr, &size)
if sockfd < 0 { if sockfd < 0 {
return error('net.accept: failed with $sockfd') return error('net.accept: failed with $sockfd')
} }
@ -183,6 +185,21 @@ pub fn (s Socket) accept() ?Socket {
return c return c
} }
pub fn (s Socket) peer_ip() ?string {
buf := [44]byte
peeraddr := C.sockaddr_in{}
speeraddr := sizeof(peeraddr)
ok := C.getpeername(s.sockfd, &C.sockaddr(&peeraddr), &speeraddr)
if ok == -1 {
return error('net.peer_ip: getpeername failed')
}
cstr := C.inet_ntop(C.AF_INET, &peeraddr.sin_addr, buf, sizeof(buf))
if cstr == 0 {
return error('net.peer_ip: inet_ntop failed')
}
return cstring_to_vstring(cstr)
}
// connect to given addrress and port // connect to given addrress and port
pub fn (s Socket) connect(address string, port int) ?int { pub fn (s Socket) connect(address string, port int) ?int {
mut hints := C.addrinfo{} mut hints := C.addrinfo{}

6
vlib/net/socket_test.v
View File

@ -3,8 +3,12 @@ import net
fn setup() (net.Socket, net.Socket, net.Socket) { fn setup() (net.Socket, net.Socket, net.Socket) {
server := net.listen(0) or { panic(err) } server := net.listen(0) or { panic(err) }
server_port := server.get_port() server_port := server.get_port()
client := net.dial('127.0.0.1', server_port) or { panic(err) } client := net.dial('127.0.0.1', server_port) or { panic(err) }
socket := server.accept() or { panic(err) } socket := server.accept() or { panic(err) }
$if debug_peer_ip ? {
ip := socket.peer_ip() or { '$err' }
eprintln('socket peer_ip: $ip')
}
return server, client, socket return server, client, socket
} }