[Openvas-commits] r5370 - in trunk/openvas-scanner: . cnvts/find_service openvassd

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Oct 5 12:27:25 CEST 2009


Author: felix
Date: 2009-10-05 12:27:24 +0200 (Mon, 05 Oct 2009)
New Revision: 5370

Modified:
   trunk/openvas-scanner/ChangeLog
   trunk/openvas-scanner/cnvts/find_service/find_service.c
   trunk/openvas-scanner/openvassd/nes_plugins.c
   trunk/openvas-scanner/openvassd/openvassd.c
   trunk/openvas-scanner/openvassd/oval_plugins.c
   trunk/openvas-scanner/openvassd/pluginload.h
   trunk/openvas-scanner/openvassd/utils.c
Log:
Removed dependence on libopenvas.h.

* cnvts/find_service/find_service.c: Added includes and defines that
previously were in libopenvas.h.
	
* openvassd/pluginload.h: Added function typedefs that were previously
in libopenvas.h.

* openvassd/nes_plugins.c, openvassd/openvassd.c,
openvassd/oval_plugins.c, openvassd/utils.c: Removed libopenvas-include,
added missing includes.


Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog	2009-10-05 10:23:51 UTC (rev 5369)
+++ trunk/openvas-scanner/ChangeLog	2009-10-05 10:27:24 UTC (rev 5370)
@@ -1,5 +1,19 @@
 2009-10-05  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	Removed dependence on libopenvas.h.
+
+	* cnvts/find_service/find_service.c: Added includes and defines that
+	previously were in libopenvas.h.
+	
+	* openvassd/pluginload.h: Added function typedefs that were previously
+	in libopenvas.h.
+
+	* openvassd/nes_plugins.c, openvassd/openvassd.c,
+	openvassd/oval_plugins.c, openvassd/utils.c: Removed libopenvas-include,
+	added missing includes.
+
+2009-10-05  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	* cnvts/synscan/synscan.c, openvassd/save_tests.c,
 	openvassd/nasl_plugins.c: Added missing includes.
 

Modified: trunk/openvas-scanner/cnvts/find_service/find_service.c
===================================================================
--- trunk/openvas-scanner/cnvts/find_service/find_service.c	2009-10-05 10:23:51 UTC (rev 5369)
+++ trunk/openvas-scanner/cnvts/find_service/find_service.c	2009-10-05 10:27:24 UTC (rev 5370)
@@ -9,11 +9,12 @@
 
 #include <includes.h>
 
-#include "libopenvas.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/nvt_categories.h> /* for ACT_SCANNER */
 #include <openvas/plugutils.h> /* for OPENVAS_ENCAPS_IP */
+#include <openvas/system.h> /* for efree */
 
 #include <glib.h>
 
@@ -48,6 +49,13 @@
 
 #define NUM_CHILDREN		"Number of connections done in parallel : "
 
+/* Plugin preference types (influence gui in client) */
+#define PREF_CHECKBOX "checkbox"
+#define PREF_ENTRY "entry"
+#define PREF_RADIO "radio"
+#define PREF_PASSWORD "password"
+#define PREF_FILE "file"
+/*#define PREF_SSH_CREDENTIALS "sshcredentials"*/
 
 int 
 plugin_init(desc)

Modified: trunk/openvas-scanner/openvassd/nes_plugins.c
===================================================================
--- trunk/openvas-scanner/openvassd/nes_plugins.c	2009-10-05 10:23:51 UTC (rev 5369)
+++ trunk/openvas-scanner/openvassd/nes_plugins.c	2009-10-05 10:27:24 UTC (rev 5370)
@@ -29,14 +29,18 @@
 
 #include <includes.h>
 
-#include "libopenvas.h"
-
 #include <glib.h>
 
+#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 "pluginload.h"
 #include "pluginscheduler.h" /* for LAUNCH_DISABLED */
 #include "plugs_hash.h"
 #include "processes.h"
+#include "proctitle.h" /* for setproctitle */
 #include "log.h"
 #include "preferences.h"
 

Modified: trunk/openvas-scanner/openvassd/openvassd.c
===================================================================
--- trunk/openvas-scanner/openvassd/openvassd.c	2009-10-05 10:23:51 UTC (rev 5369)
+++ trunk/openvas-scanner/openvassd/openvassd.c	2009-10-05 10:27:24 UTC (rev 5370)
@@ -43,10 +43,16 @@
 
 #include <includes.h>
 
+#include <openvas/bpf_share.h> /* for bpf_server */
 #include <openvas/nasl/nasl.h>
+#include <openvas/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 "libopenvas.h"
+#include "proctitle.h" /* for setproctitle.h */
 
 #ifdef USE_LIBWRAP
 #include <tcpd.h>

Modified: trunk/openvas-scanner/openvassd/oval_plugins.c
===================================================================
--- trunk/openvas-scanner/openvassd/oval_plugins.c	2009-10-05 10:23:51 UTC (rev 5369)
+++ trunk/openvas-scanner/openvassd/oval_plugins.c	2009-10-05 10:27:24 UTC (rev 5370)
@@ -31,10 +31,12 @@
 
 #include <includes.h>
 
-#include "libopenvas.h"
-
+#include <openvas/nasl/nasl.h>
+#include <openvas/network.h> /* for internal_send */
 #include <openvas/nvt_categories.h> /* for ACT_END */
-#include <openvas/nasl/nasl.h>
+#include <openvas/plugutils.h> /* for plug_set_oid */
+#include <openvas/store.h> /* for store_load_plugin */
+#include <openvas/system.h> /* for emalloc */
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -43,6 +45,7 @@
 #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/pluginload.h
===================================================================
--- trunk/openvas-scanner/openvassd/pluginload.h	2009-10-05 10:23:51 UTC (rev 5369)
+++ trunk/openvas-scanner/openvassd/pluginload.h	2009-10-05 10:27:24 UTC (rev 5370)
@@ -42,7 +42,18 @@
 void plugin_free(struct arglist *);
 void plugins_free(struct arglist *);
 
+
 /**
+ * Plugin standard function template to init a plugin (nasl/nes/oval).
+ */
+typedef int(*plugin_init_t)(struct arglist *);
+/**
+ * Plugin standard function template to run a plugin (nasl/nes/oval).
+ */
+typedef int(*plugin_run_t)(struct arglist *);
+
+
+/**
  * Class of a NVT (implemented as list).
  * Currently three classes do exist: nes_plugin_class, nasl_plugin_class and
  * oval_plugin_class.

Modified: trunk/openvas-scanner/openvassd/utils.c
===================================================================
--- trunk/openvas-scanner/openvassd/utils.c	2009-10-05 10:23:51 UTC (rev 5369)
+++ trunk/openvas-scanner/openvassd/utils.c	2009-10-05 10:27:24 UTC (rev 5370)
@@ -29,7 +29,9 @@
 
 #include <includes.h>
 
-#include "libopenvas.h"
+#include <openvas/network.h> /* for stream_zero */
+#include <openvas/plugutils.h> /* for plug_get_launch */
+#include <openvas/system.h> /* for emalloc */
 
 #include "log.h"
 #include "ntp.h"



More information about the Openvas-commits mailing list