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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-03-10 12:06:15 +0100 (Tue, 10 Mar 2009)
New Revision: 2717

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/omp.c
   trunk/openvas-manager/src/otp.c
Log:
Add "done" task state.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-03-10 10:59:23 UTC (rev 2716)
+++ trunk/openvas-manager/ChangeLog	2009-03-10 11:06:15 UTC (rev 2717)
@@ -1,3 +1,9 @@
+2009-03-10  Matthew Mundell <matt at mundell.ukfsn.org>
+
+	* src/otp.c (process_otp_server_input): Add "done" task state.
+
+	* src/omp.c (omp_xml_handle_end_element): Add "done" task state.
+
 2009-03-02  Matthew Mundell <matt at mundell.ukfsn.org>
 
 	* src/manage.c (delete_task): Correct error check.

Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c	2009-03-10 10:59:23 UTC (rev 2716)
+++ trunk/openvas-manager/src/omp.c	2009-03-10 11:06:15 UTC (rev 2717)
@@ -1094,7 +1094,9 @@
                                             index->running
                                             ? (index->running == 1
                                                ? "Requested"
-                                               : "Running")
+                                               : (index->running == 2
+                                                  ? "Running"
+                                                  : "Done"))
                                             : "New",
                                             index->debugs_size,
                                             index->holes_size,

Modified: trunk/openvas-manager/src/otp.c
===================================================================
--- trunk/openvas-manager/src/otp.c	2009-03-10 10:59:23 UTC (rev 2716)
+++ trunk/openvas-manager/src/otp.c	2009-03-10 11:06:15 UTC (rev 2717)
@@ -1803,8 +1803,6 @@
                       current_server_task->end_time = time;
 
                       if (save_report (current_server_task)) return -1;
-
-                      current_server_task = NULL;
                     }
                   set_server_state (SERVER_DONE);
                   switch (parse_server_done (&messages))
@@ -1834,7 +1832,9 @@
                 }
               case SERVER_TIME_SCAN_END:
                 {
-                  /* Read over it. */
+                  if (current_server_task)
+                    current_server_task->running = 3;
+                  current_server_task = NULL;
                   set_server_state (SERVER_DONE);
                   switch (parse_server_done (&messages))
                     {