From 0d58e2bf5cbe4e57f688c5f78a83442aa470a2de Mon Sep 17 00:00:00 2001
From: Jacob Heun <jacobheun@gmail.com>
Date: Mon, 17 Dec 2018 18:18:55 +0100
Subject: [PATCH] fix: add support for p2p protocol

License: MIT
Signed-off-by: Jacob Heun <jacobheun@gmail.com>
---
 package.json    | 10 +++++-----
 src/index.js    |  4 ++--
 src/listener.js | 22 +++++++++++-----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index a07eaf3..0743da5 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,8 @@
     "npm": ">=3.0.0"
   },
   "devDependencies": {
-    "aegir": "^15.1.0",
-    "chai": "^4.1.2",
+    "aegir": "^17.1.1",
+    "chai": "^4.2.0",
     "dirty-chai": "^2.0.1",
     "interface-transport": "~0.3.6",
     "lodash.isfunction": "^3.0.9",
@@ -43,13 +43,13 @@
   },
   "dependencies": {
     "class-is": "^1.1.0",
-    "debug": "^3.1.0",
+    "debug": "^4.1.0",
     "interface-connection": "~0.3.2",
     "ip-address": "^5.8.9",
     "lodash.includes": "^4.3.0",
     "lodash.isfunction": "^3.0.9",
-    "mafmt": "^6.0.2",
-    "multiaddr": "^5.0.0",
+    "mafmt": "^6.0.3",
+    "multiaddr": "^6.0.1",
     "once": "^1.4.0",
     "stream-to-pull-stream": "^1.7.2"
   },
diff --git a/src/index.js b/src/index.js
index b04c223..42706a3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -73,8 +73,8 @@ class TCP {
         return false
       }
 
-      if (includes(ma.protoNames(), 'ipfs')) {
-        ma = ma.decapsulate('ipfs')
+      if (ma.protoNames().includes('p2p')) {
+        ma = ma.decapsulate('p2p')
       }
 
       return mafmt.TCP.matches(ma)
diff --git a/src/listener.js b/src/listener.js
index 30b3076..0cb7e9f 100644
--- a/src/listener.js
+++ b/src/listener.js
@@ -12,7 +12,7 @@ const log = debug('libp2p:tcp:listen')
 
 const getMultiaddr = require('./get-multiaddr')
 
-const IPFS_CODE = 421
+const P2P_CODE = 421
 const CLOSE_TIMEOUT = 2000
 
 function noop () {}
@@ -79,14 +79,14 @@ module.exports = (handler) => {
     })
   }
 
-  let ipfsId
+  let p2pId
   let listeningAddr
 
   listener.listen = (ma, callback) => {
     listeningAddr = ma
-    if (includes(ma.protoNames(), 'ipfs')) {
-      ipfsId = getIpfsId(ma)
-      listeningAddr = ma.decapsulate('ipfs')
+    if (includes(ma.protoNames(), 'p2p')) {
+      p2pId = getp2pId(ma)
+      listeningAddr = ma.decapsulate('p2p')
     }
 
     const lOpts = listeningAddr.toOptions()
@@ -107,8 +107,8 @@ module.exports = (handler) => {
     if (listeningAddr.toString().indexOf('ip4') !== -1) {
       let m = listeningAddr.decapsulate('tcp')
       m = m.encapsulate('/tcp/' + address.port)
-      if (ipfsId) {
-        m = m.encapsulate('/ipfs/' + ipfsId)
+      if (p2pId) {
+        m = m.encapsulate('/p2p/' + p2pId)
       }
 
       if (m.toString().indexOf('0.0.0.0') !== -1) {
@@ -127,8 +127,8 @@ module.exports = (handler) => {
 
     if (address.family === 'IPv6') {
       let ma = multiaddr('/ip6/' + address.address + '/tcp/' + address.port)
-      if (ipfsId) {
-        ma = ma.encapsulate('/ipfs/' + ipfsId)
+      if (p2pId) {
+        ma = ma.encapsulate('/p2p/' + p2pId)
       }
 
       multiaddrs.push(ma)
@@ -140,9 +140,9 @@ module.exports = (handler) => {
   return listener
 }
 
-function getIpfsId (ma) {
+function getp2pId (ma) {
   return ma.stringTuples().filter((tuple) => {
-    return tuple[0] === IPFS_CODE
+    return tuple[0] === P2P_CODE
   })[0][1]
 }