[Openvas-commits] r9375 - in trunk/openvas-scanner: . cnvts/find_service cnvts/openvas_tcp_scanner cnvts/synscan openvassd
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 9 22:56:46 CET 2010
Author: jan
Date: 2010-11-09 22:56:42 +0100 (Tue, 09 Nov 2010)
New Revision: 9375
Modified:
trunk/openvas-scanner/ChangeLog
trunk/openvas-scanner/cnvts/find_service/find_service.c
trunk/openvas-scanner/cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c
trunk/openvas-scanner/cnvts/synscan/synscan.c
trunk/openvas-scanner/openvassd/attack.c
trunk/openvas-scanner/openvassd/auth.c
trunk/openvas-scanner/openvassd/comm.c
trunk/openvas-scanner/openvassd/comm.h
trunk/openvas-scanner/openvassd/hosts.c
trunk/openvas-scanner/openvassd/locks.c
trunk/openvas-scanner/openvassd/nasl_plugins.c
trunk/openvas-scanner/openvassd/nes_plugins.c
trunk/openvas-scanner/openvassd/ntp_11.c
trunk/openvas-scanner/openvassd/ntp_11.h
trunk/openvas-scanner/openvassd/openvassd.c
trunk/openvas-scanner/openvassd/otp_1_0.c
trunk/openvas-scanner/openvassd/oval_plugins.c
trunk/openvas-scanner/openvassd/parser.c
trunk/openvas-scanner/openvassd/piic.c
trunk/openvas-scanner/openvassd/pluginlaunch.c
trunk/openvas-scanner/openvassd/pluginload.c
trunk/openvas-scanner/openvassd/pluginload.h
trunk/openvas-scanner/openvassd/pluginscheduler.c
trunk/openvas-scanner/openvassd/plugs_hash.c
trunk/openvas-scanner/openvassd/plugs_req.c
trunk/openvas-scanner/openvassd/plugs_req.h
trunk/openvas-scanner/openvassd/preferences.c
trunk/openvas-scanner/openvassd/rules.c
trunk/openvas-scanner/openvassd/save_kb.c
trunk/openvas-scanner/openvassd/save_kb.h
trunk/openvas-scanner/openvassd/shared_socket.c
trunk/openvas-scanner/openvassd/users.c
trunk/openvas-scanner/openvassd/users.h
trunk/openvas-scanner/openvassd/utils.c
trunk/openvas-scanner/openvassd/utils.h
Log:
* cnvts/find_service/find_service.c,
cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c,
cnvts/synscan/synscan.c, openvassd/nasl_plugins.c,
openvassd/comm.h, openvassd/utils.c, openvassd/otp_1_0.c,
openvassd/plugs_req.c, openvassd/preferences.c, openvassd/ntp_11.c,
openvassd/utils.h, openvassd/plugs_req.h, openvassd/attack.c,
openvassd/ntp_11.h, openvassd/save_kb.c, openvassd/shared_socket.c,
openvassd/save_kb.h, openvassd/piic.c, openvassd/nes_plugins.c,
openvassd/pluginlaunch.c, openvassd/plugs_hash.c,
openvassd/pluginload.c, openvassd/hosts.c, openvassd/auth.c,
openvassd/users.c, openvassd/oval_plugins.c, openvassd/openvassd.c,
openvassd/pluginload.h, openvassd/users.h, openvassd/locks.c,
openvassd/rules.c, openvassd/comm.c, openvassd/parser.c,
openvassd/pluginscheduler.c: Adjusted include paths for header
files of libopenvas_misc.
Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/ChangeLog 2010-11-09 21:56:42 UTC (rev 9375)
@@ -1,3 +1,21 @@
+2010-11-09 Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
+ * cnvts/find_service/find_service.c,
+ cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c,
+ cnvts/synscan/synscan.c, openvassd/nasl_plugins.c,
+ openvassd/comm.h, openvassd/utils.c, openvassd/otp_1_0.c,
+ openvassd/plugs_req.c, openvassd/preferences.c, openvassd/ntp_11.c,
+ openvassd/utils.h, openvassd/plugs_req.h, openvassd/attack.c,
+ openvassd/ntp_11.h, openvassd/save_kb.c, openvassd/shared_socket.c,
+ openvassd/save_kb.h, openvassd/piic.c, openvassd/nes_plugins.c,
+ openvassd/pluginlaunch.c, openvassd/plugs_hash.c,
+ openvassd/pluginload.c, openvassd/hosts.c, openvassd/auth.c,
+ openvassd/users.c, openvassd/oval_plugins.c, openvassd/openvassd.c,
+ openvassd/pluginload.h, openvassd/users.h, openvassd/locks.c,
+ openvassd/rules.c, openvassd/comm.c, openvassd/parser.c,
+ openvassd/pluginscheduler.c: Adjusted include paths for header
+ files of libopenvas_misc.
+
2010-11-09 Michael Wiegand <michael.wiegand at greenbone.net>
Added support for network level scans as described in OpenVAS Change
Modified: trunk/openvas-scanner/cnvts/find_service/find_service.c
===================================================================
--- trunk/openvas-scanner/cnvts/find_service/find_service.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/cnvts/find_service/find_service.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -9,12 +9,12 @@
#include <includes.h>
-#include <openvas/arglists.h> /* for struct arglist */
-#include <openvas/kb.h> /* for plug_get_oldstyle_kb */
-#include <openvas/network.h> /* for get_encaps_through */
+#include <openvas/misc/arglists.h> /* for struct arglist */
+#include <openvas/misc/kb.h> /* for plug_get_oldstyle_kb */
+#include <openvas/misc/network.h> /* for get_encaps_through */
#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
-#include <openvas/plugutils.h> /* for OPENVAS_ENCAPS_IP */
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/plugutils.h> /* for OPENVAS_ENCAPS_IP */
+#include <openvas/misc/system.h> /* for efree */
#include <glib.h>
Modified: trunk/openvas-scanner/cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c
===================================================================
--- trunk/openvas-scanner/cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -19,10 +19,12 @@
#include <glib.h>
-#include <openvas/arglists.h> /* for struct arglist */
+#include <openvas/misc/arglists.h> /* for struct arglist */
#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
-#include <openvas/plugutils.h> /* for find_in_path */
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/plugutils.h> /* for find_in_path */
+#include <openvas/misc/scanners_utils.h> /* for comm_send_status */
+#include <openvas/misc/system.h> /* for efree */
+//#include <openvas/misc/services.h> /* for get_tcp_svcs */
#ifdef LINUX
#include <netinet/tcp.h>
Modified: trunk/openvas-scanner/cnvts/synscan/synscan.c
===================================================================
--- trunk/openvas-scanner/cnvts/synscan/synscan.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/cnvts/synscan/synscan.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -29,13 +29,13 @@
#include <includes.h>
#include <openvasraw.h>
-#include <openvas/arglists.h> /* for struct arglist */
-#include <openvas/bpf_share.h> /* for bpf_open_live */
+#include <openvas/misc/arglists.h> /* for struct arglist */
+#include <openvas/misc/bpf_share.h> /* for bpf_open_live */
#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
-#include <openvas/pcap_openvas.h> /* for get_datalink_size */
-#include <openvas/plugutils.h> /* for scanner_add_port */
-#include <openvas/scanners_utils.h> /* for getpts */
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/pcap_openvas.h> /* for get_datalink_size */
+#include <openvas/misc/plugutils.h> /* for scanner_add_port */
+#include <openvas/misc/scanners_utils.h> /* for getpts */
+#include <openvas/misc/system.h> /* for efree */
#undef SHOW_RETRIES
Modified: trunk/openvas-scanner/openvassd/attack.c
===================================================================
--- trunk/openvas-scanner/openvassd/attack.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/attack.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -32,14 +32,15 @@
#include <openvas/hg/hosts_gatherer.h>
#include <openvas/hg/hg_utils.h>
-#include <openvas/kb.h> /* for kb_new */
-#include <openvas/network.h> /* for auth_printf */
-#include <openvas/nvt_categories.h> /* for ACT_INIT */
-#include <openvas/pcap_openvas.h> /* for v6_is_local_ip */
-#include <openvas/plugutils.h> /* for plug_get_path */
-#include <openvas/proctitle.h> /* for setproctitle */
-#include <openvas/system.h> /* for emalloc */
-#include <openvas/scanners_utils.h> /* for comm_send_status */
+#include <openvas/misc/kb.h> /* for kb_new */
+#include <openvas/misc/network.h> /* for auth_printf */
+#include <openvas/nvt_categories.h> /* for ACT_INIT */
+#include <openvas/misc/pcap_openvas.h> /* for v6_is_local_ip */
+#include <openvas/misc/plugutils.h> /* for plug_get_path */
+#include <openvas/misc/proctitle.h> /* for setproctitle */
+#include <openvas/misc/system.h> /* for emalloc */
+#include <openvas/misc/scanners_utils.h> /* for comm_send_status */
+#include <openvas/misc/openvas_ssh_login.h>
#include "attack.h"
#include "auth.h"
@@ -47,7 +48,6 @@
#include "hosts.h"
#include "log.h"
#include "ntp_11.h"
-#include "openvas_ssh_login.h"
#include "pluginlaunch.h"
#include "pluginload.h"
#include "pluginscheduler.h"
Modified: trunk/openvas-scanner/openvassd/auth.c
===================================================================
--- trunk/openvas-scanner/openvassd/auth.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/auth.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -38,9 +38,9 @@
#include <stdarg.h>
-#include <openvas/arglists.h>
-#include <openvas/system.h>
-#include <openvas/network.h>
+#include <openvas/misc/arglists.h>
+#include <openvas/misc/system.h>
+#include <openvas/misc/network.h>
#include "auth.h"
#include "comm.h"
Modified: trunk/openvas-scanner/openvassd/comm.c
===================================================================
--- trunk/openvas-scanner/openvassd/comm.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/comm.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -35,20 +35,20 @@
#include <openvas/nasl/nasl.h>
#include <openvas/nvt_categories.h> /* for ACT_FIRST */
+#include <openvas/misc/plugutils.h> /* for plug_get_oid */
+#include <openvas/misc/network.h> /* for recv_line */
+#include <openvas/misc/otp.h> /* for OTP_10 */
+#include <openvas/misc/system.h> /* for emalloc */
#include "auth.h"
#include "comm.h"
-#include "network.h" /* for recv_line */
-#include "otp.h" /* for OTP_10 */
#include "ntp_11.h"
#include "log.h"
#include "plugs_hash.h"
#include "pluginscheduler.h" /* for define LAUNCH_DISABLED */
-#include "plugutils.h" /* for plug_get_oid */
#include "rules.h"
#include "sighand.h"
-#include "system.h" /* for emalloc */
#include "utils.h"
Modified: trunk/openvas-scanner/openvassd/comm.h
===================================================================
--- trunk/openvas-scanner/openvassd/comm.h 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/comm.h 2010-11-09 21:56:42 UTC (rev 9375)
@@ -30,7 +30,7 @@
#ifndef _OPENVAS_COMM_H
#define _OPENVAS_COMM_H
-#include <openvas/arglists.h> /* for struct arglist */
+#include <openvas/misc/arglists.h> /* for struct arglist */
int comm_init (int);
void comm_terminate (struct arglist *);
Modified: trunk/openvas-scanner/openvassd/hosts.c
===================================================================
--- trunk/openvas-scanner/openvassd/hosts.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/hosts.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -27,9 +27,9 @@
#include <includes.h>
-#include <openvas/network.h> /* for internal_recv */
-#include <openvas/plugutils.h> /* for INTERNAL_COMM_MSG_TYPE_CTRL */
-#include <openvas/system.h> /* for estrdup */
+#include <openvas/misc/network.h> /* for internal_recv */
+#include <openvas/misc/plugutils.h> /* for INTERNAL_COMM_MSG_TYPE_CTRL */
+#include <openvas/misc/system.h> /* for estrdup */
#include "utils.h"
#include "log.h"
Modified: trunk/openvas-scanner/openvassd/locks.c
===================================================================
--- trunk/openvas-scanner/openvassd/locks.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/locks.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -29,7 +29,7 @@
#include <includes.h>
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/system.h> /* for efree */
#include "utils.h"
#include "log.h"
Modified: trunk/openvas-scanner/openvassd/nasl_plugins.c
===================================================================
--- trunk/openvas-scanner/openvassd/nasl_plugins.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/nasl_plugins.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -38,18 +38,18 @@
#include <openvas/base/drop_privileges.h> /* for drop_privileges */
#include <openvas/nasl/nasl.h>
-#include <openvas/network.h> /* for internal_send */
-#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
-#include <openvas/plugutils.h> /* for INTERNAL_COMM_CTRL_FINISHED */
-#include <openvas/store.h> /* for store_plugin */
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/network.h> /* for internal_send */
+#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
+#include <openvas/misc/plugutils.h> /* for INTERNAL_COMM_CTRL_FINISHED */
+#include <openvas/misc/store.h> /* for store_plugin */
+#include <openvas/misc/system.h> /* for emalloc */
+#include <openvas/misc/proctitle.h> /* for setproctitle */
#include "pluginload.h"
#include "pluginscheduler.h" /* for LAUNCH_DISABLED */
#include "plugs_hash.h"
#include "preferences.h"
#include "processes.h"
-#include "proctitle.h" /* for setproctitle */
#include "log.h"
/**
Modified: trunk/openvas-scanner/openvassd/nes_plugins.c
===================================================================
--- trunk/openvas-scanner/openvassd/nes_plugins.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/nes_plugins.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -32,17 +32,17 @@
#include <glib.h>
#include <openvas/base/drop_privileges.h> /* for drop_privileges */
-#include <openvas/network.h> /* for internal_send */
-#include <openvas/plugutils.h> /* for plug_set_path */
-#include <openvas/store.h> /* for store_load_plugin */
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/network.h> /* for internal_send */
+#include <openvas/misc/plugutils.h> /* for plug_set_path */
+#include <openvas/misc/store.h> /* for store_load_plugin */
+#include <openvas/misc/system.h> /* for emalloc */
+#include <openvas/misc/proctitle.h> /* for setproctitle */
#include "pluginload.h"
#include "pluginscheduler.h" /* for LAUNCH_DISABLED */
#include "plugs_hash.h"
#include "preferences.h"
#include "processes.h"
-#include "proctitle.h" /* for setproctitle */
#include "log.h"
#include "preferences.h"
Modified: trunk/openvas-scanner/openvassd/ntp_11.c
===================================================================
--- trunk/openvas-scanner/openvassd/ntp_11.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/ntp_11.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -31,9 +31,11 @@
#include <glib.h>
-#include <openvas/network.h> /* for recv_line */
-#include <openvas/plugutils.h> /* for plug_get_name */
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/network.h> /* for recv_line */
+#include <openvas/misc/plugutils.h> /* for plug_get_name */
+#include <openvas/misc/system.h> /* for emalloc */
+#include <openvas/misc/hash_table_file.h>
+#include <openvas/misc/openvas_ssh_login.h>
#include "ntp_11.h"
#include "otp_1_0.h"
@@ -45,8 +47,6 @@
#include "utils.h"
#include "preferences.h"
#include "hosts.h"
-#include "hash_table_file.h"
-#include "openvas_ssh_login.h"
#ifndef MIN
#define MIN(x,y) ((x) < (y) ? (x):(y))
Modified: trunk/openvas-scanner/openvassd/ntp_11.h
===================================================================
--- trunk/openvas-scanner/openvassd/ntp_11.h 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/ntp_11.h 2010-11-09 21:56:42 UTC (rev 9375)
@@ -31,7 +31,7 @@
#ifndef _OPENVAS_NTP_11_H
#define _OPENVAS_NTP_11_H
-#include <openvas/arglists.h> /* for struct arglist */
+#include <openvas/misc/arglists.h> /* for struct arglist */
#define NTP_STOP_WHOLE_TEST 2
#define NTP_PAUSE_WHOLE_TEST 3
Modified: trunk/openvas-scanner/openvassd/openvassd.c
===================================================================
--- trunk/openvas-scanner/openvassd/openvassd.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/openvassd.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -43,19 +43,18 @@
#include <includes.h>
-#include <openvas/bpf_share.h> /* for bpf_server */
+#include <openvas/misc/bpf_share.h> /* for bpf_server */
#include <openvas/nasl/nasl.h>
-#include <openvas/network.h> /* for auth_printf */
+#include <openvas/misc/network.h> /* for auth_printf */
#include <openvas/hg/hosts_gatherer.h>
-#include <openvas/plugutils.h> /* for find_in_path */
-#include <openvas/store.h> /* for store_init */
-#include <openvas/system.h> /* for estrdup */
-#include <openvas/rand.h> /* for openvas_init_random */
-#include <openvas/services1.h> /* for openvas_init_svc */
-#include <openvas/base/pidfile.h> /* for pidfile_remove */
+#include <openvas/misc/plugutils.h> /* for find_in_path */
+#include <openvas/misc/store.h> /* for store_init */
+#include <openvas/misc/system.h> /* for estrdup */
+#include <openvas/misc/rand.h> /* for openvas_init_random */
+#include <openvas/misc/services1.h> /* for openvas_init_svc */
+#include <openvas/misc/proctitle.h> /* for setproctitle.h */
+#include <openvas/base/pidfile.h> /* for pidfile_remove */
-#include "proctitle.h" /* for setproctitle.h */
-
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
Modified: trunk/openvas-scanner/openvassd/otp_1_0.c
===================================================================
--- trunk/openvas-scanner/openvassd/otp_1_0.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/otp_1_0.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -28,7 +28,7 @@
#include <string.h>
#include <corevers.h>
-#include <network.h>
+#include <openvas/misc/network.h>
#include <openvas/nasl/nasl.h> /* for nasl_get_all_certifcates */
#include <openvas/base/certificate.h> /* for certificate_t */
Modified: trunk/openvas-scanner/openvassd/oval_plugins.c
===================================================================
--- trunk/openvas-scanner/openvassd/oval_plugins.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/oval_plugins.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -32,11 +32,12 @@
#include <includes.h>
#include <openvas/nasl/nasl.h>
-#include <openvas/network.h> /* for internal_send */
-#include <openvas/nvt_categories.h> /* for ACT_END */
-#include <openvas/plugutils.h> /* for plug_set_oid */
-#include <openvas/store.h> /* for store_load_plugin */
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/network.h> /* for internal_send */
+#include <openvas/nvt_categories.h> /* for ACT_END */
+#include <openvas/misc/plugutils.h> /* for plug_set_oid */
+#include <openvas/misc/store.h> /* for store_load_plugin */
+#include <openvas/misc/system.h> /* for emalloc */
+#include <openvas/misc/proctitle.h> /* for setproctitle */
#include <glib.h>
#include <glib/gstdio.h>
@@ -45,7 +46,6 @@
#include "pluginload.h"
#include "preferences.h"
#include "processes.h"
-#include "proctitle.h" /* for setproctitle */
static void oval_thread (struct arglist *);
Modified: trunk/openvas-scanner/openvassd/parser.c
===================================================================
--- trunk/openvas-scanner/openvassd/parser.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/parser.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -29,7 +29,7 @@
#include <includes.h>
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/system.h> /* for emalloc */
/** @TODO Contents of this file is duplicate in openvas-scanner/openvassd/parser.c
* and openvas-client/openvas/parser.c . Move to libraries and merge, once
Modified: trunk/openvas-scanner/openvassd/piic.c
===================================================================
--- trunk/openvas-scanner/openvassd/piic.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/piic.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -30,10 +30,10 @@
#include <includes.h>
-#include <openvas/kb.h> /* for kb_item_set_int */
-#include <openvas/network.h> /* for internal_recv */
-#include <openvas/plugutils.h> /* for INTERNAL_COMM_MSG_TYPE_KB */
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/kb.h> /* for kb_item_set_int */
+#include <openvas/misc/network.h> /* for internal_recv */
+#include <openvas/misc/plugutils.h> /* for INTERNAL_COMM_MSG_TYPE_KB */
+#include <openvas/misc/system.h> /* for efree */
#include "log.h"
#include "save_kb.h"
Modified: trunk/openvas-scanner/openvassd/pluginlaunch.c
===================================================================
--- trunk/openvas-scanner/openvassd/pluginlaunch.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/pluginlaunch.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -29,10 +29,10 @@
#include <includes.h>
-#include <openvas/network.h> /* for internal_send */
-#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
-#include <openvas/plugutils.h> /* for INTERNAL_COMM_MSG_SHARED_SOCKET */
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/network.h> /* for internal_send */
+#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
+#include <openvas/misc/plugutils.h> /* for INTERNAL_COMM_MSG_SHARED_SOCKET */
+#include <openvas/misc/system.h> /* for efree */
#include "pluginload.h"
#include "piic.h"
Modified: trunk/openvas-scanner/openvassd/pluginload.c
===================================================================
--- trunk/openvas-scanner/openvassd/pluginload.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/pluginload.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -30,7 +30,7 @@
#include <includes.h>
#include <openvas/nasl/nasl.h>
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/system.h> /* for emalloc */
#include <glib.h>
Modified: trunk/openvas-scanner/openvassd/pluginload.h
===================================================================
--- trunk/openvas-scanner/openvassd/pluginload.h 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/pluginload.h 2010-11-09 21:56:42 UTC (rev 9375)
@@ -31,8 +31,8 @@
#ifndef _OPENVAS_PLUGINLOAD_H
#define _OPENVAS_PLUGINLOAD_H
-#include <openvas/arglists.h> /* for struct arglist */
-#include <openvas/kb.h> /* for struct kb_item */
+#include <openvas/misc/arglists.h> /* for struct arglist */
+#include <openvas/misc/kb.h> /* for struct kb_item */
struct arglist *plugins_init (struct arglist *, int);
struct arglist *plugins_reload (struct arglist *, struct arglist *, int);
Modified: trunk/openvas-scanner/openvassd/pluginscheduler.c
===================================================================
--- trunk/openvas-scanner/openvassd/pluginscheduler.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/pluginscheduler.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -30,15 +30,15 @@
#include <includes.h>
-#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
-#include <openvas/plugutils.h> /* for plug_get_required_ports */
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
+#include <openvas/misc/plugutils.h> /* for plug_get_required_ports */
+#include <openvas/misc/system.h> /* for emalloc */
+#include <openvas/misc/arglists.h>
#include <glib.h>
#define IN_SCHEDULER_CODE 1
-#include "arglists.h"
#include "pluginscheduler.h"
#include "pluginload.h"
#include "pluginlaunch.h"
Modified: trunk/openvas-scanner/openvassd/plugs_hash.c
===================================================================
--- trunk/openvas-scanner/openvassd/plugs_hash.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/plugs_hash.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -30,10 +30,10 @@
#include <includes.h>
-#include <openvas/network.h> /* for auth_printf */
-#include <openvas/plugutils.h> /* for plug_get_path */
-#include <openvas/share_fd.h> /* for send_fd */
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/network.h> /* for auth_printf */
+#include <openvas/misc/plugutils.h> /* for plug_get_path */
+#include <openvas/misc/share_fd.h> /* for send_fd */
+#include <openvas/misc/system.h> /* for efree */
#include <gcrypt.h>
#include "log.h"
Modified: trunk/openvas-scanner/openvassd/plugs_req.c
===================================================================
--- trunk/openvas-scanner/openvassd/plugs_req.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/plugs_req.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -28,7 +28,7 @@
#include <includes.h>
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/system.h> /* for emalloc */
#include "pluginscheduler.h"
#include "plugs_req.h"
Modified: trunk/openvas-scanner/openvassd/plugs_req.h
===================================================================
--- trunk/openvas-scanner/openvassd/plugs_req.h 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/plugs_req.h 2010-11-09 21:56:42 UTC (rev 9375)
@@ -31,8 +31,8 @@
#ifndef PLUGINS_REQUIREMENTS_H__
#define PLUGINS_REQUIREMENTS_H__
-#include <openvas/kb.h> /* for struct kb_item */
-#include <openvas/arglists.h> /* for struct arglist */
+#include <openvas/misc/kb.h> /* for struct kb_item */
+#include <openvas/misc/arglists.h> /* for struct arglist */
char *requirements_plugin (struct kb_item **, struct scheduler_plugin *,
struct arglist *);
Modified: trunk/openvas-scanner/openvassd/preferences.c
===================================================================
--- trunk/openvas-scanner/openvassd/preferences.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/preferences.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -43,7 +43,7 @@
#include <includes.h>
#include <openvas/hg/hosts_gatherer.h>
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/system.h> /* for efree */
#include "glib.h"
#include "comm.h"
Modified: trunk/openvas-scanner/openvassd/rules.c
===================================================================
--- trunk/openvas-scanner/openvassd/rules.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/rules.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -30,7 +30,7 @@
#include <includes.h>
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/system.h> /* for efree */
#include <pwd.h>
#include "comm.h"
Modified: trunk/openvas-scanner/openvassd/save_kb.c
===================================================================
--- trunk/openvas-scanner/openvassd/save_kb.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/save_kb.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -43,10 +43,10 @@
#include <glib.h>
-#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
-#include <openvas/kb.h> /* for kb_new */
-#include <openvas/plugutils.h> /* for addslashes.h */
-#include <openvas/system.h> /* for estrdup */
+#include <openvas/nvt_categories.h> /* for ACT_SCANNER */
+#include <openvas/misc/kb.h> /* for kb_new */
+#include <openvas/misc/plugutils.h> /* for addslashes.h */
+#include <openvas/misc/system.h> /* for estrdup */
#include "log.h"
#include "comm.h"
Modified: trunk/openvas-scanner/openvassd/save_kb.h
===================================================================
--- trunk/openvas-scanner/openvassd/save_kb.h 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/save_kb.h 2010-11-09 21:56:42 UTC (rev 9375)
@@ -31,7 +31,7 @@
#ifndef SAVE_KB_H__
#define SAVE_KB_H__
-#include <openvas/arglists.h> /* for struct arglist */
+#include <openvas/misc/arglists.h> /* for struct arglist */
int save_kb_new (struct arglist *, char *);
void save_kb_close (struct arglist *, char *);
Modified: trunk/openvas-scanner/openvassd/shared_socket.c
===================================================================
--- trunk/openvas-scanner/openvassd/shared_socket.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/shared_socket.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -36,10 +36,10 @@
#include <includes.h>
-#include <openvas/network.h> /* internal_recv */
-#include <openvas/plugutils.h> /* for INTERNAL_COMM_MSG_SHARED_SOCKET */
-#include <openvas/share_fd.h> /* for recv_fd */
-#include <openvas/system.h> /* for efree */
+#include <openvas/misc/network.h> /* internal_recv */
+#include <openvas/misc/plugutils.h> /* for INTERNAL_COMM_MSG_SHARED_SOCKET */
+#include <openvas/misc/share_fd.h> /* for recv_fd */
+#include <openvas/misc/system.h> /* for efree */
#include "utils.h"
#include "log.h"
Modified: trunk/openvas-scanner/openvassd/users.c
===================================================================
--- trunk/openvas-scanner/openvassd/users.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/users.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -27,7 +27,7 @@
#include <includes.h>
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/system.h> /* for emalloc */
#include <gcrypt.h>
#include "log.h"
Modified: trunk/openvas-scanner/openvassd/users.h
===================================================================
--- trunk/openvas-scanner/openvassd/users.h 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/users.h 2010-11-09 21:56:42 UTC (rev 9375)
@@ -31,7 +31,7 @@
#ifndef _OPENVAS_USERS_H
#define _OPENVAS_USERS_H
-#include <openvas/arglists.h> /* for struct arglist */
+#include <openvas/misc/arglists.h> /* for struct arglist */
#define BAD_LOGIN_ATTEMPT (struct openvas_rules*)(-1)
#define OPENVAS_MAX_USERNAME_LEN 32 /* Including the ending nul byte! */
Modified: trunk/openvas-scanner/openvassd/utils.c
===================================================================
--- trunk/openvas-scanner/openvassd/utils.c 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/utils.c 2010-11-09 21:56:42 UTC (rev 9375)
@@ -29,9 +29,9 @@
#include <includes.h>
-#include <openvas/network.h> /* for stream_zero */
-#include <openvas/plugutils.h> /* for plug_get_launch */
-#include <openvas/system.h> /* for emalloc */
+#include <openvas/misc/network.h> /* for stream_zero */
+#include <openvas/misc/plugutils.h> /* for plug_get_launch */
+#include <openvas/misc/system.h> /* for emalloc */
#include "log.h"
#include "auth.h"
Modified: trunk/openvas-scanner/openvassd/utils.h
===================================================================
--- trunk/openvas-scanner/openvassd/utils.h 2010-11-09 21:19:30 UTC (rev 9374)
+++ trunk/openvas-scanner/openvassd/utils.h 2010-11-09 21:56:42 UTC (rev 9375)
@@ -31,7 +31,7 @@
#ifndef _OPENVAS_UTILS_H
#define _OPENVAS_UTILS_H
-#include <openvas/arglists.h> /* for struct arglist */
+#include <openvas/misc/arglists.h> /* for struct arglist */
struct attack_atom
{
More information about the Openvas-commits
mailing list