From 8f83e471b84a0cc6107a13d33a0f7b6da8b02ed5 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Tue, 17 Jul 2018 09:41:52 +0100
Subject: [PATCH] let snmp nodes specify optional :port

to close #462
---
 io/snmp/package.json |  4 ++--
 io/snmp/snmp.html    | 10 +++++-----
 io/snmp/snmp.js      |  7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/io/snmp/package.json b/io/snmp/package.json
index 6021262f..4e7f3926 100644
--- a/io/snmp/package.json
+++ b/io/snmp/package.json
@@ -1,9 +1,9 @@
 {
     "name"          : "node-red-node-snmp",
-    "version"       : "0.0.18",
+    "version"       : "0.0.19",
     "description"   : "A Node-RED node that looks for SNMP oids.",
     "dependencies"  : {
-        "net-snmp"  : "1.1.19"
+        "net-snmp"  : "1.2.4"
     },
     "repository" : {
         "type":"git",
diff --git a/io/snmp/snmp.html b/io/snmp/snmp.html
index f16cf1e5..54feda50 100644
--- a/io/snmp/snmp.html
+++ b/io/snmp/snmp.html
@@ -1,7 +1,7 @@
 <script type="text/x-red" data-template-name="snmp">
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
-        <input type="text" id="node-input-host" placeholder="localhost">
+        <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
     </div>
     <div class="form-row">
         <label for="node-input-community"><i class="fa fa-user"></i> Community</label>
@@ -62,7 +62,7 @@
 <script type="text/x-red" data-template-name="snmp set">
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
-        <input type="text" id="node-input-host" placeholder="localhost">
+        <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
     </div>
     <div class="form-row">
         <label for="node-input-community"><i class="fa fa-user"></i> Community</label>
@@ -131,7 +131,7 @@
 <script type="text/x-red" data-template-name="snmp table">
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
-        <input type="text" id="node-input-host" placeholder="localhost">
+        <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
     </div>
     <div class="form-row">
         <label for="node-input-community"><i class="fa fa-user"></i> Community</label>
@@ -192,7 +192,7 @@
 <script type="text/x-red" data-template-name="snmp subtree">
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
-        <input type="text" id="node-input-host" placeholder="localhost">
+        <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
     </div>
     <div class="form-row">
         <label for="node-input-community"><i class="fa fa-user"></i> Community</label>
@@ -254,7 +254,7 @@
 <script type="text/x-red" data-template-name="snmp walker">
     <div class="form-row">
         <label for="node-input-host"><i class="fa fa-globe"></i> Host</label>
-        <input type="text" id="node-input-host" placeholder="localhost">
+        <input type="text" id="node-input-host" placeholder="ip address(:optional port)">
     </div>
     <div class="form-row">
         <label for="node-input-community"><i class="fa fa-user"></i> Community</label>
diff --git a/io/snmp/snmp.js b/io/snmp/snmp.js
index 9207217d..4c20933e 100644
--- a/io/snmp/snmp.js
+++ b/io/snmp/snmp.js
@@ -7,8 +7,13 @@ module.exports = function (RED) {
 
     function getSession(host, community, version, timeout) {
         var sessionKey = host + ":" + community + ":" + version;
+        var port = 161;
+        if (host.indexOf(":") !== -1) {
+            port = host.split(":")[1];
+            host = host.split(":")[0];
+        }
         if (!(sessionKey in sessions)) {
-            sessions[sessionKey] = snmp.createSession(host, community, { version:version, timeout:(timeout || 5000) });
+            sessions[sessionKey] = snmp.createSession(host, community, { port:port, version:version, timeout:(timeout || 5000) });
         }
         return sessions[sessionKey];
     }