[Openvas-commits] r9840 - in trunk/openvas-scanner: . cnvts/find_service cnvts/openvas_tcp_scanner cnvts/synscan

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Dec 30 23:52:32 CET 2010


Author: jan
Date: 2010-12-30 23:52:30 +0100 (Thu, 30 Dec 2010)
New Revision: 9840

Removed:
   trunk/openvas-scanner/cnvts/synscan/openvasicmp.h
   trunk/openvas-scanner/cnvts/synscan/openvasip.h
   trunk/openvas-scanner/cnvts/synscan/openvasraw.h
   trunk/openvas-scanner/cnvts/synscan/openvastcp.h
   trunk/openvas-scanner/cnvts/synscan/openvasudp.h
Modified:
   trunk/openvas-scanner/ChangeLog
   trunk/openvas-scanner/MANIFEST
   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
Log:
* cnvts/find_service/find_service.c,
cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c: Replaced
use of includes.h by respective direct includes.

* cnvts/synscan/synscan.c: Replaced use of includes.h by
respective direct includes. Also removed inclusion of
the openvastcp.h which is only relevant for absence
of netinet.

* cnvts/synscan/openvastcp.h, cnvts/synscan/openvasicmp.h,
cnvts/synscan/openvasip.h, cnvts/synscan/openvasudp.h,
cnvts/synscan/openvasraw.h: Removed. We assume we have
have netinet.

* MANIFEST: Updated.



Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/ChangeLog	2010-12-30 22:52:30 UTC (rev 9840)
@@ -1,5 +1,23 @@
 2010-12-30  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
+	* cnvts/find_service/find_service.c,
+	cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c: Replaced
+	use of includes.h by respective direct includes.
+
+	* cnvts/synscan/synscan.c: Replaced use of includes.h by
+	respective direct includes. Also removed inclusion of
+	the openvastcp.h which is only relevant for absence
+	of netinet.
+
+	* cnvts/synscan/openvastcp.h, cnvts/synscan/openvasicmp.h,
+	cnvts/synscan/openvasip.h, cnvts/synscan/openvasudp.h,
+	cnvts/synscan/openvasraw.h: Removed. We assume we have
+	have netinet.
+
+	* MANIFEST: Updated.
+
+2010-12-30  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
 	* include/config.h.in: Remove long obsolete DEFAULT_PORT.
 
 2010-12-30  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>

Modified: trunk/openvas-scanner/MANIFEST
===================================================================
--- trunk/openvas-scanner/MANIFEST	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/MANIFEST	2010-12-30 22:52:30 UTC (rev 9840)
@@ -7,11 +7,6 @@
 cnvts/make_world
 cnvts/openvas_tcp_scanner/Makefile
 cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c
-cnvts/synscan/openvasicmp.h
-cnvts/synscan/openvasip.h
-cnvts/synscan/openvasraw.h
-cnvts/synscan/openvastcp.h
-cnvts/synscan/openvasudp.h
 cnvts/synscan/Makefile
 cnvts/synscan/synscan.c
 config.guess

Modified: trunk/openvas-scanner/cnvts/find_service/find_service.c
===================================================================
--- trunk/openvas-scanner/cnvts/find_service/find_service.c	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/find_service/find_service.c	2010-12-30 22:52:30 UTC (rev 9840)
@@ -7,8 +7,19 @@
 #define SMART_TCP_RW
 /* #define DEBUG */
 
-#include <includes.h>
+#include "config.h"    /* for PLUGIN_TIMEOUT */
 
+#include <stdio.h>     /* for snprintf() */
+#include <string.h>    /* for strstr() */
+#include <stdlib.h>    /* for atoi() */
+#include <errno.h>     /* for errno() */
+#include <signal.h>    /* for signal() */
+#include <ctype.h>     /* for tolower() */
+#include <sys/time.h>  /* for gettimeofday() */
+#include <sys/types.h> /* for waitpid() */
+#include <sys/wait.h>  /* for waitpid() */
+#include <unistd.h>    /* for usleep() */
+
 #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 */

Modified: trunk/openvas-scanner/cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c
===================================================================
--- trunk/openvas-scanner/cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/openvas_tcp_scanner/openvas_tcp_scanner.c	2010-12-30 22:52:30 UTC (rev 9840)
@@ -15,8 +15,19 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-#include <includes.h>
 
+#include <unistd.h>       /* for close() */
+#include <fcntl.h>        /* for fcntl() */
+#include <string.h>       /* for strcmp() */
+#include <stdio.h>        /* for fprintf() */
+#include <stdlib.h>       /* for atoi() */
+#include <sys/types.h>    /* for socket() */ 
+#include <sys/socket.h>   /* for socket() */
+#include <errno.h>        /* for errno() */
+#include <sys/time.h>     /* for gettimeofday() */
+#include <sys/resource.h> /* for getrlimit() */
+#include <netdb.h>        /* for getprotobyname() */
+
 #include <glib.h>
 
 #include <openvas/misc/arglists.h> /* for struct arglist */

Deleted: trunk/openvas-scanner/cnvts/synscan/openvasicmp.h
===================================================================
--- trunk/openvas-scanner/cnvts/synscan/openvasicmp.h	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/synscan/openvasicmp.h	2010-12-30 22:52:30 UTC (rev 9840)
@@ -1,114 +0,0 @@
-/* OpenVAS
-* $Id$
-* Description: Defines ICMP structs.
-*
-* 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.
-*
-*
-*/
-
-/** @todo A similar file exists in openvas-libraries/nasl/, but prefixed 'nasl'
- *        instead of 'openvas'. If resolution of cnvts proceeds slowly,
- *        consider removal. */
-
-#ifndef OPENVASICMP_H
-#define OPENVASICMP_H
-
-#ifdef HAVE_NETINET_IP_ICMP_H
-#include <netinet/ip_icmp.h>
-#endif
-
-#if !defined(HAVE_STRUCT_ICMP) || (HAVE_STRUCT_ICMP == 0)
-struct icmp_ra_addr {
-	u_int32_t ira_addr;
-	u_int32_t ira_preference;
-};
-#define HAVE_STRUCT_ICMP 1
-
-struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
-		struct ih_idseq {
-			n_short	icd_id;
-			n_short	icd_seq;
-		} ih_idseq;
-		int ih_void;
-
-		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-		struct ih_pmtu {
-			n_short ipm_void;
-			n_short ipm_nextmtu;
-		} ih_pmtu;
-
-		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
-		} ih_rtradv;
-	} icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-	union {
-		struct id_ts {
-			n_time its_otime;
-			n_time its_rtime;
-			n_time its_ttime;
-		} id_ts;
-		struct id_ip  {
-			struct ip idi_ip;
-			/* options and then 64 bits of data */
-		} id_ip;
-		struct icmp_ra_addr id_radv;
-		u_long	id_mask;
-		char	id_data[1];
-	} icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-#endif /* not defined(HAVE_STRUCT_ICMP) */
-
-#ifndef HAS_ICMP_ICMP_LIFETIME
-#define SET_ICMP_LIFETIME(x,y) (x).icmp_hun.ih_void = (x).icmp_hun.ih_void & y
-#else
-#define SET_ICMP_LIFETIME(x,y) (x).icmp_lifetime = y
-#endif
-
-#endif

Deleted: trunk/openvas-scanner/cnvts/synscan/openvasip.h
===================================================================
--- trunk/openvas-scanner/cnvts/synscan/openvasip.h	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/synscan/openvasip.h	2010-12-30 22:52:30 UTC (rev 9840)
@@ -1,71 +0,0 @@
-/* OpenVAS
-* $Id$
-* Description: Defines IP structs.
-*
-* 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.
-*
-*
-*/
-
-/** @todo A similar file exists in openvas-libraries/nasl/, but prefixed 'nasl'
- *        instead of 'openvas'. If resolution of cnvts proceeds slowly,
- *        consider removal. */
-
-#ifndef OPENVASIP_H__
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-
-#if !defined(HAVE_STRUCT_IP) || (HAVE_STRUCT_IP == 0)
-
-#undef _IP_VHL;
-
-#define HAVE_STRUCT_IP 1
-struct ip {
-#if !WORDS_BIGENDIAN
-	u_char	ip_hl:4,		/* header length */
-		ip_v:4;			/* version */
-#else
-	 u_char	ip_v:4,			/* version */
-		ip_hl:4;		/* header length */
-#endif
-	u_char	ip_tos;			/* type of service */
-	u_short	ip_len;			/* total length */
-	u_short	ip_id;			/* identification */
-	u_short	ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* dont fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-	u_char	ip_ttl;			/* time to live */
-	u_char	ip_p;			/* protocol */
-	u_short	ip_sum;			/* checksum */
-	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-};
-
-#endif /* not defined(HAVE_STRUCT_IP) */
-
-#ifdef HAVE_STRUCT_IP_CSUM
-#define ip_sum ip_csum
-#endif
-#endif /* OPENVASIP_H__ */

Deleted: trunk/openvas-scanner/cnvts/synscan/openvasraw.h
===================================================================
--- trunk/openvas-scanner/cnvts/synscan/openvasraw.h	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/synscan/openvasraw.h	2010-12-30 22:52:30 UTC (rev 9840)
@@ -1,58 +0,0 @@
-/* OpenVAS
-* $Id$
-* Description: includes for raw sockets.
-*
-* 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.
-*
-*
-*/
-
-/** @todo A similar file exists in openvas-libraries/nasl/, but prefixed 'nasl'
- *        instead of 'openvas'. If resolution of cnvts proceeds slowly,
- *        consider removal. */
-
-#ifndef OPENVASRAW_H
-#define OPENVASRAW_H
-#ifdef __linux__
-#ifndef __BSD_SOURCE
-#define __BSD_SOURCE
-#endif
-
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
-#ifndef __FAVOR_BSD
-#define __FAVOR_BSD
-#endif
-#endif
-
-#include <openvasip.h>
-#include <openvastcp.h>
-#include <openvasudp.h>
-#include <openvasicmp.h>
-
-int tcp_ping_host(struct in_addr);
-long tcp_timing(struct in_addr, int num_probes, unsigned int port);
-
-#endif

Deleted: trunk/openvas-scanner/cnvts/synscan/openvastcp.h
===================================================================
--- trunk/openvas-scanner/cnvts/synscan/openvastcp.h	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/synscan/openvastcp.h	2010-12-30 22:52:30 UTC (rev 9840)
@@ -1,101 +0,0 @@
-/* OpenVAS
-* $Id$
-* Description: defines for TCP/IP flags and network byte order.
-*
-* 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.
-*
-*
-*/
-
-/** @todo A similar file exists in openvas-libraries/nasl/, but prefixed 'nasl'
- *        instead of 'openvas'. If resolution of cnvts proceeds slowly,
- *        consider removal. */
-
-#ifndef OPENVASTCP_H__
-#define OPENVASTCP_H__
-
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-
-#ifdef _CYGWIN_
-#define tcp_seq u_int
-#endif
-
-#if !defined(HAVE_STRUCT_TCPHDR) || (HAVE_STRUCT_TCPHDR == 0)
-#undef HAVE_TCPHDR_TH_X2_OFF
-#undef HAVE_TCPHDR_TH_OFF
-#define HAVE_TCPHDR_TH_OFF 1
-#define HAVE_STRUCT_TCPHDR 1
-struct tcphdr {
-	u_short	th_sport;		/* source port */
-	u_short	th_dport;		/* destination port */
-	tcp_seq	th_seq;			/* sequence number */
-	tcp_seq	th_ack;			/* acknowledgement number */
-#if !WORDS_BIGENDIAN
-	u_int	th_x2:4,		/* (unused) */
-		th_off:4;		/* data offset */
-#endif
-#if WORDS_BIGENDIAN
-	u_int	th_off:4,		/* data offset */
-		th_x2:4;		/* (unused) */
-#endif
-	u_char	th_flags;
-
-	u_short	th_win;			/* window */
-	u_short	th_sum;			/* checksum */
-	u_short	th_urp;			/* urgent pointer */
-};
-
-#endif
-
-
-#ifndef TH_FIN
-#define	TH_FIN	0x01
-#endif
-
-#ifndef TH_SYN
-#define	TH_SYN	0x02
-#endif
-
-#ifndef TH_RST
-#define	TH_RST	0x04
-#endif
-
-#ifndef TH_PUSH
-#define	TH_PUSH	0x08
-#endif
-
-#ifndef TH_ACK
-#define	TH_ACK	0x10
-#endif
-
-#ifndef TH_URG
-#define	TH_URG	0x20
-#endif
-
-#ifndef TH_FLAGS
-#define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG)
-#endif
-
-#endif /* OPENVASTCP_H__ */

Deleted: trunk/openvas-scanner/cnvts/synscan/openvasudp.h
===================================================================
--- trunk/openvas-scanner/cnvts/synscan/openvasudp.h	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/synscan/openvasudp.h	2010-12-30 22:52:30 UTC (rev 9840)
@@ -1,58 +0,0 @@
-/* OpenVAS
-* $Id$
-* Description: Defines for UDP struct.
-*
-* 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.
-*
-*
-*/
-
-/** @todo A similar file exists in openvas-libraries/nasl/, but prefixed 'nasl'
- *        instead of 'openvas'. If resolution of cnvts proceeds slowly,
- *        consider removal. */
-
-#ifndef OPENVASUDP_H__
-#define OPENVASUDP_H__
-
-#ifdef HAVE_NETINET_UDP_H
-#include <netinet/udp.h>
-#endif
-
-#if !defined(HAVE_STRUCT_UDPHDR) || HAVE_STRUCT_UDPHDR == 0
-#define HAVE_STRUCT_UDPHDR 1
-struct udphdr {
-	u_short	uh_sport;		/* source port */
-	u_short	uh_dport;		/* destination port */
-	u_short	uh_ulen;		/* udp length */
-	u_short	uh_sum;			/* udp checksum */
-};
-#endif
-
-#if defined(HAVE_STRUCT_UDPHDR) && !defined(HAVE_BSD_STRUCT_UDPHDR)
-#define uh_sport source
-#define uh_dport dest
-#define uh_ulen len
-#define uh_sum check
-#endif
-
-#endif /* OPENVASUDP_H__ */

Modified: trunk/openvas-scanner/cnvts/synscan/synscan.c
===================================================================
--- trunk/openvas-scanner/cnvts/synscan/synscan.c	2010-12-30 20:37:52 UTC (rev 9839)
+++ trunk/openvas-scanner/cnvts/synscan/synscan.c	2010-12-30 22:52:30 UTC (rev 9840)
@@ -26,8 +26,12 @@
 
 #define _BSD_SOURCE 1
 
-#include <includes.h>
-#include <openvasraw.h>
+#include <unistd.h>      /* for close() */
+#include <stdlib.h>      /* for rand() */
+#include <arpa/inet.h>   /* for AF_INET */
+#include <string.h>      /* for memcpy() */
+#include <netinet/tcp.h> /* for TH_SYN */
+#include <netinet/ip.h>
 
 #include <openvas/misc/arglists.h> /* for struct arglist */
 #include <openvas/misc/bpf_share.h> /* for bpf_open_live */
@@ -462,7 +466,7 @@
 	ip->ip_hl = 5;
 	ip->ip_v = 4;
 	ip->ip_tos = 0;
-	ip->ip_len = FIX (sizeof (struct ip) + sizeof (struct tcphdr));
+	ip->ip_len = sizeof (struct ip) + sizeof (struct tcphdr);
 	ip->ip_id = rand();
 	ip->ip_off = 0;
 	ip->ip_ttl = 64;



More information about the Openvas-commits mailing list