From ebbd9f44944c764dbf55a3efa071e9f19a5a9308 Mon Sep 17 00:00:00 2001 From: Dave C-J Date: Fri, 7 Nov 2014 08:27:24 +0000 Subject: [PATCH] Change regex for Ping node to work across languages... (hopefully) Addresses Issue #80 --- io/ping/88-ping.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/io/ping/88-ping.js b/io/ping/88-ping.js index 2d25d7a3..e178e3c8 100644 --- a/io/ping/88-ping.js +++ b/io/ping/88-ping.js @@ -34,9 +34,13 @@ module.exports = function(RED) { var res = false; ex.stdout.on('data', function (data) { //console.log('[ping] stdout: ' + data.toString()); - var regex = /from.*time.(.*)ms/; + var regex = /=.*[<|=]([0-9]*).*TTL|ttl..*=([0-9]*)/; + //var regex = /from.*time.(.*)ms/; var m = regex.exec(data.toString())||""; - if (m !== '') { res = Number(m[1]); } + if (m !== '') { + if (m[1]) { res = Number(m[1]); } + if (m[2]) { res = Number(m[2]); } + } }); ex.stderr.on('data', function (data) { //console.log('[ping] stderr: ' + data);