Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit e5f0581649ca5ad8d9f7dab05decef4bbdfdd153
- Author: batrick <batrick@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Wed Jul 30 20:49:19 2014 +0000
- Use ssize_t for read return.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33385 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/nmap_tty.cc b/nmap_tty.cc
- index b223b36..ab9fb81 100644
- --- a/nmap_tty.cc
- +++ b/nmap_tty.cc
- @@ -379,8 +379,7 @@ bool keyWasPressed()
- return false;
- }
- -int tty_read(char *buffer, size_t length) {
- - int num_chars;
- +ssize_t tty_read(char *buffer, size_t length) {
- #ifdef __CYGWIN32__
- fd_set set;
- struct timeval tv;
- @@ -391,10 +390,9 @@ int tty_read(char *buffer, size_t length) {
- FD_ZERO(&set); FD_SET(tty_fd, &set);
- tv.tv_sec = 0; tv.tv_usec = 0;
- if (select(tty_fd + 1, &set, NULL, NULL, &tv) <= 0)
- - return -1;
- + return -1;
- #endif
- - num_chars = read(tty_fd, buffer, length);
- - return num_chars;
- + return read(tty_fd, buffer, length);
- }
- return -1;
- }
- diff --git a/nmap_tty.h b/nmap_tty.h
- index 187297e..921b92d 100644
- --- a/nmap_tty.h
- +++ b/nmap_tty.h
- @@ -134,6 +134,6 @@ void tty_init();
- calling method should print a status message */
- bool keyWasPressed();
- -int tty_read(char *buffer, size_t length);
- +ssize_t tty_read(char *buffer, size_t length);
- void set_tty_echo(int echo_on);
- diff --git a/nse_main.cc b/nse_main.cc
- index 3afd5fa..c45748b 100644
- --- a/nse_main.cc
- +++ b/nse_main.cc
- @@ -165,7 +165,7 @@ static int key_was_pressed (lua_State *L)
- static int l_read_tty (lua_State *L) {
- char buf[4096];
- - int bytes_read = tty_read(buf, sizeof(buf));
- + ssize_t bytes_read = tty_read(buf, sizeof(buf));
- if (bytes_read > 0) {
- lua_pushlstring(L, buf, bytes_read);
- return 1;
- commit 672a74def54d7345be06afcbde24db5ae85e9dd1
- Author: batrick <batrick@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Mon Jun 23 21:59:42 2014 +0000
- Fix some bugs I made.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33052 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/nse_main.lua b/nse_main.lua
- index 7cae80e..5bbe685 100644
- --- a/nse_main.lua
- +++ b/nse_main.lua
- @@ -245,7 +245,7 @@ do
- end
- local line, leftover = match(buff, "(.-)\n(.*)")
- if line then
- - buf = leftover
- + buff = leftover
- end
- return line
- end
- @@ -1009,12 +1009,13 @@ local function run (threads_iter, hosts)
- if script_to_kill then
- for co, thread in pairs(all) do
- if thread.id == script_to_kill then
- - all[co], waiting[co], running[co], pending[co] = nil, nil, nil, nil
- + all[co], waiting[co], running[co], pending[co], num_threads = nil, nil, nil, nil, num_threads-1;
- debug_out("Killed script %s: %s\n", script_to_kill, co)
- + thread:close(timeouts, "killed");
- end
- end
- end
- - else
- + elseif cmd then
- debug_out("Command not recognized: '" .. cmd .. "'\n")
- end
- debug_out(">>")
- commit 63e3a252bf1b04876aef8234575365bc3fcf021b
- Author: batrick <batrick@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Mon Jun 23 21:32:39 2014 +0000
- Simplify bit flag generation.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33051 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/output.h b/output.h
- index 7ff3bc9..c0a6e29 100644
- --- a/output.h
- +++ b/output.h
- @@ -131,17 +131,17 @@
- #ifndef OUTPUT_H
- #define OUTPUT_H
- -#define LOG_NUM_FILES 4 /* # of values that actual files (they must come first */
- -#define LOG_FILE_MASK 15 /* The mask for log types in the file array */
- -#define LOG_NORMAL 1
- -#define LOG_MACHINE 2
- -#define LOG_SKID 4
- -#define LOG_XML 8
- -#define LOG_STDOUT 1024
- -#define LOG_STDERR 2048
- -#define LOG_SKID_NOXLT 4096
- -#define LOG_DEBUGOUT 8192
- -#define LOG_DEBUGERR 16384
- +#define LOG_NUM_FILES 4 /* # of values that actual files (they must come first). */
- +#define LOG_FILE_MASK (0x0f) /* The mask for log types in the file array. */
- +#define LOG_NORMAL (1<<0)
- +#define LOG_MACHINE (1<<1)
- +#define LOG_SKID (1<<2)
- +#define LOG_XML (1<<3)
- +#define LOG_STDOUT (1<<10)
- +#define LOG_STDERR (1<<11)
- +#define LOG_SKID_NOXLT (1<<12)
- +#define LOG_DEBUGOUT (1<<13)
- +#define LOG_DEBUGERR (1<<14)
- #define LOG_MAX LOG_DEBUGERR /* The maximum log type value */
- #define LOG_PLAIN LOG_NORMAL|LOG_SKID|LOG_STDOUT
- commit 97c0998269882a59c98867e63da54598a6a9b770
- Author: batrick <batrick@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Sat Jun 14 22:57:09 2014 +0000
- More minor code changes.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33013 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/nse_main.lua b/nse_main.lua
- index aacfdb1..7cae80e 100644
- --- a/nse_main.lua
- +++ b/nse_main.lua
- @@ -218,13 +218,13 @@ end
- ---
- -- Writes to stdout if NSE debugger is enabled
- -function debug_out(fmt, ...)
- +local function debug_out(fmt, ...)
- log_write_raw("debugout", format(fmt, ...))
- end
- ---
- -- Writes to stderr if NSE debugger is enabled
- -function debug_err(fmt, ...)
- +local function debug_err(fmt, ...)
- log_write_raw("debugerr", format(fmt, ...))
- end
- @@ -233,23 +233,21 @@ end
- -- It does this by reading bytes incrementally, and returning nil until it has
- -- collected an entire line to return. Meant to be called when NmapOpts.nse_dubugger_active
- -- is set because otherwise calls to keywaspressed() will result in the tty being flushed.
- +local readline;
- do
- local buff = ""
- function readline()
- if not find(buff, "\n") then
- - local bytes = cnse.read_tty(128)
- + local bytes = cnse.read_tty()
- if bytes then
- buff = buff .. bytes
- end
- end
- - if find(buff, "\n") then
- - local index = find(buff, "\n")
- - local line = sub(buff, 1, index)
- - buff = sub(buff, index+1, -1)
- - return line
- - else
- - return nil
- + local line, leftover = match(buff, "(.-)\n(.*)")
- + if line then
- + buf = leftover
- end
- + return line
- end
- end
- @@ -989,6 +987,7 @@ local function run (threads_iter, hosts)
- end
- local nr, nw = table_size(running), table_size(waiting);
- + -- TODO support tab-completion (requires turning echo off), EOF for "exit", "help"
- if cnse.debugger_enabled() then
- local line = readline()
- if line then
- commit 29ac46c750356bfd428ff5cec8ae78fa361b9398
- Author: batrick <batrick@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Sat Jun 14 22:54:55 2014 +0000
- Some code simplification.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33012 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/nse_main.cc b/nse_main.cc
- index bb925b3..3afd5fa 100644
- --- a/nse_main.cc
- +++ b/nse_main.cc
- @@ -164,19 +164,14 @@ static int key_was_pressed (lua_State *L)
- }
- static int l_read_tty (lua_State *L) {
- - const int max_bytes = luaL_checkint(L, 1);
- - luaL_Buffer b;
- - char *buff = new char[max_bytes];
- - int bytes_read = tty_read(buff, max_bytes);
- + char buf[4096];
- + int bytes_read = tty_read(buf, sizeof(buf));
- if (bytes_read > 0) {
- - luaL_buffinitsize(L, &b, bytes_read);
- - luaL_addlstring(&b, buff, bytes_read);
- - luaL_pushresultsize(&b, bytes_read-1);
- + lua_pushlstring(L, buf, bytes_read);
- + return 1;
- } else {
- - lua_pushnil(L);
- + return nseU_safeerror(L, "%s", strerror(errno));
- }
- - delete[] buff;
- - return 1;
- }
- static int l_debugger_enabled(lua_State *L) {
- @@ -188,9 +183,8 @@ static int l_debugger_enabled(lua_State *L) {
- }
- static int l_set_debugger(lua_State *L) {
- - bool val = lua_toboolean(L,1);
- - o.nse_debugger_enabled = val;
- - set_tty_echo(val);
- + o.nse_debugger_enabled = lua_toboolean(L,1);
- + set_tty_echo(o.nse_debugger_enabled);
- return 0;
- }
- commit 581d7cc8faa90fe12b84ebac7f4624e1fc78139a
- Author: batrick <batrick@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Sat Jun 14 22:53:36 2014 +0000
- Use size_t/int.
- Forgot to add this to previous commit.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33011 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/nmap_tty.cc b/nmap_tty.cc
- index 24a09e8..b223b36 100644
- --- a/nmap_tty.cc
- +++ b/nmap_tty.cc
- @@ -379,7 +379,7 @@ bool keyWasPressed()
- return false;
- }
- -int tty_read(char *buffer, int length) {
- +int tty_read(char *buffer, size_t length) {
- int num_chars;
- #ifdef __CYGWIN32__
- fd_set set;
- @@ -399,7 +399,7 @@ int tty_read(char *buffer, int length) {
- return -1;
- }
- -void set_tty_echo(bool echo_on) {
- +void set_tty_echo(int echo_on) {
- if (!tty_fd) return;
- struct termios ti;
- commit 379e2cae5cefc4d97e51ac2bcd40365b65ba5c4e
- Author: batrick <batrick@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Sat Jun 14 22:52:58 2014 +0000
- Use size_t and int.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33010 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/nmap_tty.h b/nmap_tty.h
- index b7e6b56..187297e 100644
- --- a/nmap_tty.h
- +++ b/nmap_tty.h
- @@ -134,6 +134,6 @@ void tty_init();
- calling method should print a status message */
- bool keyWasPressed();
- -int tty_read(char* buffer, int length);
- +int tty_read(char *buffer, size_t length);
- -void set_tty_echo(bool echo_on);
- +void set_tty_echo(int echo_on);
- commit 9973b9c514f257b0bdf737973ec766368eafb55a
- Author: devin <devin@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Fri Jun 13 04:45:58 2014 +0000
- Prototype of NSE debugger, demonstrates changes to the tty.
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33007 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/NmapOps.cc b/NmapOps.cc
- index 24fc1d0..835e8bc 100644
- --- a/NmapOps.cc
- +++ b/NmapOps.cc
- @@ -359,6 +359,7 @@ void NmapOps::Initialize() {
- numhosts_up = 0;
- numhosts_scanning = 0;
- noninteractive = false;
- + nse_debugger_enabled = false;
- current_scantype = STYPE_UNKNOWN;
- ipoptions = NULL;
- ipoptionslen = 0;
- diff --git a/NmapOps.h b/NmapOps.h
- index 89eb41d..65c876b 100644
- --- a/NmapOps.h
- +++ b/NmapOps.h
- @@ -401,6 +401,7 @@ class NmapOps {
- stype current_scantype;
- bool noninteractive;
- + bool nse_debugger_enabled;
- bool release_memory; /* suggest to release memory before quitting. used to find memory leaks. */
- private:
- int max_os_tries;
- diff --git a/nmap_tty.cc b/nmap_tty.cc
- index 463b364..24a09e8 100644
- --- a/nmap_tty.cc
- +++ b/nmap_tty.cc
- @@ -307,7 +307,7 @@ bool keyWasPressed()
- static struct timeval stats_time = { 0 };
- int c;
- - if (o.noninteractive)
- + if (o.noninteractive || o.nse_debugger_enabled)
- return false;
- if ((c = tty_getchar()) >= 0) {
- @@ -327,6 +327,10 @@ bool keyWasPressed()
- } else if (c == 'D') {
- if (o.debugging > 0) o.debugging--;
- log_write(LOG_STDOUT, "Debugging Decreased to %d.\n", o.debugging);
- + } else if (c == 'n') {
- + o.nse_debugger_enabled = true;
- + log_write(LOG_DEBUGOUT, "NSE Debugger enabled.\n>>");
- + set_tty_echo(true);
- } else if (c == 'p') {
- o.setPacketTrace(true);
- log_write(LOG_STDOUT, "Packet Tracing enabled.\n");
- @@ -374,3 +378,37 @@ bool keyWasPressed()
- return false;
- }
- +
- +int tty_read(char *buffer, int length) {
- + int num_chars;
- +#ifdef __CYGWIN32__
- + fd_set set;
- + struct timeval tv;
- +#endif
- +
- + if (tty_fd && tcgetpgrp(tty_fd) == getpgrp()) {
- +#ifdef __CYGWIN32__
- + FD_ZERO(&set); FD_SET(tty_fd, &set);
- + tv.tv_sec = 0; tv.tv_usec = 0;
- + if (select(tty_fd + 1, &set, NULL, NULL, &tv) <= 0)
- + return -1;
- +#endif
- + num_chars = read(tty_fd, buffer, length);
- + return num_chars;
- + }
- + return -1;
- +}
- +
- +void set_tty_echo(bool echo_on) {
- + if (!tty_fd) return;
- +
- + struct termios ti;
- + tcgetattr(tty_fd, &ti);
- + if (echo_on) {
- + ti.c_lflag |= ECHO;
- + }
- + else {
- + ti.c_lflag &= ~( ECHO);
- + }
- + tcsetattr(tty_fd, TCSANOW, &ti);
- +}
- diff --git a/nmap_tty.h b/nmap_tty.h
- index 944d916..b7e6b56 100644
- --- a/nmap_tty.h
- +++ b/nmap_tty.h
- @@ -134,3 +134,6 @@ void tty_init();
- calling method should print a status message */
- bool keyWasPressed();
- +int tty_read(char* buffer, int length);
- +
- +void set_tty_echo(bool echo_on);
- diff --git a/nse_main.cc b/nse_main.cc
- index 362d167..bb925b3 100644
- --- a/nse_main.cc
- +++ b/nse_main.cc
- @@ -163,6 +163,37 @@ static int key_was_pressed (lua_State *L)
- return 1;
- }
- +static int l_read_tty (lua_State *L) {
- + const int max_bytes = luaL_checkint(L, 1);
- + luaL_Buffer b;
- + char *buff = new char[max_bytes];
- + int bytes_read = tty_read(buff, max_bytes);
- + if (bytes_read > 0) {
- + luaL_buffinitsize(L, &b, bytes_read);
- + luaL_addlstring(&b, buff, bytes_read);
- + luaL_pushresultsize(&b, bytes_read-1);
- + } else {
- + lua_pushnil(L);
- + }
- + delete[] buff;
- + return 1;
- +}
- +
- +static int l_debugger_enabled(lua_State *L) {
- + if (o.nse_debugger_enabled)
- + lua_pushboolean(L, true);
- + else
- + lua_pushboolean(L, false);
- + return 1;
- +}
- +
- +static int l_set_debugger(lua_State *L) {
- + bool val = lua_toboolean(L,1);
- + o.nse_debugger_enabled = val;
- + set_tty_echo(val);
- + return 0;
- +}
- +
- static int scp (lua_State *L)
- {
- static const char * const ops[] = {"printStats", "printStatsIfNecessary",
- @@ -200,13 +231,13 @@ static int scan_progress_meter (lua_State *L)
- scripts. */
- static int l_log_write(lua_State *L)
- {
- - static const char *const ops[] = {"stdout", "stderr", NULL};
- - static const int logs[] = {LOG_STDOUT, LOG_STDERR};
- + static const char *const ops[] = {"stdout", "stderr", "debugout", "debugerr", NULL};
- + static const int logs[] = {LOG_STDOUT, LOG_STDERR, LOG_DEBUGOUT, LOG_DEBUGERR};
- int log = logs[luaL_checkoption(L, 1, NULL, ops)];
- log_write(log, "%s", luaL_checkstring(L, 2));
- return 0;
- }
- -
- +
- static int l_xml_start_tag(lua_State *L)
- {
- const char *name;
- @@ -355,6 +386,9 @@ static void open_cnse (lua_State *L)
- {"fetchfile_absolute", fetchfile_absolute},
- {"fetchscript", fetchscript},
- {"key_was_pressed", key_was_pressed},
- + {"read_tty", l_read_tty},
- + {"debugger_enabled", l_debugger_enabled},
- + {"set_debugger", l_set_debugger},
- {"scan_progress_meter", scan_progress_meter},
- {"timedOut", timedOut},
- {"startTimeOutClock", startTimeOutClock},
- diff --git a/nse_main.lua b/nse_main.lua
- index c2a1fc1..aacfdb1 100644
- --- a/nse_main.lua
- +++ b/nse_main.lua
- @@ -115,6 +115,7 @@ local gsub = string.gsub;
- local lower = string.lower;
- local match = string.match;
- local sub = string.sub;
- +local gmatch = string.gmatch
- local table = require "table";
- local concat = table.concat;
- @@ -215,6 +216,43 @@ local function log_error (fmt, ...)
- log_write("stderr", format(fmt, ...));
- end
- +---
- +-- Writes to stdout if NSE debugger is enabled
- +function debug_out(fmt, ...)
- + log_write_raw("debugout", format(fmt, ...))
- +end
- +
- +---
- +-- Writes to stderr if NSE debugger is enabled
- +function debug_err(fmt, ...)
- + log_write_raw("debugerr", format(fmt, ...))
- +end
- +
- +
- +--- Trys to read a line from the tty in a non-blocking manner
- +-- It does this by reading bytes incrementally, and returning nil until it has
- +-- collected an entire line to return. Meant to be called when NmapOpts.nse_dubugger_active
- +-- is set because otherwise calls to keywaspressed() will result in the tty being flushed.
- +do
- + local buff = ""
- + function readline()
- + if not find(buff, "\n") then
- + local bytes = cnse.read_tty(128)
- + if bytes then
- + buff = buff .. bytes
- + end
- + end
- + if find(buff, "\n") then
- + local index = find(buff, "\n")
- + local line = sub(buff, 1, index)
- + buff = sub(buff, index+1, -1)
- + return line
- + else
- + return nil
- + end
- + end
- +end
- +
- local function table_size (t)
- local n = 0; for _ in pairs(t) do n = n + 1; end return n;
- end
- @@ -951,6 +989,38 @@ local function run (threads_iter, hosts)
- end
- local nr, nw = table_size(running), table_size(waiting);
- + if cnse.debugger_enabled() then
- + local line = readline()
- + if line then
- + local words = gmatch(line, "[^%s]+")
- + local cmd = words()
- + if cmd == "status" then
- + debug_out("Active NSE Script Threads: %d (%d waiting)\n",
- + nr+nw, nw);
- + elseif cmd == "exit" then
- + debug_out("NSE debugger disabled.\n")
- + cnse.set_debugger(false)
- + elseif cmd == "list" then
- + debug_out("Running threads: \n")
- + for co, thread in pairs(all) do
- + debug_out(thread.info .. '\n')
- + end
- + elseif cmd == "kill" then
- + local script_to_kill = words()
- + if script_to_kill then
- + for co, thread in pairs(all) do
- + if thread.id == script_to_kill then
- + all[co], waiting[co], running[co], pending[co] = nil, nil, nil, nil
- + debug_out("Killed script %s: %s\n", script_to_kill, co)
- + end
- + end
- + end
- + else
- + debug_out("Command not recognized: '" .. cmd .. "'\n")
- + end
- + debug_out(">>")
- + end
- + end
- if cnse.key_was_pressed() then
- print_verbose(1, "Active NSE Script Threads: %d (%d waiting)\n",
- nr+nw, nw);
- diff --git a/output.cc b/output.cc
- index 66b0ec1..695c77e 100644
- --- a/output.cc
- +++ b/output.cc
- @@ -958,12 +958,31 @@ void log_vwrite(int logt, const char *fmt, va_list ap) {
- switch (logtype) {
- case LOG_STDOUT:
- - vfprintf(o.nmap_stdout, fmt, ap);
- - break;
- + if (o.nse_debugger_enabled) break;
- + else {
- + vfprintf(o.nmap_stdout, fmt, ap);
- + break;
- + }
- case LOG_STDERR:
- - fflush(stdout); // Otherwise some systems will print stderr out of order
- - vfprintf(stderr, fmt, ap);
- + if (o.nse_debugger_enabled) break;
- + else {
- + fflush(stdout); // Otherwise some systems will print stderr out of order
- + vfprintf(stderr, fmt, ap);
- + break;
- + }
- +
- + case LOG_DEBUGOUT:
- + if (o.nse_debugger_enabled)
- + vfprintf(o.nmap_stdout, fmt, ap);
- + fflush(stdout);
- + break;
- +
- + case LOG_DEBUGERR:
- + if (o.nse_debugger_enabled) {
- + fflush(stdout); // Otherwise some systems will print stderr out of order
- + vfprintf(stderr, fmt, ap);
- + }
- break;
- case LOG_SKID_NOXLT:
- diff --git a/output.h b/output.h
- index 72eab63..7ff3bc9 100644
- --- a/output.h
- +++ b/output.h
- @@ -140,7 +140,9 @@
- #define LOG_STDOUT 1024
- #define LOG_STDERR 2048
- #define LOG_SKID_NOXLT 4096
- -#define LOG_MAX LOG_SKID_NOXLT /* The maximum log type value */
- +#define LOG_DEBUGOUT 8192
- +#define LOG_DEBUGERR 16384
- +#define LOG_MAX LOG_DEBUGERR /* The maximum log type value */
- #define LOG_PLAIN LOG_NORMAL|LOG_SKID|LOG_STDOUT
- commit 98952a8e03942d41938c4b7b9d2c2171c5548694
- Author: devin <devin@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Thu Jun 12 21:17:23 2014 +0000
- NSE debugger initial commit
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33005 e0a8ed71-7df4-0310-8962-fdc924857419
- diff --git a/BSDmakefile b/BSDmakefile
- new file mode 100644
- index 0000000..ecfe32b
- --- /dev/null
- +++ b/BSDmakefile
- @@ -0,0 +1,9 @@
- +# $Id$
- +# Redirect BSD make to GNU gmake for convenience
- +
- +USE_GNU:
- + @gmake $(.TARGETS)
- +
- +$(.TARGETS): USE_GNU
- +
- +.PHONY: USE_GNU
- diff --git a/CHANGELOG b/CHANGELOG
- new file mode 100644
- index 0000000..169746a
- --- /dev/null
- +++ b/CHANGELOG
- @@ -0,0 +1,13870 @@
- +# Nmap Changelog ($Id$); -*-text-*-
- +
- +o Modify the included libpcap configure script to disable certain unused
- + features: bluetooth, usb, usb-can, and dbus sniffing. Dbus support caused a
- + build problem on CentOS 6.5. [Daniel Miller]
- +
- +o Added new option --noscript to turn off NSE. Useful to avoid running
- + version-category scripts during a quick -sV scan. [Daniel Miller]
- +
- +o [NSE] Add bacnet-info script to get device information from SCADA/ICS devices
- + via BACnet (Building Automation and Control Networks) [Stephen Hilt, Michael
- + Toecker]
- +
- +o [NSE] Add Cisco Anyconnect library and scripts http-cisco-anyconnect,
- + http-vuln-cve2014-2126, http-vuln-cve2014-2127, http-vuln-cve2014-2128 and
- + http-vuln-cve2014-2129. [Patrik Karlsson]
- +
- +o [NSE] Add enip-info script to get device information from SCADA/ICS devices
- + via EtherNet/IP [Stephen Hilt]
- +
- +o Fixed a bug which caused Nmap to be unable to have any runtime interaction
- + when called from sudo or from a shell script. [Jay Bosamiya]
- +
- +o Improvements to whois-ip.nse: fix an unhandled error when a referred-to
- + response could not be understood; add a new pattern to recognise a
- + LACNIC "record not found" type of response and update the way ARIN is
- + queried. [jah]
- +
- +Nmap 6.46 [2014-04-18]
- +
- +o [NSE] Made numerous improvements to ssl-heartbleed to provide
- + more reliable detection of the vulnerability.
- +
- +o [Zenmap] Fixed a bug which caused this crash message:
- + IOError: [Errno socket error] [Errno 10060] A connection attempt failed
- + because the connected party did not properly respond after a period of
- + time, or established connection failed because connected host has
- + failed to
- + respond
- + The bug was caused by us adding a DOCTYPE definition to Nmap's XML
- break;
- case LOG_SKID_NOXLT:
- diff --git a/output.h b/output.h
- index 72eab63..7ff3bc9 100644
- --- a/output.h
- +++ b/output.h
- @@ -140,7 +140,9 @@
- #define LOG_STDOUT 1024
- #define LOG_STDERR 2048
- #define LOG_SKID_NOXLT 4096
- -#define LOG_MAX LOG_SKID_NOXLT /* The maximum log type value */
- +#define LOG_DEBUGOUT 8192
- +#define LOG_DEBUGERR 16384
- +#define LOG_MAX LOG_DEBUGERR /* The maximum log type value */
- #define LOG_PLAIN LOG_NORMAL|LOG_SKID|LOG_STDOUT
- commit 98952a8e03942d41938c4b7b9d2c2171c5548694
- Author: devin <devin@e0a8ed71-7df4-0310-8962-fdc924857419>
- Date: Thu Jun 12 21:17:23 2014 +0000
- NSE debugger initial commit
- git-svn-id: https://svn.nmap.org/nmap-exp/devin/nse-debugger@33005 e0a8ed71-7df4-0310-8962-fdc924857419
Add Comment
Please, Sign In to add comment