codex-storage
/
nim-libp2p
mirror of https://github.com/codex-storage/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for specifying the listening address of the Daemon

This commit is contained in:
Zahary Karadjov 2019-06-12 21:18:08 +03:00 committed by zah
parent d5b51bcf9e
commit dbcc6ce78b
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libp2p/daemon/daemonapi.nim
View File

@ -556,6 +556,8 @@ proc listPeers*(api: DaemonAPI): Future[seq[PeerInfo]] {.async.}
proc newDaemonApi*(flags: set[P2PDaemonFlags] = {}, proc newDaemonApi*(flags: set[P2PDaemonFlags] = {},
bootstrapNodes: seq[string] = @[], bootstrapNodes: seq[string] = @[],
id: string = "", id: string = "",
hostAddresses: seq[MultiAddress] = @[],
announcedAddresses: seq[MultiAddress] = @[],
daemon = DefaultDaemonFile, daemon = DefaultDaemonFile,
sockpath = "", sockpath = "",
patternSock = DefaultUnixSocketPattern, patternSock = DefaultUnixSocketPattern,
@ -575,6 +577,13 @@ proc newDaemonApi*(flags: set[P2PDaemonFlags] = {},
## ``id`` - path to file with identification information (default: "" which ## ``id`` - path to file with identification information (default: "" which
## means - generate new random identity). ## means - generate new random identity).
## ##
## ``hostAddresses`` - list of multiaddrs the host should listen on.
## (default: @[], the daemon will pick a listening port at random).
##
## ``announcedAddresses`` - list of multiaddrs the host should announce to
## the network (default: @[], the daemon will announce its own listening
## address).
##
## ``daemon`` - name of ``go-libp2p-daemon`` executable (default: "p2pd"). ## ``daemon`` - name of ``go-libp2p-daemon`` executable (default: "p2pd").
## ##
## ``sockpath`` - default control socket MultiAddress ## ``sockpath`` - default control socket MultiAddress
@ -654,6 +663,18 @@ proc newDaemonApi*(flags: set[P2PDaemonFlags] = {},
args.add("-bootstrapPeers=" & bootstrapNodes.join(",")) args.add("-bootstrapPeers=" & bootstrapNodes.join(","))
if len(id) != 0: if len(id) != 0:
args.add("-id=" & id) args.add("-id=" & id)
if len(hostAddresses) > 0:
var opt = "-hostAddrs="
for i, address in hostAddresses:
if i > 0: opt.add ","
opt.add $address
args.add(opt)
if len(announcedAddresses) > 0:
var opt = "-announceAddrs="
for i, address in announcedAddresses:
if i > 0: opt.add ","
opt.add $address
args.add(opt)
args.add("-listen=" & $api.address) args.add("-listen=" & $api.address)
# We are trying to get absolute daemon path. # We are trying to get absolute daemon path.

4
libp2p/multiaddress.nim
View File

@ -727,6 +727,10 @@ proc init*(mtype: typedesc[MultiAddress]): MultiAddress =
## Initialize empty MultiAddress. ## Initialize empty MultiAddress.
result.data = initVBuffer() result.data = initVBuffer()
proc tcpEndPoint*(address: IpAddress, port: Port): MultiAddress =
# TODO: this can be more efficient
MultiAddress.init("/ip4/" & $address & "/tcp/" & $port)
proc isEmpty*(ma: MultiAddress): bool = proc isEmpty*(ma: MultiAddress): bool =
## Returns ``true``, if MultiAddress ``ma`` is empty or non initialized. ## Returns ``true``, if MultiAddress ``ma`` is empty or non initialized.
result = len(ma.data) == 0 result = len(ma.data) == 0