Merge branch 'v0.4.17'

jas- · Oct 29, 2019 · 3cda3ba · 3cda3ba
2 parents 9a1e1de + b32aa91
commit 3cda3ba
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 31 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 - 2018 Jason Gerfen <jason.gerfen@gmail.com>
+Copyright (c) 2013 - 2019 Jason Gerfen <jason.gerfen@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ To install `npm install libnmap`
 * `verbose`   {Boolean}   Turn on verbosity during scan(s)
 * `ports`     {String}    Range of ports to scan
 * `range`     {Array}     An array of hostnames/ipv4/ipv6, CIDR or ranges
-* `timeout`   {Number}    Number of minutes to wait for host/port response
+* `timeout`   {Number}    Number of seconds to wait for host/port response
 * `blocksize` {Number}    Number of hosts per network scanning block
 * `threshold` {Number}    Max number of  spawned process
 * `flags`     {Array}     Array of flags for .spawn()
@@ -92,4 +92,4 @@ to help facilitate pull requests.
 
 This software is licensed under the [MIT License](https://github.com/jas-/node-libnmap/blob/master/LICENSE).
 
-Copyright Jason Gerfen, 2013-2018.
+Copyright Jason Gerfen, 2013-2019.
diff --git a/examples/accuracy.js b/examples/accuracy.js
@@ -1,14 +1,14 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 
 'use strict'
 
 const nmap = require('../');
 const opts = {
-  timeout: 900, // 900s = 10m and increases the reliability of scan results
+  timeout: 900, // 900s = 15m and increases the reliability of scan results
   flags: [
     '-T0', // Paranoid scan type; very slow but accurate
     '--max-retries 10', // Don't give up on slow responding hosts

diff --git a/examples/blocksize.js b/examples/blocksize.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/default.js b/examples/default.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/default2io.js b/examples/default2io.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/discover.js b/examples/discover.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/flags.js b/examples/flags.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/ipv6.js b/examples/ipv6.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/ports.js b/examples/ports.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/threshold.js b/examples/threshold.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/timeout.js b/examples/timeout.js
@@ -1,14 +1,14 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 
 'use strict'
 
 const nmap = require('../');
 const opts = {
-  timeout: 900, // 900s = 10m and increases the reliability of scan results
+  timeout: 900, // 900s = 15m and increases the reliability of scan results
   range: ['scanme.nmap.org', '192.168.0.0/26']
 };
 

diff --git a/examples/udp.js b/examples/udp.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/examples/xml.js b/examples/xml.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/lib/classes/networking.js b/lib/classes/networking.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/lib/classes/reporting.js b/lib/classes/reporting.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/lib/classes/tools.js b/lib/classes/tools.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 
@@ -120,7 +120,7 @@ class tools extends emitter {
         const args = obj.slice(1);
 
         if (opts.verbose)
-          console.log(`Running: ${cmd}`);
+          console.log(`Running: ${cmd} ${args}`);
 
         // Push it on to the heap
         const execute = proc(cmd, args);

diff --git a/lib/classes/validation.js b/lib/classes/validation.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/lib/libnmap.js b/lib/libnmap.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libnmap",
-  "version": "v0.4.16",
+  "version": "v0.4.19",
   "description": "libnmap for node.js",
   "author": "Jason Gerfen <jason.gerfen@gmail.com>",
   "keywords": [
@@ -33,14 +33,14 @@
     "test": "./node_modules/.bin/mocha -R spec"
   },
   "dependencies": {
-    "async": "^2.6.1",
+    "async": "^2.6.3",
     "cidr-js": "git+https://github.com/jas-/cidr-js.git#v2.3.2",
-    "deepmerge": "^2.1.1",
+    "deepmerge": "^2.2.1",
     "hasbin": "^1.2.3",
-    "ip-address": "^5.8.9",
+    "ip-address": "^5.9.4",
     "netmask": "^1.0.6",
     "stack-trace": "0.0.10",
-    "xml2js": "^0.4.19"
+    "xml2js": "^0.4.22"
   },
   "devDependencies": {
     "mocha": "latest",

diff --git a/test/discover.js b/test/discover.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */
 

diff --git a/test/scan.js b/test/scan.js
@@ -1,6 +1,6 @@
 /*!
  * libnmap
- * Copyright(c) 2013-2018 Jason Gerfen <jason.gerfen@gmail.com>
+ * Copyright(c) 2013-2019 Jason Gerfen <jason.gerfen@gmail.com>
  * License: MIT
  */