Bitmessage/bitmessage-js
2
0
Fork 1
Code Issues 1 Pull Requests 1 Actions Packages Releases Activity

Fix tcp connection tracking

Browse Source
This commit is contained in:
Kagami Hiiragi 2015-02-06 16:04:17 +03:00
parent 9ed1c87df8
commit be6234893f
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/net/tcp.js
View File

@ -13,8 +13,6 @@ var assert = require("../_util").assert;
var PPromise = require("../platform").Promise; var PPromise = require("../platform").Promise;
var BaseTransport = require("./base"); var BaseTransport = require("./base");
var sockIdCounter = 0;
/** /**
* TCP transport constructor. * TCP transport constructor.
* @constructor * @constructor
@ -113,6 +111,15 @@ Transport.prototype.connect = function() {
this._setupClient(client); this._setupClient(client);
}; };
// Unmap IPv4-mapped IPv6 addresses.
function unmap(addr) {
if (addr.indexOf("::ffff:") === 0) {
return addr.slice(7);
} else {
return addr;
}
}
Transport.prototype.listen = function() { Transport.prototype.listen = function() {
assert(!this._client, "Already connected"); assert(!this._client, "Already connected");
assert(!this._server, "Already listening"); assert(!this._server, "Already listening");
@ -122,17 +129,26 @@ Transport.prototype.listen = function() {
server.listen.apply(server, arguments); server.listen.apply(server, arguments);
server.on("connection", function(sock) { server.on("connection", function(sock) {
sock.id = sockIdCounter++; var addr = sock.remoteAddress;
self._clients[sock.id] = sock; var port = sock.remotePort;
if (self._clients[addr]) {
// NOTE(Kagami): Doesn't allow more than one connection per IP.
// This may obstruct people behind NAT but we copy PyBitmessage's
// behavior here.
sock.end();
self.emit("warning", addr + " was tried to connect once more");
return;
}
self._clients[addr] = sock;
sock.on("close", function() { sock.on("close", function() {
delete self._clients[sock.id]; delete self._clients[addr];
}); });
var transport = new self.constructor({ var transport = new self.constructor({
client: sock, client: sock,
seeds: self.seeds, seeds: self.seeds,
dnsSeeds: self.dnsSeeds, dnsSeeds: self.dnsSeeds,
}); });
self.emit("connection", transport); self.emit("connection", transport, unmap(addr), port);
}); });
server.on("error", function(err) { server.on("error", function(err) {
@ -155,8 +171,8 @@ Transport.prototype.send = function(data) {
Transport.prototype.broadcast = function(data) { Transport.prototype.broadcast = function(data) {
if (this._server) { if (this._server) {
Object.keys(this._clients).forEach(function(id) { Object.keys(this._clients).forEach(function(ip) {
this._clients[id].write(data); this._clients[ip].write(data);
}, this); }, this);
} else { } else {
throw new Error("Not listening"); throw new Error("Not listening");
@ -167,8 +183,8 @@ Transport.prototype.close = function() {
if (this._client) { if (this._client) {
this._client.end(); this._client.end();
} else if (this._server) { } else if (this._server) {
Object.keys(this._clients).forEach(function(id) { Object.keys(this._clients).forEach(function(ip) {
this._clients[id].end(); this._clients[ip].end();
}, this); }, this);
this._server.close(); this._server.close();
} }

3
tests/run-test-nodes.js
View File

@ -11,6 +11,9 @@ var WS_NODE_PATH = path.join(__dirname, "ws-node.js");
function spawn(path) { function spawn(path) {
var p = child.spawn("node", [path]); var p = child.spawn("node", [path]);
p.stdout.on("data", function(data) {
console.log("Info from", path, ":", data.toString().trim());
});
p.stderr.on("data", function(err) { p.stderr.on("data", function(err) {
console.log("Error from", path, ":", err.toString()); console.log("Error from", path, ":", err.toString());
}); });