From f1f00da1a83e2773a4f1a6e49d5a74b5f121f9a8 Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Wed, 23 Oct 2013 21:27:54 +0100
Subject: [PATCH 1/3] Allow http request node to pass through existing msg
 properties rather than wiping clean (in case needed on other side...) Also
 one more try / catch to xml parser... could still barf if provoked.

---
 nodes/analysis/73-parsexml.js |  25 +++---
 nodes/io/21-httpin.js         | 154 +++++++++++++++++-----------------
 2 files changed, 89 insertions(+), 90 deletions(-)

diff --git a/nodes/analysis/73-parsexml.js b/nodes/analysis/73-parsexml.js
index 2d0e5225c..f7a73d411 100644
--- a/nodes/analysis/73-parsexml.js
+++ b/nodes/analysis/73-parsexml.js
@@ -30,17 +30,20 @@ function Xml2jsNode(n) {
     this.useEyes = n.useEyes;
     var node = this;
     this.on("input", function(msg) {
-        parseString(msg.payload, function (err, result) {
-            if (err) { node.error(err); }
-            else {
-                msg.payload = result;
-                node.send(msg);
-                if (node.useEyes == true) {
-                    if (gotEyes == true) { eyes.inspect(msg); }
-                    else { node.log(JSON.stringify(msg)); }
-                }
-            }
-        });
+        try {
+		    parseString(msg.payload, function (err, result) {
+		        if (err) { node.error(err); }
+		        else {
+		            msg.payload = result;
+		            node.send(msg);
+		            if (node.useEyes == true) {
+		                if (gotEyes == true) { eyes.inspect(msg); }
+		                else { node.log(JSON.stringify(msg)); }
+		            }
+		        }
+		    });
+		}
+		catch(e) { console.log(e); }
     });
 }
 RED.nodes.registerType("xml2js",Xml2jsNode);
diff --git a/nodes/io/21-httpin.js b/nodes/io/21-httpin.js
index 4e099d20b..b012cd92b 100644
--- a/nodes/io/21-httpin.js
+++ b/nodes/io/21-httpin.js
@@ -22,103 +22,99 @@ var urllib = require("url");
 var bodyParser = require("express").bodyParser();
 
 function HTTPIn(n) {
-	RED.nodes.createNode(this,n);
-	this.url = n.url;
-	this.method = n.method;
+    RED.nodes.createNode(this,n);
+    this.url = n.url;
+    this.method = n.method;
 
-	var node = this;
-	this.callback = function(req,res) {
-		node.send({req:req,res:res});
-	}
-	if (this.method == "get") {
-		RED.app.get(this.url,this.callback);
-	} else if (this.method == "post") {
-		RED.app.post(this.url,bodyParser,this.callback);
-	} else if (this.method == "put") {
-		RED.app.put(this.url,bodyParser,this.callback);
-	} else if (this.method == "delete") {
-		RED.app.delete(this.url,this.callback);
-	}
-	
-	this.on("close",function() {
-	        var routes = RED.app.routes[this.method];
-	        for (var i in routes) {
-	            if (routes[i].path == this.url) {
-	                routes.splice(i,1);
-	                //break;
-	            }
-	        }
-	});
+    var node = this;
+    this.callback = function(req,res) {
+        node.send({req:req,res:res});
+    }
+    if (this.method == "get") {
+        RED.app.get(this.url,this.callback);
+    } else if (this.method == "post") {
+        RED.app.post(this.url,bodyParser,this.callback);
+    } else if (this.method == "put") {
+        RED.app.put(this.url,bodyParser,this.callback);
+    } else if (this.method == "delete") {
+        RED.app.delete(this.url,this.callback);
+    }
+
+    this.on("close",function() {
+            var routes = RED.app.routes[this.method];
+            for (var i in routes) {
+                if (routes[i].path == this.url) {
+                    routes.splice(i,1);
+                    //break;
+                }
+            }
+    });
 }
 
 RED.nodes.registerType("http in",HTTPIn);
 
 
 function HTTPOut(n) {
-	RED.nodes.createNode(this,n);
-	var node = this;
-	this.on("input",function(msg) {
-	        if (msg.res) {
-	            if (msg.headers) {
-	                res.set(msg.headers);
-	            }
-	            var statusCode = msg.statusCode || 200;
-	            msg.res.send(statusCode,msg.payload);
-	        } else {
-	            node.warn("No response object");
-	        }
-	});
+    RED.nodes.createNode(this,n);
+    var node = this;
+    this.on("input",function(msg) {
+            if (msg.res) {
+                if (msg.headers) {
+                    res.set(msg.headers);
+                }
+                var statusCode = msg.statusCode || 200;
+                msg.res.send(statusCode,msg.payload);
+            } else {
+                node.warn("No response object");
+            }
+    });
 }
 
 RED.nodes.registerType("http response",HTTPOut);
 
 function HTTPRequest(n) {
-	RED.nodes.createNode(this,n);
-	var url = n.url;
-	var method = n.method || "GET";
-	var httplib = (/^https/.test(url))?https:http;
-	var node = this;
-	this.on("input",function(msg) {
-	        if (msg.url) {
-	            httplib = (/^https/.test(msg.url))?https:http;
-	        }
-	        var opts = urllib.parse(msg.url||url);
-	        opts.method = (msg.method||method).toUpperCase();
-	        if (msg.headers) {
-	            opts.headers = msg.headers;
-	        }
-	        var req = httplib.request(opts,function(res) {
-	                res.setEncoding('utf8');
-	                var message = {
-	                    statusCode: res.statusCode,
-	                    headers: res.headers,
-	                    payload: ""
-	                };
-	                res.on('data',function(chunk) {
-	                        message.payload += chunk;
-	                });
-	                res.on('end',function() {
-	                        node.send(message);
-	                });
-	        });
-	        req.on('error',function(err) {
-	                msg.payload = err.toString();
-	                msg.statusCode = err.code;
-	                node.send(msg);
-	        });
-	        if (msg.payload && (method == "POST" || method == "PUT") ) {
-	            if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) { 
+    RED.nodes.createNode(this,n);
+    var url = n.url;
+    var method = n.method || "GET";
+    var httplib = (/^https/.test(url))?https:http;
+    var node = this;
+    this.on("input",function(msg) {
+
+            var opts = urllib.parse(msg.url||url);
+            opts.method = (msg.method||method).toUpperCase();
+            if (msg.headers) {
+                opts.headers = msg.headers;
+            }
+            var req = httplib.request(opts,function(res) {
+                    res.setEncoding('utf8');
+                    msg.statusCode = res.statusCode;
+                    msg.headers = res.headers;
+                    msg.payload = "";
+                    res.on('data',function(chunk) {
+                            msg.payload += chunk;
+                    });
+                    res.on('end',function() {
+                            node.send(msg);
+                    });
+            });
+            req.on('error',function(err) {
+                    msg.payload = err.toString();
+                    msg.statusCode = err.code;
+                    node.send(msg);
+            });
+            if (msg.payload && (method == "PUSH" || method == "PUT") ) {
+                if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
                     req.write(msg.payload);
                 } else if (typeof msg.payload == "number") {
                     req.write(msg.payload+"");
                 } else {
                     req.write(JSON.stringify(msg.payload));
                 }
-	        }
-	        req.end();
-	        
-	        
-	});
+            }
+            req.end();
+
+
+    });
 }
 
 RED.nodes.registerType("http request",HTTPRequest);

From a4160a6bea6209b3b3a9c5ce9233ea8e2981f523 Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Thu, 24 Oct 2013 19:58:57 +0100
Subject: [PATCH 2/3] Partial fix for Issue #45 - allows msg.destip and
 msg.port properties to override static config.

Signed-off-by: Dave C-J <dave@conway-jones.co.uk>
---
 nodes/io/32-udp.html |   4 +-
 nodes/io/32-udp.js   | 158 ++++++++++++++++++++++---------------------
 2 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/nodes/io/32-udp.html b/nodes/io/32-udp.html
index 25dbdc2ac..331962ec8 100644
--- a/nodes/io/32-udp.html
+++ b/nodes/io/32-udp.html
@@ -63,6 +63,7 @@
 <script type="text/x-red" data-help-name="udp in">
     <p>A udp input node, that produces a <b>msg.payload</b> containing a <i>BUFFER</i>, string, or base64 encoded string. Supports multicast.</p>
     <p>It also provides <b>msg.fromip</b> in the form ipaddress:port .</p>
+    <p>On some systems you may need to be root to use ports below 1024 and/or broadcast.</p>
 </script>
 
 <script type="text/javascript">
@@ -145,8 +146,9 @@
 
 <script type="text/x-red" data-help-name="udp out">
     <p>This node sends <b>msg.payload</b> to the designated udp host and port. Supports multicast.</p>
+    <p>You may also use <b>msg.destip</b> and <b>msg.port</b> to override the values manually configured.</p>
     <p>If you select broadcast either set the address to the local broadcast ip address, or maybe try 255.255.255.255, which is the global broadcast address.</p>
-    <p>On some systems you may need to be root to use broadcast.</p>
+    <p>On some systems you may need to be root to use ports below 1024 and/or broadcast.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/io/32-udp.js b/nodes/io/32-udp.js
index 39b7b1222..8666d655c 100644
--- a/nodes/io/32-udp.js
+++ b/nodes/io/32-udp.js
@@ -19,97 +19,101 @@ var dgram = require('dgram');
 
 // The Input Node
 function UDPin(n) {
-	RED.nodes.createNode(this,n);
-	this.group = n.group;
-	this.port = n.port;
-	this.host = n.host || null;
-	this.datatype = n.datatype;
-	this.iface = n.iface || null;
-	this.multicast = n.multicast;
-	var node = this;
+    RED.nodes.createNode(this,n);
+    this.group = n.group;
+    this.port = n.port;
+    this.host = n.host || null;
+    this.datatype = n.datatype;
+    this.iface = n.iface || null;
+    this.multicast = n.multicast;
+    var node = this;
 
-	var server = dgram.createSocket('udp4');
+    var server = dgram.createSocket('udp4');
 
-	server.on("error", function (err) {
-		console.log("udp listener error:\n" + err.stack);
-		server.close();
-	});
+    server.on("error", function (err) {
+        //console.log("udp listener error:\n" + err.stack);
+        if ((err.code == "EACCES") && (node.port < 1024)) { node.error("UDP access error, you may need root access for ports below 1024"); }
+        else { node.error("UDP error : "+err.code); }
+        server.close();
+    });
 
-	server.on('message', function (message, remote) {
-		var msg;
-		if (node.datatype =="base64") { msg = { payload:message.toString('base64'), fromip:remote.address+':'+remote.port }; }
-		else if (node.datatype =="utf8") { msg = { payload:message.toString('utf8'), fromip:remote.address+':'+remote.port }; }
-		else { msg = { payload:message, fromip:remote.address+':'+remote.port }; }
-		node.send(msg);
-	});
+    server.on('message', function (message, remote) {
+        var msg;
+        if (node.datatype =="base64") { msg = { payload:message.toString('base64'), fromip:remote.address+':'+remote.port }; }
+        else if (node.datatype =="utf8") { msg = { payload:message.toString('utf8'), fromip:remote.address+':'+remote.port }; }
+        else { msg = { payload:message, fromip:remote.address+':'+remote.port }; }
+        node.send(msg);
+    });
 
-	server.on('listening', function () {
-		var address = server.address();
-		node.log('udp listener at ' + address.address + ":" + address.port);
-		if (node.multicast == "true") {
-			server.setBroadcast(true)
-			server.setMulticastTTL(128);
-			server.addMembership(node.group,node.iface);
-			node.log("udp multicast group "+node.group);
-		}
-	});
+    server.on('listening', function () {
+        var address = server.address();
+        node.log('udp listener at ' + address.address + ":" + address.port);
+        if (node.multicast == "true") {
+            server.setBroadcast(true)
+            server.setMulticastTTL(128);
+            server.addMembership(node.group,node.iface);
+            node.log("udp multicast group "+node.group);
+        }
+    });
 
-	node.on("close", function() {
-		try {
-			server.close();
-			node.log('udp listener stopped');
-		}
-		catch (err) { console.log(err); }
-	});
+    node.on("close", function() {
+        try {
+            server.close();
+            node.log('udp listener stopped');
+        }
+        catch (err) { console.log(err); }
+    });
 
-	server.bind(node.port,node.host);
+    server.bind(node.port,node.host);
 }
 RED.nodes.registerType("udp in",UDPin);
 
 
 // The Output Node
 function UDPout(n) {
-	RED.nodes.createNode(this,n);
-	//this.group = n.group;
-	this.port = n.port;
-	this.base64 = n.base64;
-	this.addr = n.addr;
-	this.iface = n.iface || null;
-	this.multicast = n.multicast;
-	var node = this;
+    RED.nodes.createNode(this,n);
+    //this.group = n.group;
+    this.port = n.port;
+    this.base64 = n.base64;
+    this.addr = n.addr;
+    this.iface = n.iface || null;
+    this.multicast = n.multicast;
+    var node = this;
 
-	var sock = dgram.createSocket('udp4');  // only use ipv4 for now
-	sock.bind(node.port); 			// have to bind before you can enable broadcast...
-	if (this.multicast != "false") {
-		sock.setBroadcast(true);		// turn on broadcast
-		if (this.multicast == "multi") {
-			sock.setMulticastTTL(128);
-			sock.addMembership(node.addr,node.iface);	// Add to the multicast group
-			node.log('udp multicast ready : '+node.addr+":"+node.port);
-		}
-		else node.log('udp broadcast ready : '+node.addr+":"+node.port);
-	}
-	else node.log('udp ready : '+node.addr+":"+node.port);
+    var sock = dgram.createSocket('udp4');  // only use ipv4 for now
+    sock.bind(node.port);           // have to bind before you can enable broadcast...
+    if (this.multicast != "false") {
+        sock.setBroadcast(true);        // turn on broadcast
+        if (this.multicast == "multi") {
+            sock.setMulticastTTL(128);
+            sock.addMembership(node.addr,node.iface);   // Add to the multicast group
+            node.log('udp multicast ready : '+node.addr+":"+node.port);
+        }
+        else node.log('udp broadcast ready : '+node.addr+":"+node.port);
+    }
+    else node.log('udp ready : '+node.addr+":"+node.port);
 
-	node.on("input", function(msg) {
-		if (msg.payload != null) {
-			//console.log("UDP:",msg.payload);
-			var message;
-			if (node.base64) { message = new Buffer(b64string, 'base64'); }
-			else { message = new Buffer(""+msg.payload); }
-			console.log("UDP send :",node.addr,node.port);
-			sock.send(message, 0, message.length, node.port, node.addr, function(err, bytes) {
-				if (err) node.error("udp : "+err);
-			});
-		}
-	});
+    node.on("input", function(msg) {
+        if (msg.payload != null) {
+            //console.log("UDP:",msg.payload);
+            var add = msg.destip || node.addr;
+            var por = msg.port || node.addr;
+            var message;
+            if (node.base64) { message = new Buffer(b64string, 'base64'); }
+            else { message = new Buffer(""+msg.payload); }
+            //console.log("UDP send :",add,por);
+            sock.send(message, 0, message.length, por, add, function(err, bytes) {
+                if (err) node.error("udp : "+err);
+            });
+        }
+    });
 
-	node.on("close", function() {
-		try {
-			sock.close();
-			node.log('udp output stopped');
-		}
-		catch (err) { console.log(err); }
-	});
+    node.on("close", function() {
+        try {
+            sock.close();
+            node.log('udp output stopped');
+        }
+        catch (err) { console.log(err); }
+    });
 }
 RED.nodes.registerType("udp out",UDPout);

From 6fb8506722734e106e85d0cc653b31d037a151b7 Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Fri, 25 Oct 2013 11:27:21 +0100
Subject: [PATCH 3/3] Better fix to Close Issue#48. udp out node now accept
 msg.ip and msg.port properties - and udp in node now produces them also.
 Note- the ststically configured vlues WILL take precedence - so if you want
 to use msg.ip and msg.port then do not configure them in the edit dialog

---
 nodes/io/32-udp.html | 10 +++++-----
 nodes/io/32-udp.js   | 27 ++++++++++++++++-----------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/nodes/io/32-udp.html b/nodes/io/32-udp.html
index 331962ec8..7be9b7483 100644
--- a/nodes/io/32-udp.html
+++ b/nodes/io/32-udp.html
@@ -62,7 +62,7 @@
 
 <script type="text/x-red" data-help-name="udp in">
     <p>A udp input node, that produces a <b>msg.payload</b> containing a <i>BUFFER</i>, string, or base64 encoded string. Supports multicast.</p>
-    <p>It also provides <b>msg.fromip</b> in the form ipaddress:port .</p>
+    <p>It also provides <b>msg.ip</b> and <b>msg.port</b> to the ip address and port from which the message was received.</b>
     <p>On some systems you may need to be root to use ports below 1024 and/or broadcast.</p>
 </script>
 
@@ -123,6 +123,7 @@
         <label for="node-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+    <div class="form-tips">Tip: leave address and port blank if you want to set using <b>msg.ip</b> and <b>msg.port</b>.</div>
     <script>
         $("#node-input-multicast").change(function() {
             var id = $("#node-input-multicast option:selected").val();
@@ -146,7 +147,7 @@
 
 <script type="text/x-red" data-help-name="udp out">
     <p>This node sends <b>msg.payload</b> to the designated udp host and port. Supports multicast.</p>
-    <p>You may also use <b>msg.destip</b> and <b>msg.port</b> to override the values manually configured.</p>
+    <p>You may also use <b>msg.ip</b> and <b>msg.port</b> to set the destination values.<br/><b>Note</b>: the statically configured values have precedence.</p>
     <p>If you select broadcast either set the address to the local broadcast ip address, or maybe try 255.255.255.255, which is the global broadcast address.</p>
     <p>On some systems you may need to be root to use ports below 1024 and/or broadcast.</p>
 </script>
@@ -157,10 +158,9 @@
         color:"Silver",
         defaults: {
             name: {value:""},
-            addr: {value:"",required:true},
-            //group: {value:""},
+            addr: {value:""},
             iface: {value:""},
-            port: {value:"",required:true,validate:RED.validators.number()},
+            port: {value:""},
             base64: {value:false,required:true},
             multicast: {value:"false"}
         },
diff --git a/nodes/io/32-udp.js b/nodes/io/32-udp.js
index 8666d655c..7470904cb 100644
--- a/nodes/io/32-udp.js
+++ b/nodes/io/32-udp.js
@@ -41,7 +41,7 @@ function UDPin(n) {
         var msg;
         if (node.datatype =="base64") { msg = { payload:message.toString('base64'), fromip:remote.address+':'+remote.port }; }
         else if (node.datatype =="utf8") { msg = { payload:message.toString('utf8'), fromip:remote.address+':'+remote.port }; }
-        else { msg = { payload:message, fromip:remote.address+':'+remote.port }; }
+        else { msg = { payload:message, fromip:remote.address+':'+remote.port, ip:remote.address, port:remote.port }; }
         node.send(msg);
     });
 
@@ -95,16 +95,21 @@ function UDPout(n) {
 
     node.on("input", function(msg) {
         if (msg.payload != null) {
-            //console.log("UDP:",msg.payload);
-            var add = msg.destip || node.addr;
-            var por = msg.port || node.addr;
-            var message;
-            if (node.base64) { message = new Buffer(b64string, 'base64'); }
-            else { message = new Buffer(""+msg.payload); }
-            //console.log("UDP send :",add,por);
-            sock.send(message, 0, message.length, por, add, function(err, bytes) {
-                if (err) node.error("udp : "+err);
-            });
+            var add = node.addr || msg.ip || "";
+            var por = node.port || msg.port || 0;
+            if (add == "") { node.warn("udp: ip address not set"); }
+            else if (por == 0) { node.warn("udp: port not set"); }
+            else if (isNaN(por) || (por < 1) || (por > 65535))  { node.warn("udp: port number not valid"); }
+            else {
+                var message;
+                if (node.base64) { message = new Buffer(b64string, 'base64'); }
+                else if (msg.payload instanceof Buffer) { message = msg.payload; }
+                else { message = new Buffer(""+msg.payload); }
+                console.log("UDP send :",add,por,msg.payload.toString());
+                sock.send(message, 0, message.length, por, add, function(err, bytes) {
+                    if (err) node.error("udp : "+err);
+                });
+            }
         }
     });