RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: take into account var_int for addr. move to parser.

Browse Source 
Signed-off-by: Fedor Indutny <fedor@indutny.com>
This commit is contained in:
Christopher Jeffrey 2014-05-17 00:30:52 -05:00 committed by Fedor Indutny
parent 01d2bc9218
commit d331cfbb9e
2 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/bcoin/peer.js
View File

@ -311,47 +311,19 @@ Peer.prototype._handleGetData = function handleGetData(items) {
}, this); }, this);
}; };
Peer.prototype._handleAddr = function handleAddr(addr) { Peer.prototype._handleAddr = function handleAddr(addrs) {
var count, date, network, ipv4, ipv6, port, i; addrs.forEach(function(addr) {
// count
count = addr[0];
addr = addr.slice(1);
for (i = 0; i < count; i++) {
// date - LE
date = utils.readU32(addr, 0);
// NODE_NETWORK service - LE
network = utils.readU64(addr, 4);
// ipv4 - BE
ipv4 = utils.readU32BE(addr, 24);
ipv4 = ((ipv4 >> 24) & 0xff) + '.' +
((ipv4 >> 16) & 0xff) + '.' +
((ipv4 >> 8) & 0xff) + '.' +
((ipv4 >> 0) & 0xff);
// ipv6 - BE
ipv6 = utils.toHex(addr.slice(12, 24));
ipv6 = ipv6.replace(/(.{4})/g, '$1:').replace(/:$/, '');
// port - BE
port = utils.readU16BE(addr, 28);
this.emit('addr', { this.emit('addr', {
date: new Date(date * 1000), date: new Date(addr.date * 1000),
network: network, network: addr.network,
address: ipv4, address: addr.ipv4,
ipv4: ipv4, ipv4: addr.ipv4,
ipv6: ipv6, ipv6: addr.ipv6,
port: port, port: addr.port,
host: ipv4 + ':' + port, host: addr.ipv4 + ':' + addr.port,
host6: '[' + ipv6 + ']:' + port host6: '[' + addr.ipv6 + ']:' + addr.port
}); });
}, this);
addr = addr.slice(30);
}
}; };
Peer.prototype._handlePing = function handlePing() { Peer.prototype._handlePing = function handlePing() {

50
lib/bcoin/protocol/parser.js
View File

@ -103,6 +103,8 @@ Parser.prototype.parsePayload = function parsePayload(cmd, p) {
return this.parseTX(p); return this.parseTX(p);
else if (cmd === 'reject') else if (cmd === 'reject')
return this.parseReject(p); return this.parseReject(p);
else if (cmd === 'addr')
return this.parseAddr(p);
else else
return p; return p;
}; };
@ -348,3 +350,51 @@ Parser.prototype.parseReject = function parseReject(p) {
reason: reason reason: reason
}; };
}; };
Parser.prototype.parseAddr = function parseAddr(p) {
if (p.length < 31)
return this._error('Invalid addr size');
var addrs = [];
var len, off, count, date, network, ipv4, ipv6, port, i;
// count
len = readIntv(p, 0);
off = len.off;
count = len.r;
p = p.slice(off);
for (i = 0; i < count; i++) {
// date - LE
date = utils.readU32(p, 0);
// NODE_NETWORK service - LE
network = utils.readU64(p, 4);
// ipv6 - BE
ipv6 = utils.toHex(p.slice(12, 24));
ipv6 = '::' + ipv6.replace(/(.{4})/g, '$1:').slice(0, -1);
// ipv4 - BE
ipv4 = utils.readU32BE(p, 24);
ipv4 = ((ipv4 >> 24) & 0xff) + '.' +
((ipv4 >> 16) & 0xff) + '.' +
((ipv4 >> 8) & 0xff) + '.' +
((ipv4 >> 0) & 0xff);
// port - BE
port = utils.readU16BE(p, 28);
addrs.push({
date: date,
network: network,
ipv6: ipv6,
ipv4: ipv4,
port: port
});
p = p.slice(30);
}
return addrs;
};