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

P2P: Discovery: avoid unneeded connections

Browse Source
This commit is contained in:
Vincent Bernardoff 2016-12-01 17:05:29 +01:00
parent c2249056d7
commit 2b27a1ffbe
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -713,16 +713,7 @@ module Make (P: PARAMS) = struct
my_gid my_gid
(fun _ port -> (fun _ port ->
Lwt.catch begin fun () -> Lwt.catch begin fun () ->
let ipaddr = callback addr port
let open Ipaddr in
match Ipaddr_unix.of_inet_addr addr with
| V4 addr -> V6 (v6_of_v4 addr)
| V6 _ as addr -> addr in
let addr = Ipaddr_unix.to_inet_addr ipaddr in
let socket = LU.(socket PF_INET6 SOCK_STREAM 0) in
LU.connect socket LU.(ADDR_INET (addr, port)) >>= fun () ->
callback ipaddr port socket >>= fun () ->
Lwt.return_unit
end end
(fun _ -> (* ignore errors *) Lwt.return_unit) >>= fun () -> (fun _ -> (* ignore errors *) Lwt.return_unit) >>= fun () ->
step ()) step ())
@ -1249,7 +1240,8 @@ module Make (P: PARAMS) = struct
(Format.asprintf "(%a) unblacklister" pp_gid my_gid) (Format.asprintf "(%a) unblacklister" pp_gid my_gid)
unblock cancel in unblock cancel in
let discovery_answerer = let discovery_answerer =
let callback addr port socket = let callback inet_addr port =
let addr = Ipaddr_unix.of_inet_addr inet_addr in
(* do not reply to ourselves or connected peers *) (* do not reply to ourselves or connected peers *)
if not (PeerMap.mem_by_point (addr, port) !connected) if not (PeerMap.mem_by_point (addr, port) !connected)
&& (try match PeerMap.gid_by_point (addr, port) !known_peers with && (try match PeerMap.gid_by_point (addr, port) !known_peers with
@ -1258,12 +1250,13 @@ module Make (P: PARAMS) = struct
with Not_found -> true) with Not_found -> true)
then then
(* connect if we need peers *) (* connect if we need peers *)
if PeerMap.cardinal !connected >= limits.expected_connections then begin if PeerMap.cardinal !connected >= limits.expected_connections then
Lwt_pipe.push events (Peers [ addr, port ]) >>= fun () -> Lwt_pipe.push events (Peers [ addr, port ])
LU.close socket else
end else let socket = LU.(socket PF_INET6 SOCK_STREAM 0) in
LU.connect socket LU.(ADDR_INET (inet_addr, port)) >>= fun () ->
Lwt_pipe.push events (Contact ((addr, port), socket)) Lwt_pipe.push events (Contact ((addr, port), socket))
else LU.close socket else Lwt.return_unit
in in
match config.discovery_port with match config.discovery_port with
| None -> Lwt.return_unit | None -> Lwt.return_unit