balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Node: Dual stack networking

Browse Source
This commit is contained in:
Vincent Bernardoff 2016-10-06 11:21:12 +02:00 committed by Grégoire Henry
parent 2064af36c9
commit d0f78a5662
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/node/net/p2p.ml
View File

@ -505,10 +505,10 @@ let discovery_answerer my_gid disco_port cancelation callback =
(* init a UDP listening socket on the broadcast canal *) (* init a UDP listening socket on the broadcast canal *)
catch catch
(fun () -> (fun () ->
let main_socket = LU.(socket PF_INET SOCK_DGRAM 0) in let main_socket = LU.(socket PF_INET6 SOCK_DGRAM 0) in
LU.(setsockopt main_socket SO_BROADCAST true) ; LU.(setsockopt main_socket SO_BROADCAST true) ;
LU.(setsockopt main_socket SO_REUSEADDR true) ; LU.(setsockopt main_socket SO_REUSEADDR true) ;
LU.(bind main_socket (ADDR_INET (Unix.inet_addr_any, disco_port))) ; LU.(bind main_socket (ADDR_INET (Unix.inet6_addr_any, disco_port))) ;
return (Some main_socket)) return (Some main_socket))
(fun exn -> (fun exn ->
debug "(%a) will not listen to discovery requests (%s)" debug "(%a) will not listen to discovery requests (%s)"
@ -531,7 +531,7 @@ let discovery_answerer my_gid disco_port cancelation callback =
(fun _ port -> (fun _ port ->
catch catch
(fun () -> (fun () ->
let socket = LU.(socket PF_INET SOCK_STREAM 0) in let socket = LU.(socket PF_INET6 SOCK_STREAM 0) in
LU.connect socket LU.(ADDR_INET (addr, port)) >>= fun () -> LU.connect socket LU.(ADDR_INET (addr, port)) >>= fun () ->
let addr = Ipaddr_unix.of_inet_addr addr in let addr = Ipaddr_unix.of_inet_addr addr in
callback addr port socket >>= fun () -> callback addr port socket >>= fun () ->
@ -551,9 +551,9 @@ let discovery_sender my_gid disco_port inco_port cancelation restart =
let rec loop delay n = let rec loop delay n =
catch catch
(fun () -> (fun () ->
let socket = LU.(socket PF_INET SOCK_DGRAM 0) in let socket = LU.(socket PF_INET6 SOCK_DGRAM 0) in
LU.setsockopt socket LU.SO_BROADCAST true ; LU.setsockopt socket LU.SO_BROADCAST true ;
LU.connect socket LU.(ADDR_INET (Unix.inet_addr_any, disco_port)) >>= fun () -> LU.connect socket LU.(ADDR_INET (Unix.inet6_addr_any, disco_port)) >>= fun () ->
Netbits.(write socket message) >>= fun _ -> Netbits.(write socket message) >>= fun _ ->
LU.close socket) LU.close socket)
(fun _ -> (fun _ ->
@ -682,10 +682,10 @@ let bootstrap config limits =
| None -> (* no input port => no welcome worker *) return () | None -> (* no input port => no welcome worker *) return ()
| Some port -> | Some port ->
(* open port for incoming connexions *) (* open port for incoming connexions *)
let addr = Unix.inet_addr_any in let addr = Unix.inet6_addr_any in
catch catch
(fun () -> (fun () ->
let main_socket = LU.(socket PF_INET SOCK_STREAM 0) in let main_socket = LU.(socket PF_INET6 SOCK_STREAM 0) in
LU.(setsockopt main_socket SO_REUSEADDR true) ; LU.(setsockopt main_socket SO_REUSEADDR true) ;
LU.(bind main_socket (ADDR_INET (addr, port))) ; LU.(bind main_socket (ADDR_INET (addr, port))) ;
LU.listen main_socket limits.max_connections ; LU.listen main_socket limits.max_connections ;
@ -762,7 +762,7 @@ let bootstrap config limits =
| _, [] -> return false (* we didn't manage to contact enough peers *) | _, [] -> return false (* we didn't manage to contact enough peers *)
| nb, ((addr, port), gid, source) :: tl -> | nb, ((addr, port), gid, source) :: tl ->
(* we try to open a connection *) (* we try to open a connection *)
let socket = LU.(socket PF_INET SOCK_STREAM 0) in let socket = LU.(socket PF_INET6 SOCK_STREAM 0) in
let uaddr = Ipaddr_unix.to_inet_addr addr in let uaddr = Ipaddr_unix.to_inet_addr addr in
catch catch
(fun () -> (fun () ->