[Openvas-commits] r420 - in trunk/openvas-server: . openvasd

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Mon Oct 8 18:51:05 CEST 2007


Author: bh
Date: 2007-10-08 18:51:05 +0200 (Mon, 08 Oct 2007)
New Revision: 420

Removed:
   trunk/openvas-server/openvasd/hosts_gatherer.h
Modified:
   trunk/openvas-server/ChangeLog
   trunk/openvas-server/openvasd/attack.c
   trunk/openvas-server/openvasd/openvasd.c
   trunk/openvas-server/openvasd/preferences.c
Log:
* openvasd/hosts_gatherer.h: Removed.  Use the one installed by
openvas-libraries instead.

* attack.c: #include <hg_utils.h> and move the
hosts_gatherer.h include because it now comes from outside of
openvasd.

* openvasd/openvasd.c, openvasd/preferences.c: Move the
hosts_gatherer.h include because it now comes from outside of
openvasd.


Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog	2007-10-08 16:49:56 UTC (rev 419)
+++ trunk/openvas-server/ChangeLog	2007-10-08 16:51:05 UTC (rev 420)
@@ -1,3 +1,16 @@
+2007-10-08  Bernhard Herzog  <bh at intevation.de>
+
+	* openvasd/hosts_gatherer.h: Removed.  Use the one installed by
+	openvas-libraries instead.
+
+	* attack.c: #include <hg_utils.h> and move the
+	hosts_gatherer.h include because it now comes from outside of
+	openvasd.
+
+	* openvasd/openvasd.c, openvasd/preferences.c: Move the
+	hosts_gatherer.h include because it now comes from outside of
+	openvasd.
+
 2007-09-20  Bernhard Herzog  <bh at intevation.de>
 
 	* openvasd/pluginload.c (init_plugin_classes)

Modified: trunk/openvas-server/openvasd/attack.c
===================================================================
--- trunk/openvas-server/openvasd/attack.c	2007-10-08 16:49:56 UTC (rev 419)
+++ trunk/openvas-server/openvasd/attack.c	2007-10-08 16:51:05 UTC (rev 420)
@@ -29,9 +29,11 @@
 
  
 #include <includes.h>
+#include <hosts_gatherer.h>
+#include <hg_utils.h>
+
 #include "attack.h"
 #include "log.h"
-#include "hosts_gatherer.h"
 #include "sighand.h"
 #include "rules.h"
 #include "auth.h"

Deleted: trunk/openvas-server/openvasd/hosts_gatherer.h
===================================================================
--- trunk/openvas-server/openvasd/hosts_gatherer.h	2007-10-08 16:49:56 UTC (rev 419)
+++ trunk/openvas-server/openvasd/hosts_gatherer.h	2007-10-08 16:51:05 UTC (rev 420)
@@ -1,79 +0,0 @@
-/* OpenVAS
-* $Id$
-* Description: hosts_gatherer header.
-*
-* Authors: - Renaud Deraison <deraison at nessus.org> (Original pre-fork develoment)
-*          - Tim Brown <mailto:timb at openvas.org> (Initial fork)
-*          - Laban Mwangi <mailto:labanm at openvas.org> (Renaming work)
-*          - Tarik El-Yassem <mailto:tarik at openvas.org> (Headers section)
-*
-* Copyright:
-* Portions Copyright (C) 2006 Software in the Public Interest, Inc.
-* Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 2,
-* as published by the Free Software Foundation
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-*
-*/
-
-#ifndef HOSTS_GATHERER_H__
-#define HOSTS_GATHERER_H__
-
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
-#undef DEBUG_HIGH
-
-#define HG_NFS                1 
-#define HG_DNS_AXFR           2
-#define HG_SUBNET             4
-#define HG_PING       	      8
-#define HG_REVLOOKUP 	     16  /* Are we allowed to use the DNS ? */
-#define HG_REVLOOKUP_AS_PING 32 
-#define HG_DISTRIBUTE	     64
-
-struct hg_host {
-	char * hostname;	/* Host name                    */
-	char * domain;		/* This is the same pointers as */
-				/* hostname ! Don't free() it ! */
-	struct in_addr addr;	/* Host IP   	        	*/
-	int    cidr_netmask;	/* CIDR-format netmask 		*/
-	
-				/* When given a /N notation, we 
-				   put this as the upper limit
-				   of the network */
-	struct in_addr min;
-	struct in_addr max;
-	int	use_max:1;	/* use the field above ?	*/
- 	unsigned int    tested:1;
-	unsigned int    alive:1;
-	struct hg_host * next;
-	};
-
-struct hg_globals {
-	struct hg_host * host_list;    /* List of tested hosts       */
-	struct hg_host * tested;       /* Tested subnets and domains */
-	int		  flags;       /* options		     */
-	char 		* input;
-	char 		* marker;
-	int	counter;
-	unsigned int	distribute;
-	};
-		 
-struct hg_globals * hg_init(char *, int);
-int hg_next_host(struct hg_globals *, struct in_addr *, char *, int);
-void   hg_cleanup  (struct hg_globals *);
-int hg_get_name_from_ip(struct in_addr ip, char *, int);
-#endif

Modified: trunk/openvas-server/openvasd/openvasd.c
===================================================================
--- trunk/openvas-server/openvasd/openvasd.c	2007-10-08 16:49:56 UTC (rev 419)
+++ trunk/openvas-server/openvasd/openvasd.c	2007-10-08 16:51:05 UTC (rev 420)
@@ -30,6 +30,7 @@
 #include <includes.h>
 #include <harglists.h>
 #include <nasl.h>
+#include <hosts_gatherer.h>
 
 #ifdef USE_LIBWRAP
 #include <tcpd.h>
@@ -42,6 +43,7 @@
 
 
 #include <getopt.h>
+
 #include "pluginload.h"
 #include "preferences.h"
 #include "auth.h"
@@ -58,7 +60,6 @@
 #include "corevers.h"
 #include "pluginscheduler.h"
 #include "pluginlaunch.h"
-#include "hosts_gatherer.h"
 
 
 #ifndef HAVE_SETSID

Modified: trunk/openvas-server/openvasd/preferences.c
===================================================================
--- trunk/openvas-server/openvasd/preferences.c	2007-10-08 16:49:56 UTC (rev 419)
+++ trunk/openvas-server/openvasd/preferences.c	2007-10-08 16:51:05 UTC (rev 420)
@@ -28,11 +28,12 @@
 */
  
 #include <includes.h>
+#include <hosts_gatherer.h>
+
 #include "comm.h"
 #include "preferences.h"
 #include "log.h"
 #include "utils.h"
-#include "hosts_gatherer.h"
 
 
 #define inited(x) ((x) >= 0)



More information about the Openvas-commits mailing list