frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

let TCP in node report remote ip and port when in single packet mode

Browse Source
This commit is contained in:
Dave Conway-Jones 2018-05-24 21:39:46 +01:00
parent 0ef16989cd
commit 40f4167894
No known key found for this signature in database
GPG Key ID: 9E7F9C73F5168CD4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nodes/core/io/31-tcpin.js
View File

@ -130,6 +130,8 @@ module.exports = function(RED) {
socket.setKeepAlive(true,120000); socket.setKeepAlive(true,120000);
if (socketTimeout !== null) { socket.setTimeout(socketTimeout); } if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
var id = (1+Math.random()*4294967295).toString(16); var id = (1+Math.random()*4294967295).toString(16);
var fromi;
var fromp;
connectionPool[id] = socket; connectionPool[id] = socket;
count++; count++;
node.status({text:RED._("tcpin.status.connections",{count:count})}); node.status({text:RED._("tcpin.status.connections",{count:count})});
@ -155,18 +157,21 @@ module.exports = function(RED) {
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
} }
} else { }
else {
if ((typeof data) === "string") { if ((typeof data) === "string") {
buffer = buffer+data; buffer = buffer+data;
} else { } else {
buffer = Buffer.concat([buffer,data],buffer.length+data.length); buffer = Buffer.concat([buffer,data],buffer.length+data.length);
} }
fromi = socket.remoteAddress;
fromp = socket.remotePort;
} }
}); });
socket.on('end', function() { socket.on('end', function() {
if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) { if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) {
if (buffer.length > 0) { if (buffer.length > 0) {
var msg = {topic:node.topic, payload:buffer, ip:socket.remoteAddress, port:socket.remotePort}; var msg = {topic:node.topic, payload:buffer, ip:fromi, port:fromp};
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
} }