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

[scm-commit@wald.intevation.org]

Author: jan
Date: 2007-05-25 01:05:50 +0200 (Fri, 25 May 2007)
New Revision: 208

Modified:
   trunk/openvas-server/ChangeLog
   trunk/openvas-server/configure.in
   trunk/openvas-server/include/includes.h
   trunk/openvas-server/include/ntcompat.h
   trunk/openvas-server/include/openvas-devel.h
   trunk/openvas-server/openvasd/sighand.c
Log:
* include/includes.h, include/openvas-devel.h, openvasd/sighand.c:
  Remove any consideration of NESSUSNT.

* include/ntcompat.h: Remove any consideration of NESSUSNT and USE_NT_THREADS.

* configure.in: Removed handlung for SSL presence, because
  it is now mandatory.


Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog	2007-05-23 22:26:27 UTC (rev 207)
+++ trunk/openvas-server/ChangeLog	2007-05-24 23:05:50 UTC (rev 208)
@@ -1,3 +1,14 @@
+2007-05-25  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* include/includes.h, include/openvas-devel.h, openvasd/sighand.c:
+	Remove any consideration of NESSUSNT.
+
+	* include/ntcompat.h: Remove any consideration of NESSUSNT and
+	USE_NT_THREADS.
+
+	* configure.in: Removed handlung for SSL presence, because
+	it is now mandatory.
+
 2007-05-23  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
 	* configure.in, openvas-adduser.in, openvas-rmuser.in,

Modified: trunk/openvas-server/configure.in
===================================================================
--- trunk/openvas-server/configure.in	2007-05-23 22:26:27 UTC (rev 207)
+++ trunk/openvas-server/configure.in	2007-05-24 23:05:50 UTC (rev 208)
@@ -129,9 +129,7 @@
  }
 
 
-
-dnl only vanilla sed can handle long substitution lines
-OVSCFLAGS="`$LIBOPENVASCONFIG --cflags | sed 's/NESSUS_ON_SSL/OPENVAS_ON_SSL/'`"
+OVSCFLAGS="`$LIBOPENVASCONFIG --cflags`"
 NASLCFLAGS="`$OPENVASLIBNASLCONFIG --cflags`"
 
 egdpath="`$LIBOPENVASCONFIG --egd`"

Modified: trunk/openvas-server/include/includes.h
===================================================================
--- trunk/openvas-server/include/includes.h	2007-05-23 22:26:27 UTC (rev 207)
+++ trunk/openvas-server/include/includes.h	2007-05-24 23:05:50 UTC (rev 208)
@@ -229,13 +229,9 @@
  *
  */
 
-#ifdef NESSUSNT
-#define USE_NT_THREADS
-#else
 #ifndef USE_PTHREADS
 #define USE_FORK_THREADS
 #endif
-#endif
 
 #ifdef USE_PTHREADS
 # ifdef HAVE_PTHREAD_H

Modified: trunk/openvas-server/include/ntcompat.h
===================================================================
--- trunk/openvas-server/include/ntcompat.h	2007-05-23 22:26:27 UTC (rev 207)
+++ trunk/openvas-server/include/ntcompat.h	2007-05-24 23:05:50 UTC (rev 208)
@@ -37,25 +37,13 @@
  *
  */
 
-#ifdef NESSUSNT
-#include <windows.h>
-#endif
 
-
 /*
  * Thread management
  */
  
 typedef int(*thread_func_t)(void *);
 
-#ifdef USE_NT_THREADS
-typedef HANDLE nthread_t;
-#define EXIT(x) ExitThread(x)
-#define _EXIT(x) ExitThread(x)
-#define DO_EXIT(x) exit(x)
-#define TERMINATE_THREAD(x) TerminateThread(x,0)
-#endif /* US_NT_THREADS */
-
 #ifdef USE_FORK_THREADS
 typedef int nthread_t;
 #define EXIT(x) exit(x)
@@ -101,13 +89,6 @@
 /*
  * External libraries management
  */
-#ifdef NESSUSNT
-typedef HMODULE ext_library_t;
-#define LOAD_FUNCTION(x,y) GetProcAddress(x,y)
-#define LOAD_LIBRARY(x) LoadLibrary(x)
-#define LIB_LAST_ERROR WSAGetLastError
-#define CLOSE_LIBRARY(x) FreeLibrary(x)
-#else
 typedef void * ext_library_t;
 #define LOAD_FUNCTION(x,y) dlsym(x,y)
 
@@ -119,56 +100,13 @@
 
 #define LIB_LAST_ERROR dlerror
 #define CLOSE_LIBRARY(x) dlclose(x)
-#endif /* defined(NESSUSNT) */
 
 
-/*
- * Misc. functions
- */
-#ifdef NESSUSNT
-#ifndef __STDC__
-#define __STDC__ 1
-#endif
-#define getpid(x) GetCurrentProcessId(x)
-#define close(x)  closesocket(x)
-#define ioctl(x,y,z) ioctlsocket(x,y,z)
-#define signal(x,y)
-#define alarm(x)
-#define chmod(x,y)
-#define getopt(x,y,z) EOF
-typedef unsigned int u_int32_t;
-typedef unsigned short n_short;
-typedef unsigned short u_short;
-typedef unsigned short u_int16_t;
-typedef unsigned long n_time;
-#define ICMP_ECHO 8
-#define ICMP_ECHOREPLY 0
-#endif /* defined(NESSUSNT) */
-
-#ifndef NESSUSNT
 #define print_error printf
-#endif
 
-
-
-#ifdef NESSUSNT
-#define DllExport __declspec (dllexport)
-#define DllImport __declspec  (dllimport)
-#define PlugExport DllExport
-
-#ifdef EXPORTING
-#define ExtFunc DllExport
-#else
-#define ExtFunc DllImport
-#endif /* defined(EXPORTING) */
-
-#else /* !NESSUSNT */
-
 #define PlugExport
 #define DllExport
 #define DllImport
 #define ExtFunc
 
-#endif /* defined(NESSUSNT) */
-
 #endif /* defined(NESSUS_NT_COMPAT_H) */

Modified: trunk/openvas-server/include/openvas-devel.h
===================================================================
--- trunk/openvas-server/include/openvas-devel.h	2007-05-23 22:26:27 UTC (rev 207)
+++ trunk/openvas-server/include/openvas-devel.h	2007-05-24 23:05:50 UTC (rev 208)
@@ -28,12 +28,10 @@
 */
 
 
-#ifndef NESSUSNT
 #ifndef HAVE_MEMCPY
 #define memcpy(d, s, n) bcopy ((s), (d), (n))
 #define memmove(d, s, n) bcopy ((s), (d), (n))
 #endif
-#endif
 
 
 #if !defined(HAVE_BZERO) || (HAVE_BZERO == 0)

Modified: trunk/openvas-server/openvasd/sighand.c
===================================================================
--- trunk/openvas-server/openvasd/sighand.c	2007-05-23 22:26:27 UTC (rev 207)
+++ trunk/openvas-server/openvasd/sighand.c	2007-05-24 23:05:50 UTC (rev 208)
@@ -30,7 +30,6 @@
 
 #include <includes.h>
 
-#ifndef NESSUSNT
 #include "log.h"
 #include "auth.h"
 #include "sighand.h"
@@ -221,6 +220,3 @@
  make_em_die (SIGTERM);
  _EXIT(0);
 }
-
-
-#endif /* not defined(NESSUSNT) */