Merge pull request #493 from janowagner/drop_network_scan

Drop network scan
greenbone · May 7, 2020 · 335f7fb · 335f7fb
2 parents 14faf0f + c467fae
commit 335f7fb
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 2,480 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Clean the new kb when the scan was stopped and the host has not been started. [#494](https://github.com/greenbone/openvas/pull/494)
 - Prevent child deadlock. [#491](https://github.com/greenbone/openvas/pull/491)
 
+### Removed
+- Removed "network scan" mode. This includes removal of NASL API methods "scan_phase()" and "network_targets()". Sending a "network_mode=yes" in a scanner configuration will have no effect anymore. [#493](https://github.com/greenbone/openvas/pull/493)
+
 [Unreleased]: https://github.com/greenbone/openvas/compare/openvas-7.0...master
 
 ## [7.0.1] (unreleased)

diff --git a/COPYING b/COPYING
@@ -65,7 +65,6 @@ nasl/nasl-lint.c: GPL-2+
 nasl/nasl.c: GPL-2
 nasl/nasl.h: GPL-2
 nasl/nasl_builtin_find_service.c: GPL-2
-nasl/nasl_builtin_nmap.c: GPL-2+
 nasl/nasl_builtin_openvas_tcp_scanner.c: GPL-2
 nasl/nasl_builtin_plugins.h: GPL-2+
 nasl/nasl_builtin_synscan.c: GPL-2

diff --git a/doc/redis_config.md b/doc/redis_config.md
@@ -53,8 +53,6 @@ be calculated using the following formula:
 #DB = 1 + (#of parallel tasks) * (#of parallel hosts)
 ```
 
-When using network scan, add one slot for the network DB.
-
 The desired/needed value should be set to redis.conf, as a `databases`
 directive.
 

diff --git a/misc/scanneraux.h b/misc/scanneraux.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2019 Greenbone Networks GmbH
+/* Copyright (C) 2009-2020 Greenbone Networks GmbH
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
@@ -31,8 +31,6 @@
 
 struct scan_globals
 {
-  char *network_targets;
-  char *network_scan_status;
   GHashTable *files_translation;
   GHashTable *files_size_translation;
   char *scan_id;

diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2019 Greenbone Networks GmbH
+# Copyright (C) 2009-2020 Greenbone Networks GmbH
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
@@ -159,7 +159,7 @@ endif (NOT BISON_FOUND)
 
 set (FILES arc4.c capture_packet.c charcnv.c exec.c genrand.c hmacmd5.c
      iconv.c lint.c md4.c md5.c nasl.c nasl_builtin_find_service.c
-     nasl_builtin_openvas_tcp_scanner.c nasl_builtin_synscan.c nasl_builtin_nmap.c
+     nasl_builtin_openvas_tcp_scanner.c nasl_builtin_synscan.c
      nasl_cmd_exec.c nasl_crypto2.c nasl_snmp.c nasl_ssh.c nasl_cert.c
      nasl_crypto.c nasl_debug.c nasl_func.c nasl_grammar.tab.c nasl_host.c
      nasl_http.c nasl_init.c nasl_lex_ctxt.c nasl_misc_funcs.c nasl_scanner_glue.c