Drop daemon mode

COPYING

@@ -19,16 +19,12 @@ tool with the following command:
 src/CMakeLists.txt: GPL-2+
 src/attack.c: GPL-2
 src/attack.h: GPL-2
-src/comm.c: GPL-2
-src/comm.h: GPL-2
 src/hosts.c: GPL-2
 src/hosts.h: GPL-2
 src/nasl_plugins.c: GPL-2
 src/ntp.c: GPL-2
 src/ntp.h: GPL-2
 src/openvassd.c: GPL-2
-src/otp.c: GPL-2+
-src/otp.h: GPL-2+
 src/pluginlaunch.c: GPL-2
 src/pluginlaunch.h: GPL-2
 src/pluginload.c: GPL-2

doc/openvassd.8.in

@@ -1,4 +1,4 @@
-.TH OpenVASSD 8 "January 2011" "Greenbone Vulnerability Management" "User Manuals"
+.TH OpenVASSD 8 "June 2019" "Greenbone Vulnerability Management" "User Manuals"
 .SH NAME
 openvassd \- The Scanner of the Greenbone Vulnerability Management
 .SH SYNOPSIS
@@ -25,10 +25,6 @@ by default (unless you specify \-f as an option).
 Use the alternate configuration file instead of 
 .I @OPENVASSD_CONF@
 
-.TP 
-.B "-f, --foreground"
-Make the scanner stay in foreground (non-daemon mode)
-
 .TP 
 .B "-v, --version"
 Writes the version number and exits

src/CMakeLists.txt

@@ -57,8 +57,8 @@ else (NOT GCRYPT)
   endif (GCRYPT_VERSION VERSION_LESS "1.6")
 endif (NOT GCRYPT)
 
-add_executable (openvassd attack.c comm.c hosts.c
-                nasl_plugins.c ntp.c openvassd.c otp.c
+add_executable (openvassd attack.c hosts.c
+                nasl_plugins.c ntp.c openvassd.c
                 pluginlaunch.c pluginload.c
                 pluginscheduler.c plugs_req.c
                 processes.c sighand.c utils.c)
@@ -160,8 +160,8 @@ add_dependencies (check cppcheck)
 
 ## Tag files
 
-set (C_FILES "attack.c" "comm.c" "hosts.c"
-     "nasl_plugins.c" "ntp.c" "openvassd.c" "otp.c"
+set (C_FILES "attack.c" "hosts.c"
+     "nasl_plugins.c" "ntp.c" "openvassd.c"
      "pluginlaunch.c" "pluginload.c"
      "pluginscheduler.c" "plugs_req.c"
      "processes.c" "sighand.c" "utils.c")

src/attack.c

@@ -29,7 +29,6 @@
 #include "../misc/nvt_categories.h" /* for ACT_INIT */
 #include "../misc/pcap_openvas.h"   /* for v6_is_local_ip */
 #include "../nasl/nasl_debug.h"     /* for nasl_*_filename */
-#include "comm.h"
 #include "hosts.h"
 #include "pluginlaunch.h"
 #include "pluginload.h"
@@ -141,16 +140,6 @@ comm_send_status (kb_t kb, char *hostname, int curr, int max)
   return 0;
 }
 
-static void
-error_message_to_client (int soc, const char *msg, const char *hostname,
-                         const char *port)
-{
-  if (is_otp_scan ())
-    send_printf (
-      soc, "SERVER <|> ERRMSG <|> %s <|>  <|> %s <|> %s <|>  <|> SERVER\n",
-      hostname ?: "", port ?: "", msg ?: "No error.");
-}
-
 static void
 error_message_to_client2 (kb_t kb, const char *msg, const char *port)
 {
@@ -161,15 +150,14 @@ error_message_to_client2 (kb_t kb, const char *msg, const char *port)
 }
 
 static void
-report_kb_failure (int soc, int errcode)
+report_kb_failure (int errcode)
 {
   gchar *msg;
 
   errcode = abs (errcode);
   msg = g_strdup_printf ("WARNING: Cannot connect to KB at '%s': %s'",
                          prefs_get ("db_address"), strerror (errcode));
   g_warning ("%s", msg);
-  error_message_to_client (soc, msg, NULL, NULL);
   g_free (msg);
 }
 
@@ -406,17 +394,16 @@ init_host_kb (struct scan_globals *globals, char *ip_str, kb_t *network_kb)
   gchar *hostname_pattern;
   enum net_scan_status nss;
   const gchar *kb_path = prefs_get ("db_address");
-  int rc, soc;
+  int rc;
 
   nss = network_scan_status (globals);
-  soc = globals->global_socket;
   switch (nss)
     {
     case NSS_DONE:
       rc = kb_new (&kb, kb_path);
       if (rc)
         {
-          report_kb_failure (soc, rc);
+          report_kb_failure (rc);
           return NULL;
         }
 
@@ -435,7 +422,7 @@ init_host_kb (struct scan_globals *globals, char *ip_str, kb_t *network_kb)
       rc = kb_new (&kb, kb_path);
       if (rc)
         {
-          report_kb_failure (soc, rc);
+          report_kb_failure (rc);
           return NULL;
         }
     }
@@ -705,8 +692,7 @@ attack_start (struct attack_start_args *args)
   gettimeofday (&then, NULL);
 
   kb_item_set_str (kb, "internal/scan_id", globals->scan_id, 0);
-  if (!is_otp_scan ())
-    set_kb_readable (kb_get_kb_index (kb));
+  set_kb_readable (kb_get_kb_index (kb));
 
   /* The reverse lookup is delayed to this step in order to not slow down the
    * main scan process eg. case of target with big range of IP addresses. */
@@ -737,14 +723,12 @@ attack_start (struct attack_start_args *args)
 
   if (!scan_is_stopped () && !all_scans_are_stopped ())
     {
-      if (!is_otp_scan ())
-        {
-          char key[1024];
-          snprintf (key, sizeof (key), "internal/%s", globals->scan_id);
-          kb_item_set_str (kb, key, "finished", 0);
-        }
+      char key[1024];
       struct timeval now;
 
+      snprintf (key, sizeof (key), "internal/%s", globals->scan_id);
+      kb_item_set_str (kb, key, "finished", 0);
+
       gettimeofday (&now, NULL);
       if (now.tv_usec < then.tv_usec)
         {
@@ -872,7 +856,7 @@ iface_authorized (const char *iface)
  * unauthorized value, -2 if iface can't be used.
  */
 static int
-apply_source_iface_preference (int soc)
+apply_source_iface_preference ()
 {
   const char *source_iface = prefs_get ("source_iface");
   int ret;
@@ -887,7 +871,6 @@ apply_source_iface_preference (int soc)
         g_strdup_printf ("Unauthorized source interface: %s", source_iface);
       g_warning ("source_iface: Unauthorized source interface %s.",
                  source_iface);
-      error_message_to_client (soc, msg, NULL, NULL);
 
       g_free (msg);
       return -1;
@@ -900,7 +883,6 @@ apply_source_iface_preference (int soc)
       g_warning ("source_iface: Unauthorized source interface %s."
                  " (sys_* preference restriction.)",
                  source_iface);
-      error_message_to_client (soc, msg, NULL, NULL);
 
       g_free (msg);
       return -1;
@@ -911,7 +893,6 @@ apply_source_iface_preference (int soc)
       gchar *msg =
         g_strdup_printf ("Erroneous source interface: %s", source_iface);
       g_debug ("source_iface: Error with %s interface.", source_iface);
-      error_message_to_client (soc, msg, NULL, NULL);
 
       g_free (msg);
       return -2;
@@ -931,14 +912,14 @@ apply_source_iface_preference (int soc)
 }
 
 static int
-check_kb_access (int soc)
+check_kb_access ()
 {
   int rc;
   kb_t kb;
 
   rc = kb_new (&kb, prefs_get ("db_address"));
   if (rc)
-    report_kb_failure (soc, rc);
+    report_kb_failure (rc);
   else
     kb_delete (kb);
 
@@ -1016,24 +997,20 @@ attack_network (struct scan_globals *globals, kb_t *network_kb)
     network_kb = NULL;
 
   global_socket = globals->global_socket;
-  if (check_kb_access (global_socket))
+  if (check_kb_access ())
     return;
 
   /* Init and check Target List */
   hostlist = prefs_get ("TARGET");
   if (hostlist == NULL)
     {
-      error_message_to_client (global_socket, "Missing target hosts", NULL,
-                               NULL);
       return;
     }
 
   /* Verify the port range is a valid one */
   port_range = prefs_get ("port_range");
   if (validate_port_range (port_range))
     {
-      error_message_to_client (global_socket, "Invalid port range", NULL,
-                               port_range);
       return;
     }
 
@@ -1043,10 +1020,6 @@ attack_network (struct scan_globals *globals, kb_t *network_kb)
                                   network_phase);
   if (!sched)
     {
-      error_message_to_client (global_socket,
-                               "Couldn't initialize "
-                               "the plugin scheduler",
-                               NULL, NULL);
       g_message ("Couldn't initialize the plugin scheduler");
       return;
     }
@@ -1073,7 +1046,7 @@ attack_network (struct scan_globals *globals, kb_t *network_kb)
           rc = kb_new (network_kb, prefs_get ("db_address"));
           if (rc)
             {
-              report_kb_failure (global_socket, rc);
+              report_kb_failure (rc);
               host = NULL;
             }
           else
@@ -1090,20 +1063,16 @@ attack_network (struct scan_globals *globals, kb_t *network_kb)
   while (unresolved)
     {
       g_warning ("Couldn't resolve hostname '%s'", (char *) unresolved->data);
-      error_message_to_client (global_socket, "Couldn't resolve hostname",
-                               unresolved->data, NULL);
       unresolved = unresolved->next;
     }
   g_slist_free_full (unresolved, g_free);
   /* Apply Hosts preferences. */
   apply_hosts_preferences (hosts);
 
   /* Don't start if the provided interface is unauthorized. */
-  if (apply_source_iface_preference (global_socket) != 0)
+  if (apply_source_iface_preference () != 0)
     {
       gvm_hosts_free (hosts);
-      error_message_to_client (
-        global_socket, "Interface not authorized for scanning", NULL, NULL);
       return;
     }
   host = gvm_hosts_next (hosts);
@@ -1124,11 +1093,11 @@ attack_network (struct scan_globals *globals, kb_t *network_kb)
       rc = kb_new (&host_kb, prefs_get ("db_address"));
       if (rc)
         {
-          report_kb_failure (global_socket, rc);
+          report_kb_failure (rc);
           goto scan_stop;
         }
       host_str = gvm_host_value_str (host);
-      if (hosts_new (globals, host_str, host_kb) < 0)
+      if (hosts_new (host_str, host_kb) < 0)
         {
           g_free (host_str);
           goto scan_stop;
@@ -1182,7 +1151,7 @@ attack_network (struct scan_globals *globals, kb_t *network_kb)
 
   /* Every host is being tested... We have to wait for the processes
    * to terminate. */
-  while (hosts_read (globals) == 0)
+  while (hosts_read () == 0)
     ;
   g_message ("Test complete");
 
@@ -1196,10 +1165,6 @@ attack_network (struct scan_globals *globals, kb_t *network_kb)
 
   if (all_scans_are_stopped ())
     {
-      error_message_to_client (global_socket,
-                               "The whole scan was stopped. "
-                               "Fatal Redis connection error.",
-                               "", NULL);
     }
 
   gvm_hosts_free (hosts);