[Openvas-commits] r6612 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2010-02-02 11:56:52 +0100 (Tue, 02 Feb 2010)
New Revision: 6612

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage.h
   trunk/openvas-manager/src/omp.c
   trunk/openvas-manager/src/tasks_sql.h
Log:
	* src/tasks_sql.h (init_target_iterator): Add ROWID.
	(target_iterator_target): New function.
	(target_iterator_name, target_iterator_hosts, target_iterator_comment)
	(target_iterator_lsc_credential): Shift column positions.
	(target_in_use): Take target_t instead of name.

	* src/manage.h: Update headers accordingly.

	* src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_TARGETS pass a
	target_t to target_in_use instead of passing a name.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2010-02-02 10:46:07 UTC (rev 6611)
+++ trunk/openvas-manager/ChangeLog	2010-02-02 10:56:52 UTC (rev 6612)
@@ -1,7 +1,21 @@
 2010-02-02  Matthew Mundell <matthew.mundell at intevation.de>
 
-	* src/tasks_sql.h (init_target_task_iterator): Take target_t instead of name.
+	* src/tasks_sql.h (init_target_iterator): Add ROWID.
+	(target_iterator_target): New function.
+	(target_iterator_name, target_iterator_hosts, target_iterator_comment)
+	(target_iterator_lsc_credential): Shift column positions.
+	(target_in_use): Take target_t instead of name.
 
+	* src/manage.h: Update headers accordingly.
+
+	* src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_TARGETS pass a
+	target_t to target_in_use instead of passing a name.
+
+2010-02-02  Matthew Mundell <matthew.mundell at intevation.de>
+
+	* src/tasks_sql.h (init_target_task_iterator): Take target_t instead of
+	name.
+
 	* src/manage.h: Update header accordingly.
 
 	* src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_TARGETS pass a

Modified: trunk/openvas-manager/src/manage.h
===================================================================
--- trunk/openvas-manager/src/manage.h	2010-02-02 10:46:07 UTC (rev 6611)
+++ trunk/openvas-manager/src/manage.h	2010-02-02 10:56:52 UTC (rev 6612)
@@ -711,6 +711,9 @@
 void
 init_target_iterator (iterator_t*, target_t, int, const char*);
 
+target_t
+target_iterator_target (iterator_t*);
+
 const char*
 target_iterator_name (iterator_t*);
 
@@ -727,7 +730,7 @@
 target_hosts (const char*);
 
 int
-target_in_use (const char*);
+target_in_use (target_t);
 
 char*
 target_lsc_credential_name (const char *);

Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c	2010-02-02 10:46:07 UTC (rev 6611)
+++ trunk/openvas-manager/src/omp.c	2010-02-02 10:56:52 UTC (rev 6612)
@@ -8797,7 +8797,7 @@
                                             (target_iterator_hosts (&targets)),
                                            target_iterator_comment (&targets),
                                            target_in_use
-                                            (target_iterator_name (&targets)),
+                                            (target_iterator_target (&targets)),
                                            lsc_name ? lsc_name : "");
 
                   if (target)

Modified: trunk/openvas-manager/src/tasks_sql.h
===================================================================
--- trunk/openvas-manager/src/tasks_sql.h	2010-02-02 10:46:07 UTC (rev 6611)
+++ trunk/openvas-manager/src/tasks_sql.h	2010-02-02 10:56:52 UTC (rev 6612)
@@ -6485,7 +6485,7 @@
 
   if (target)
     init_iterator (iterator,
-                   "SELECT name, hosts, comment, lsc_credential"
+                   "SELECT ROWID, name, hosts, comment, lsc_credential"
                    " FROM targets"
                    " WHERE ROWID = %llu"
                    " AND ((owner IS NULL) OR (owner ="
@@ -6497,7 +6497,7 @@
                    ascending ? "ASC" : "DESC");
   else
     init_iterator (iterator,
-                   "SELECT name, hosts, comment, lsc_credential"
+                   "SELECT ROWID, name, hosts, comment, lsc_credential"
                    " FROM targets"
                    " WHERE ((owner IS NULL) OR (owner ="
                    " (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
@@ -6507,15 +6507,22 @@
                    ascending ? "ASC" : "DESC");
 }
 
-DEF_ACCESS (target_iterator_name, 0);
-DEF_ACCESS (target_iterator_hosts, 1);
+target_t
+target_iterator_target (iterator_t* iterator)
+{
+  if (iterator->done) return 0;
+  return (target_t) sqlite3_column_int64 (iterator->stmt, 0);
+}
 
+DEF_ACCESS (target_iterator_name, 1);
+DEF_ACCESS (target_iterator_hosts, 2);
+
 const char*
 target_iterator_comment (iterator_t* iterator)
 {
   const char *ret;
   if (iterator->done) return "";
-  ret = (const char*) sqlite3_column_text (iterator->stmt, 2);
+  ret = (const char*) sqlite3_column_text (iterator->stmt, 3);
   return ret ? ret : "";
 }
 
@@ -6524,7 +6531,7 @@
 {
   int ret;
   if (iterator->done) return -1;
-  ret = (int) sqlite3_column_int (iterator->stmt, 3);
+  ret = (int) sqlite3_column_int (iterator->stmt, 4);
   return ret;
 }
 
@@ -6614,19 +6621,17 @@
 /**
  * @brief Return whether a target is referenced by a task
  *
- * @param[in]  name  Name of target.
+ * @param[in]  target  Target.
  *
  * @return 1 if in use, else 0.
  */
 int
-target_in_use (const char* name)
+target_in_use (target_t target)
 {
-  gchar* quoted_name = sql_quote (name);
-  int ret = sql_int (0, 0,
-                     "SELECT count(*) FROM tasks WHERE target = '%s'",
-                     quoted_name);
-  g_free (quoted_name);
-  return ret;
+  return sql_int (0, 0,
+                  "SELECT count(*) FROM tasks WHERE target ="
+                  " (SELECT name FROM targets WHERE ROWID = %llu);",
+                  target);
 }
 
 /**