Add feature macro for backward compatibility

Author: jjnicola

base/hosts.c

@@ -509,7 +509,6 @@ gvm_is_cidr6_block (const char *str)
   return is_cidr6_block (str);
 }
 
-
 /**
  * @brief Gets the network block value from a CIDR-expressed block string.
  * For "192.168.1.1/24" it is 24.
@@ -652,7 +651,8 @@ cidr6_block_ips (const char *str, struct in6_addr *first, struct in6_addr *last)
 }
 
 int
-gvm_cidr6_block_ips (const char *str, struct in6_addr *first, struct in6_addr *last)
+gvm_cidr6_block_ips (const char *str, struct in6_addr *first,
+                     struct in6_addr *last)
 {
   return cidr6_block_ips (str, first, last);
 }

base/hosts.h

@@ -219,6 +219,6 @@ gvm_cidr6_get_ip (const char *, struct in6_addr *);
 
 int
 gvm_cidr6_block_ips (const char *str, struct in6_addr *first,
-                 struct in6_addr *last);
+                     struct in6_addr *last);
 
 #endif /* not _GVM_BASE_HOSTS_H */

boreas/cli.c

@@ -269,8 +269,6 @@ create_host_list (gpointer key, gpointer value, gpointer *userdata)
   GString *host_str = (GString *) *userdata;
   g_string_append (host_str, key);
   g_string_append (host_str, ",");
-  
-    
 }
 /**
  * @brief
@@ -281,15 +279,15 @@ create_host_list (gpointer key, gpointer value, gpointer *userdata)
  * @return NO_ERROR (0) on success, boreas_error_t on error.
  */
 boreas_error_t
-run_cli_for_ipv6_network (const char *net, char **hosts_found )
+run_cli_for_ipv6_network (const char *net, char **hosts_found,
+                          int print_results)
 {
   unsigned int block;
   struct in6_addr target;
   scanner_t scanner = {0};
   boreas_error_t init_err;
   boreas_error_t run_err;
   boreas_error_t free_err;
-  int print_results = 1;
 
   if (net == NULL || gvm_get_host_type (net) != HOST_TYPE_CIDR6_BLOCK)
     return BOREAS_INVALID_IPV6_NETWORK;
@@ -311,13 +309,17 @@ run_cli_for_ipv6_network (const char *net, char **hosts_found )
       printf ("Error while running the scan.\n");
       return run_err;
     }
-  
-  GString *host_str = g_string_new("");
-  g_hash_table_foreach (scanner.hosts_data->alivehosts, (GHFunc) create_host_list, (gpointer) &host_str);
 
-  *hosts_found = g_strdup (host_str->str);
-  g_string_free (host_str, TRUE);
-  
+  if (hosts_found != NULL)
+    {
+      GString *host_str = g_string_new ("");
+      g_hash_table_foreach (scanner.hosts_data->alivehosts,
+                            (GHFunc) create_host_list, (gpointer) &host_str);
+
+      *hosts_found = g_strdup (host_str->str);
+      g_string_free (host_str, TRUE);
+    }
+
   free_err = free_cli (&scanner, ALIVE_TEST_IPV6_HOST_DISCOVERY);
   if (free_err)
     {
@@ -326,8 +328,6 @@ run_cli_for_ipv6_network (const char *net, char **hosts_found )
     }
 
   return NO_ERROR;
-
-  return 0;
 }
 
 /**

boreas/cli.h

@@ -9,6 +9,8 @@
 #include "alivedetection.h"
 #include "boreas_error.h"
 
+#define FEATURE_HOST_DISCOVERY_IPV6
+
 boreas_error_t
 run_cli_extended (gvm_hosts_t *, alive_test_t, const gchar *,
                   const unsigned int);
@@ -17,7 +19,7 @@ boreas_error_t
 run_cli (gvm_hosts_t *, alive_test_t, const gchar *);
 
 boreas_error_t
-run_cli_for_ipv6_network (const char *, char **);
+run_cli_for_ipv6_network (const char *, char **, int);
 
 boreas_error_t
 is_host_alive (const char *, int *);

boreas/sniffer.c

@@ -181,7 +181,7 @@ got_packet (u_char *user_data,
        && (g_hash_table_add (hosts_data->alivehosts, g_strdup (addr_str))))
       || ((scanner->host_discovery == 1)
           && (g_hash_table_add (hosts_data->alivehosts, g_strdup (addr_str)))
-          && (g_hash_table_add (hosts_data->targethosts, g_strdup (addr_str)))          ))
+          && (g_hash_table_add (hosts_data->targethosts, g_strdup (addr_str)))))
     {
       /* handle max_scan_hosts related restrictions. */
       handle_scan_restrictions (scanner, addr_str);