Change: move alert_secinfo_count out of manage_sql.c

It's only used by condition_met, so put it in manage_events.c.

Author: mattmundell

src/manage_events.c

@@ -35,6 +35,74 @@
  */
 #define G_LOG_DOMAIN "md manage"
 
+/**
+ * @brief Return the SecInfo count.
+ *
+ * @param[in]  alert      Alert.
+ * @param[in]  filter_id  Condition filter id.
+ *
+ * @return 1 if met, else 0.
+ */
+static time_t
+alert_secinfo_count (alert_t alert, char *filter_id)
+{
+  get_data_t get;
+  int db_count, uuid_was_null;
+  event_t event;
+  gboolean get_modified;
+  time_t feed_version_epoch;
+  char *secinfo_type;
+
+  event = alert_event (alert);
+  get_modified = (event == EVENT_UPDATED_SECINFO);
+
+  if (current_credentials.uuid == NULL)
+    {
+      current_credentials.uuid = alert_owner_uuid (alert);
+      uuid_was_null = 1;
+    }
+  else
+    uuid_was_null = 0;
+
+  memset (&get, '\0', sizeof (get));
+  if (filter_id && strlen (filter_id) && strcmp (filter_id, "0"))
+    get.filt_id = filter_id;
+
+  secinfo_type = alert_data (alert, "event", "secinfo_type");
+
+  if (strcmp (secinfo_type, "nvt") == 0)
+    {
+      feed_version_epoch = nvts_feed_version_epoch ();
+      db_count = nvt_info_count_after (&get,
+                                       feed_version_epoch,
+                                       get_modified);
+    }
+  else if (strcmp (secinfo_type, "cert_bund_adv") == 0
+           || strcmp (secinfo_type, "dfn_cert_adv") == 0)
+    {
+      feed_version_epoch = cert_check_time ();
+      db_count = secinfo_count_after (&get,
+                                      secinfo_type,
+                                      feed_version_epoch,
+                                      get_modified);
+    }
+  else // assume SCAP data
+    {
+      feed_version_epoch = scap_check_time ();
+      db_count = secinfo_count_after (&get,
+                                      secinfo_type,
+                                      feed_version_epoch,
+                                      get_modified);
+    }
+
+  if (uuid_was_null)
+    {
+      free (current_credentials.uuid);
+      current_credentials.uuid = NULL;
+    }
+
+  return db_count;
+}
 
 /**
  * @brief Return whether the condition of an alert is met by a task.

src/manage_sql.c

@@ -900,7 +900,7 @@ nvts_check_time ()
  *
  * @return Last time SCAP was checked.
  */
-static int
+int
 scap_check_time ()
 {
   return sql_int ("SELECT"
@@ -918,7 +918,7 @@ scap_check_time ()
  *
  * @return Last time CERT was checked.
  */
-static int
+int
 cert_check_time ()
 {
   return sql_int ("SELECT"
@@ -13507,75 +13507,6 @@ escalate_2 (alert_t alert, task_t task, report_t report, event_t event,
   "Name                Title\n"                                                \
   "------------------------------------------------------------------------------------------\n"
 
-/**
- * @brief Return the SecInfo count.
- *
- * @param[in]  alert      Alert.
- * @param[in]  filter_id  Condition filter id.
- *
- * @return 1 if met, else 0.
- */
-time_t
-alert_secinfo_count (alert_t alert, char *filter_id)
-{
-  get_data_t get;
-  int db_count, uuid_was_null;
-  event_t event;
-  gboolean get_modified;
-  time_t feed_version_epoch;
-  char *secinfo_type;
-
-  event = alert_event (alert);
-  get_modified = (event == EVENT_UPDATED_SECINFO);
-
-  if (current_credentials.uuid == NULL)
-    {
-      current_credentials.uuid = alert_owner_uuid (alert);
-      uuid_was_null = 1;
-    }
-  else
-    uuid_was_null = 0;
-
-  memset (&get, '\0', sizeof (get));
-  if (filter_id && strlen (filter_id) && strcmp (filter_id, "0"))
-    get.filt_id = filter_id;
-
-  secinfo_type = alert_data (alert, "event", "secinfo_type");
-
-  if (strcmp (secinfo_type, "nvt") == 0)
-    {
-      feed_version_epoch = nvts_feed_version_epoch ();
-      db_count = nvt_info_count_after (&get,
-                                       feed_version_epoch,
-                                       get_modified);
-    }
-  else if (strcmp (secinfo_type, "cert_bund_adv") == 0
-           || strcmp (secinfo_type, "dfn_cert_adv") == 0)
-    {
-      feed_version_epoch = cert_check_time ();
-      db_count = secinfo_count_after (&get,
-                                      secinfo_type,
-                                      feed_version_epoch,
-                                      get_modified);
-    }
-  else // assume SCAP data
-    {
-      feed_version_epoch = scap_check_time ();
-      db_count = secinfo_count_after (&get,
-                                      secinfo_type,
-                                      feed_version_epoch,
-                                      get_modified);
-    }
-
-  if (uuid_was_null)
-    {
-      free (current_credentials.uuid);
-      current_credentials.uuid = NULL;
-    }
-
-  return db_count;
-}
-
 
 /* Task functions. */
 

src/manage_sql.h

@@ -482,6 +482,12 @@ int manage_cert_db_exists ();
 
 int manage_scap_db_exists ();
 
+int
+cert_check_time ();
+
+int
+scap_check_time ();
+
 int
 count (const char *, const get_data_t *, column_t *, column_t *, const char **,
        int, const char *, const char *, int);
@@ -531,9 +537,6 @@ event_alert_iterator_active (iterator_t *);
 int
 alert_applies_to_task (alert_t, task_t);
 
-time_t
-alert_secinfo_count (alert_t, char *);
-
 int
 task_second_last_report (task_t, report_t *);