diff --git a/FPEngine.cc b/FPEngine.cc index af0d5d2cc..b7f885fea 100644 --- a/FPEngine.cc +++ b/FPEngine.cc @@ -206,7 +206,7 @@ void FPNetworkControl::init(const char *ifname, devtype iftype) { if ((this->nsp = nsock_pool_new(NULL)) == NULL) fatal("Unable to obtain an Nsock pool"); - nsock_set_log_function(nmap_nsock_stderr_logger); + nmap_set_nsock_logger(); nmap_adjust_loglevel(o.packetTrace()); nsock_pool_set_device(nsp, o.device); diff --git a/nmap_dns.cc b/nmap_dns.cc index 7aabe95ee..8ab73c217 100644 --- a/nmap_dns.cc +++ b/nmap_dns.cc @@ -1190,7 +1190,7 @@ static void nmap_mass_rdns_core(Target **targets, int num_targets) { if ((dnspool = nsock_pool_new(NULL)) == NULL) fatal("Unable to create nsock pool in %s()", __func__); - nsock_set_log_function(nmap_nsock_stderr_logger); + nmap_set_nsock_logger(); nmap_adjust_loglevel(o.packetTrace()); nsock_pool_set_device(dnspool, o.device); diff --git a/nse_nsock.cc b/nse_nsock.cc index df9866647..7808585ff 100644 --- a/nse_nsock.cc +++ b/nse_nsock.cc @@ -85,7 +85,7 @@ static nsock_pool new_pool (lua_State *L) nsock_pool *nspp; /* configure logging */ - nsock_set_log_function(nmap_nsock_stderr_logger); + nmap_set_nsock_logger(); nmap_adjust_loglevel(o.scriptTrace()); nsock_pool_set_device(nsp, o.device); diff --git a/output.cc b/output.cc index a6f0fdbcc..fb6e911ed 100644 --- a/output.cc +++ b/output.cc @@ -151,6 +151,7 @@ #include "xml.h" #include "nbase.h" #include "libnetutil/netutil.h" +#include #include @@ -2782,7 +2783,7 @@ void nmap_adjust_loglevel(bool trace) { nsock_set_loglevel(nsock_loglevel); } -void nmap_nsock_stderr_logger(const struct nsock_log_rec *rec) { +static void nmap_nsock_stderr_logger(const struct nsock_log_rec *rec) { int elapsed_time; elapsed_time = TIMEVAL_MSEC_SUBTRACT(rec->time, *(o.getStartTime())); @@ -2790,3 +2791,7 @@ void nmap_nsock_stderr_logger(const struct nsock_log_rec *rec) { log_write(LOG_STDERR, "NSOCK %s [%.4fs] %s(): %s\n", nslog2str(rec->level), elapsed_time/1000.0, rec->func, rec->msg); } + +void nmap_set_nsock_logger() { + nsock_set_log_function(nmap_nsock_stderr_logger); +} diff --git a/output.h b/output.h index 12d71c1a2..1ced040ce 100644 --- a/output.h +++ b/output.h @@ -173,7 +173,6 @@ #ifndef NOLUA #include "nse_main.h" #endif -#include class PortList; class Target; @@ -311,7 +310,7 @@ void printdatafilepaths(); /* nsock logging interface */ void nmap_adjust_loglevel(bool trace); -void nmap_nsock_stderr_logger(const struct nsock_log_rec *rec); +void nmap_set_nsock_logger(); #endif /* OUTPUT_H */ diff --git a/service_scan.cc b/service_scan.cc index 4ce378ed0..93403e757 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -2851,7 +2851,7 @@ int service_scan(std::vector &Targets) { if ((nsp = nsock_pool_new(SG)) == NULL) { fatal("%s() failed to create new nsock pool.", __func__); } - nsock_set_log_function(nmap_nsock_stderr_logger); + nmap_set_nsock_logger(); nmap_adjust_loglevel(o.versionTrace()); nsock_pool_set_device(nsp, o.device);