From 9d55f4190931f2f1c0816c50cd72e43622503f29 Mon Sep 17 00:00:00 2001
From: cheatfate <ka@hardcore.kiev.ua>
Date: Tue, 27 Nov 2018 22:58:16 +0200
Subject: [PATCH] Update example chat /consearch now shows if peers are
 supporting p2p-circuit. Add utility procedures for multiaddress.

---
 examples/chat.nim       | 19 ++++++++++---
 libp2p/multiaddress.nim | 63 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/examples/chat.nim b/examples/chat.nim
index 5d353c577..4eaba4d64 100644
--- a/examples/chat.nim
+++ b/examples/chat.nim
@@ -44,7 +44,7 @@ proc serveThread(server: StreamServer,
           address &= MultiAddress.init(P_P2P, peerId)
           echo "= Searching for peer ", parts[1]
           var id = await udata.api.dhtFindPeer(peerId)
-          echo "Peer " & parts[1] & " found at addresses:"
+          echo "= Peer " & parts[1] & " found at addresses:"
           for item in id.addresses:
             echo $item
           echo "= Connecting to peer ", $address
@@ -60,7 +60,7 @@ proc serveThread(server: StreamServer,
           var peerId = Base58.decode(parts[1])
           echo "= Searching for peer ", parts[1]
           var id = await udata.api.dhtFindPeer(peerId)
-          echo "Peer " & parts[1] & " found at addresses:"
+          echo "= Peer " & parts[1] & " found at addresses:"
           for item in id.addresses:
             echo $item
       elif line.startsWith("/consearch"):
@@ -69,9 +69,20 @@ proc serveThread(server: StreamServer,
           var peerId = Base58.decode(parts[1])
           echo "= Searching for peers connected to peer ", parts[1]
           var peers = await udata.api.dhtFindPeersConnectedToPeer(peerId)
-          echo "Found ", len(peers), " connected to peer ", parts[1]
+          echo "= Found ", len(peers), " connected to peer ", parts[1]
           for item in peers:
-            echo Base58.encode(item.peer)
+            var peer = Base58.encode(item.peer)
+            var addresses = newSeq[string]()
+            var relay = false
+            for a in item.addresses:
+              addresses.add($a)
+              if a.protoName() == "/p2p-circuit":
+                relay = true
+                break
+            if relay:
+              echo peer, " * ",  " [", addresses.join(", "), "]"
+            else:
+              echo peer, " [", addresses.join(", "), "]"
       elif line.startsWith("/exit"):
         quit(0)
       else:
diff --git a/libp2p/multiaddress.nim b/libp2p/multiaddress.nim
index 553b28cfc..f51f38a1b 100644
--- a/libp2p/multiaddress.nim
+++ b/libp2p/multiaddress.nim
@@ -375,6 +375,11 @@ proc trimRight(s: string, ch: char): string =
       break
   result = s[0..(len(s) - 1 - m)]
 
+proc shcopy*(m1: var MultiAddress, m2: MultiAddress) =
+  shallowCopy(m1.data.buffer, m2.data.buffer)
+  m1.data.offset = m2.data.offset
+  m1.data.length = m2.data.length
+
 proc protoCode*(mtype: typedesc[MultiAddress], protocol: string): int =
   ## Returns protocol code from protocol name ``protocol``.
   let proto = NameAddresses.getOrDefault(protocol)
@@ -391,15 +396,56 @@ proc protoName*(mtype: typedesc[MultiAddress], protocol: int): string =
 
 proc protoCode*(ma: MultiAddress): int =
   ## Returns MultiAddress ``ma`` protocol code.
-  discard
+  var header: uint64
+  var vb: MultiAddress
+  shcopy(vb, ma)
+  if vb.data.readVarint(header) == -1:
+    raise newException(MultiAddressError, "Malformed binary address!")
+  let proto = CodeAddresses.getOrDefault(int(header))
+  if proto.kind == None:
+    raise newException(MultiAddressError,
+                       "Unsupported protocol '" & $header & "'")
+  result = proto.code
 
 proc protoName*(ma: MultiAddress): string =
   ## Returns MultiAddress ``ma`` protocol name.
-  discard
+  var header: uint64
+  var vb: MultiAddress
+  shcopy(vb, ma)
+  if vb.data.readVarint(header) == -1:
+    raise newException(MultiAddressError, "Malformed binary address!")
+  let proto = CodeAddresses.getOrDefault(int(header))
+  if proto.kind == None:
+    raise newException(MultiAddressError,
+                       "Unsupported protocol '" & $header & "'")
+  result = proto.name
 
-proc protoValue*(ma: MultiAddress, value: var openarray[byte]): int =
-  ## Returns MultiAddress ``ma`` protocol address value.
-  discard
+proc protoArgument*(ma: MultiAddress, value: var openarray[byte]): int =
+  ## Returns MultiAddress ``ma`` protocol argument value.
+  ## 
+  ## If current MultiAddress do not have argument value, then result will be
+  ## ``0``.
+  var header: uint64
+  var vb: MultiAddress
+  var buffer: seq[byte]
+  shcopy(vb, ma)
+  if vb.data.readVarint(header) == -1:
+    raise newException(MultiAddressError, "Malformed binary address!")
+  let proto = CodeAddresses.getOrDefault(int(header))
+  if proto.kind == None:
+    raise newException(MultiAddressError,
+                       "Unsupported protocol '" & $header & "'")
+  if proto.kind == Fixed:
+    result = proto.size
+    if len(value) >= result:
+      if vb.data.readArray(value) != proto.size:
+        raise newException(MultiAddressError, "Decoding protocol error")
+  elif proto.kind in {Length, Path}:
+    if vb.data.readSeq(buffer) == -1:
+      raise newException(MultiAddressError, "Decoding protocol error")
+    result = len(vb.data.buffer)
+    if len(value) >= result:
+      copyMem(addr value[0], addr vb.data.buffer[0], result)
 
 proc getPart(ma: MultiAddress, index: int): MultiAddress =
   var header: uint64
@@ -502,14 +548,11 @@ proc hex*(value: MultiAddress): string =
   ## Return hexadecimal string representation of MultiAddress ``value``.
   result = $(value.data)
 
-proc buffer*(value: MultiAddress): seq[byte] =
-  ## Returns shallow copy of internal buffer
-  shallowCopy(result, value.data.buffer)
-
 proc validate*(ma: MultiAddress): bool =
   ## Returns ``true`` if MultiAddress ``ma`` is valid.
   var header: uint64
-  var vb = ma
+  var vb: MultiAddress
+  shcopy(vb, ma)
   while true:
     if vb.data.isEmpty():
       break