diff --git a/Makefile.in b/Makefile.in index 36b9fb548..da25a601c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,7 @@ export LIBLUA_LIBS = @LIBLUA_LIBS@ CC = @CC@ CXX = @CXX@ CCOPT = -DBGFLAGS = -O0 -g -pg -ftest-coverage -fprofile-arcs +DBGFLAGS = LIBPCAPDIR = @libpcapdir@ LIBPCREDIR = @LIBPCREDIR@ export LIBDNETDIR = @LIBDNETDIR@ diff --git a/scan_engine.cc b/scan_engine.cc index 1e9599a24..1975df90b 100644 --- a/scan_engine.cc +++ b/scan_engine.cc @@ -1769,13 +1769,6 @@ void HostScanStats::destroyAllOutstandingProbes() { destroyOutstandingProbe(probes_outstanding.begin()); } -/* This is a temporary function that logs the congestion window and congestion - control threshold for the purposes of graphing those values. */ -void log_cc(const GroupScanStats *gstats) { - if (o.debugging) - log_write(LOG_PLAIN, "cc: %.2f %.4f %d\n", o.TimeSinceStartMS() / 1000.0, gstats->timing.cwnd, gstats->timing.ccthresh); -} - /* Adjust various timing variables based on pcket receipt. Pass rcvdtime = NULL if you have given up on a probe and want to count this as a DROPPED PACKET */ @@ -1835,8 +1828,6 @@ static void ultrascan_adjust_times(UltraScanInfo *USI, HostScanStats *hss, USI->gstats->timing.cwnd = USI->perf.max_cwnd; } - log_cc(USI->gstats); - /* If packet drops are particularly bad, enforce a delay between packet sends (useful for cases such as UDP scan where responses are frequently rate limited by dest machines or firewalls) */ @@ -2779,7 +2770,7 @@ static void sendGlobalPingProbe(UltraScanInfo *USI) { hss = USI->gstats->pinghost; assert(hss != NULL); - if (o.debugging > 1 || o.debugging) { + if (o.debugging > 1) { char tmpbuf[32]; log_write(LOG_PLAIN, "Ultrascan GLOBAL PING SENT to %s [%s]\n", hss->target->targetipstr(), probespec2ascii(&hss->pingprobe, tmpbuf, sizeof(tmpbuf))); @@ -2916,11 +2907,6 @@ static void printAnyStats(UltraScanInfo *USI) { HostScanStats *hss; struct ultra_timing_vals hosttm; - /* This is a temporary measure to log the number of active probes for the - purpose of making graphs. */ - if (o.debugging) - log_write(LOG_PLAIN, "num_probes_active: %.2f %d\n", o.TimeSinceStartMS() / 1000.0, USI->gstats->num_probes_active); - /* Print debugging states for each host being scanned */ if (o.debugging > 2) { log_write(LOG_PLAIN, "**TIMING STATS**: IP, probes active/freshportsleft/retry_stack/outstanding/retranwait/onbench, cwnd/ccthresh/delay, timeout/srtt/rttvar/\n"); @@ -4482,8 +4468,6 @@ void ultra_scan(vector &Targets, struct scan_lists *ports, if (to != NULL) USI->gstats->to = *to; - log_cc(USI->gstats); - if (o.verbose) { char targetstr[128]; bool plural = (Targets.size() != 1);