Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop network scan #493

Merged
merged 21 commits into from
May 7, 2020
Merged

Drop network scan #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fb042c5
Disable network_scan.
janowagner Apr 28, 2020
fb3f66d
Remove do_network_scan code paths
janowagner Apr 28, 2020
0a16345
Remove code paths for network_phase.
janowagner Apr 28, 2020
8a5a277
Fix indenting.
janowagner Apr 28, 2020
fba7d72
Drop unused parameter of plugins_scheduler_init()
janowagner Apr 28, 2020
cd6b6fd
Drop code paths for nss = "busy"
janowagner Apr 28, 2020
020271c
Drop code path for NSS_BUSY
janowagner Apr 28, 2020
373f4a8
Drop code path for NSS_DONE.
janowagner Apr 28, 2020
bdd3a63
Remove now unused function kb_duplicate().
janowagner Apr 28, 2020
dce5d39
Drop code path for NSS_NONE
janowagner Apr 28, 2020
6a19609
Remove code path for network_scan.
janowagner Apr 28, 2020
0f57734
No need to set default for network_scan
janowagner Apr 28, 2020
51616c1
Remove handling of now unused net_kb
janowagner Apr 29, 2020
eb01d9e
Resolve handle_client() into scanner_thread()
janowagner Apr 29, 2020
b65d830
Drop builtin_nmap module.
janowagner Apr 29, 2020
622ce8e
Remove any code path about network_targets
janowagner Apr 29, 2020
d367454
Remove any code path about scan_phase.
janowagner Apr 29, 2020
12fc100
Remove global network_scan_status variable.
janowagner Apr 29, 2020
5b55bd9
Remove note on network scan from docs.
janowagner Apr 29, 2020
f84b41f
Fix formatting.
janowagner Apr 30, 2020
c467fae
Add changelog entry.
janowagner Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion COPYING
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions doc/redis_config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 1 addition & 3 deletions misc/scanneraux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
*
Expand Down Expand Up @@ -31,8 +31,6 @@

struct scan_globals
{
char *network_targets;
char *network_scan_status;
GHashTable *files_translation;
GHashTable *files_size_translation;
char *scan_id;
Expand Down
4 changes: 2 additions & 2 deletions nasl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
#
Expand Down Expand Up @@ -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
Expand Down
Loading