From 29746b5164ad9232de0577e77fd4030f530a9f6b Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sat, 17 May 2014 21:47:29 -0500 Subject: [PATCH] utils: add simple utils.isIP in place of net.isIP. Signed-off-by: Fedor Indutny --- lib/bcoin/peer.js | 5 ++--- lib/bcoin/utils.js | 13 +++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/bcoin/peer.js b/lib/bcoin/peer.js index 9949dc1c..153305ab 100644 --- a/lib/bcoin/peer.js +++ b/lib/bcoin/peer.js @@ -1,6 +1,5 @@ var inherits = require('inherits'); var EventEmitter = require('events').EventEmitter; -var net = require('net'); var bcoin = require('../bcoin'); var utils = bcoin.utils; @@ -358,10 +357,10 @@ Peer.prototype._handleGetAddr = function handleGetAddr() { if (!peer || ~used.indexOf(peer.host)) return; used.push(peer.host); - return !!peer.host && net.isIP(peer.host); + return !!peer.host && utils.isIP(peer.host); }).map(function(peer) { var ip = peer.host; - var ver = net.isIP(ip); + var ver = utils.isIP(ip); return { ipv4: ver === 4 ? ip : '127.0.0.1', ipv6: ver === 6 ? ip : '0000:0000:0000:0000:0000:0000:0000:ffff', diff --git a/lib/bcoin/utils.js b/lib/bcoin/utils.js index 9554d79d..748a3d06 100644 --- a/lib/bcoin/utils.js +++ b/lib/bcoin/utils.js @@ -457,3 +457,16 @@ utils.toBTC = function toBTC(satoshi) { } return satoshi.div(m).toString(10) + lo.replace(/0+$/, ''); }; + +utils.isIP = function(ip) { + if (typeof ip !== 'string') + return 0; + + if (~ip.indexOf('.')) + return 4; + + if (~ip.indexOf(':')) + return 6; + + return 0; +};