fluencelabs/js-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p synced 2025-05-08 17:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Removed ipv6 to ipv4 hack

Browse Source
This commit is contained in:
Pau Ramon Revilla 2015-11-01 19:50:11 +01:00
parent 3b9465de92
commit c39eb4a830
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -42,7 +42,7 @@
}, },
"dependencies": { "dependencies": {
"async": "^1.3.0", "async": "^1.3.0",
"ip-address": "^4.0.0", "ip-address": "^5.0.2",
"ipfs-logger": "^0.1.0", "ipfs-logger": "^0.1.0",
"multiaddr": "^1.0.0", "multiaddr": "^1.0.0",
"multiplex-stream-muxer": "^0.2.0", "multiplex-stream-muxer": "^0.2.0",

8
src/identify/index.js
View File

@ -7,7 +7,7 @@ var Interactive = require('multistream-select').Interactive
var protobufs = require('protocol-buffers-stream') var protobufs = require('protocol-buffers-stream')
var fs = require('fs') var fs = require('fs')
var schema = fs.readFileSync(__dirname + '/identify.proto') var schema = fs.readFileSync(__dirname + '/identify.proto')
var v6 = require('ip-address').v6 var Address6 = require('ip-address').Address6
var Id = require('peer-id') var Id = require('peer-id')
var multiaddr = require('multiaddr') var multiaddr = require('multiaddr')
@ -112,10 +112,10 @@ exports.getHandlerFunction = function (peerInfoSelf, muxedConns) {
function getMultiaddr (socket) { function getMultiaddr (socket) {
var mh var mh
if (~socket.remoteAddress.indexOf(':')) { if (socket.remoteFamily === 'IPv6') {
var addr = new v6.Address(socket.remoteAddress) var addr = new Address6(socket.remoteAddress)
if (addr.v4) { if (addr.v4) {
var ip4 = socket.remoteAddress.split(':')[3] var ip4 = addr.to4().correctForm()
mh = multiaddr('/ip4/' + ip4 + '/tcp/' + socket.remotePort) mh = multiaddr('/ip4/' + ip4 + '/tcp/' + socket.remotePort)
} else { } else {
mh = multiaddr('/ip6/' + socket.remoteAddress + '/tcp/' + socket.remotePort) mh = multiaddr('/ip6/' + socket.remoteAddress + '/tcp/' + socket.remotePort)