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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-03-02 10:52:45 +0100 (Mon, 02 Mar 2009)
New Revision: 2624

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage.h
   trunk/openvas-manager/src/omp.c
   trunk/openvas-manager/src/otp.c
Log:
Add "Requested" task running state.  Correct STATUS_RESPONSE tags and
CLIENT_MODIFY_TASK variable usage.


Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-03-02 09:49:32 UTC (rev 2623)
+++ trunk/openvas-manager/ChangeLog	2009-03-02 09:52:45 UTC (rev 2624)
@@ -1,5 +1,20 @@
 2009-03-02  Matthew Mundell <matt at mundell.ukfsn.org>
 
+	Add "Requested" task running state.  Correct STATUS_RESPONSE tags and
+	CLIENT_MODIFY_TASK variable usage.
+
+	* src/otp.c (process_otp_server_input): Update task running state
+	on receiving SCAN_START.
+
+	* src/omp.c (omp_xml_handle_end_element): Add printing of new running
+	state.  Rename TASK_STATUS entity in TASK in STATUS_RESPONSE to STATUS.
+	Correct STATUS_RESPONSE closing tags.  In CLIENT_MODIFY_TASK case
+	use local var instead of setting current_client_task.
+
+	* src/manage.h (task_t): Note new running state.
+
+2009-03-02  Matthew Mundell <matt at mundell.ukfsn.org>
+
 	* src/tests/common.c: Turn off some tracing.
 	(DO_CHILDREN, id_string, wait_for_task_start, delete_task): New functions.
 

Modified: trunk/openvas-manager/src/manage.h
===================================================================
--- trunk/openvas-manager/src/manage.h	2009-03-02 09:49:32 UTC (rev 2623)
+++ trunk/openvas-manager/src/manage.h	2009-03-02 09:52:45 UTC (rev 2624)
@@ -101,7 +101,7 @@
   char* description;          ///< Description.
   int description_length;     ///< Length of description.
   int description_size;       ///< Actual size allocated for description.
-  short running;              ///< Flag: 0 initially, 1 if running.
+  short running;              ///< Flag: 0 new, 1 started, 2 running.
   char* start_time;           ///< Time the task last started.
   char* end_time;             ///< Time the task last ended.
   unsigned int report_count;  ///< The number of existing reports on the task.

Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c	2009-03-02 09:49:32 UTC (rev 2623)
+++ trunk/openvas-manager/src/omp.c	2009-03-02 09:52:45 UTC (rev 2624)
@@ -488,7 +488,7 @@
           {
             SEND_TO_CLIENT ("<status_response>"
                             "<status>402</status>"
-                            "</status_task_response>");
+                            "</status_response>");
             set_client_state (CLIENT_AUTHENTIC);
             g_set_error (error,
                          G_MARKUP_ERROR,
@@ -909,15 +909,15 @@
           unsigned int id;
           if (sscanf (current_task_task_id, "%u", &id) == 1)
             {
-              current_client_task = find_task (id);
-              if (current_client_task == NULL)
+              task_t* task = find_task (id);
+              if (task == NULL)
                 SEND_TO_CLIENT ("<modify_task_response>"
                                 "<status>407</status>"
                                 "</modify_task_response>");
               else
                 {
                   // FIX check if param,value else respond fail
-                  int fail = set_task_parameter (current_client_task,
+                  int fail = set_task_parameter (task,
                                                  modify_task_parameter,
                                                  modify_task_value);
                   free (modify_task_parameter);
@@ -1047,8 +1047,7 @@
                 task_t* task = find_task (id);
                 if (task == NULL)
                   SEND_TO_CLIENT ("<status_response>"
-                                  "<status>407</status>"
-                                  "</status_response>");
+                                  "<status>407</status>");
                 else
                   {
                     SEND_TO_CLIENT ("<status_response><status>200</status>");
@@ -1061,8 +1060,7 @@
               }
             else
               SEND_TO_CLIENT ("<status_response>"
-                              "<status>40x</status>"
-                              "</status_response>");
+                              "<status>40x</status>");
             free_string_var (&current_task_task_id);
           }
         else
@@ -1082,7 +1080,7 @@
                     line = g_strdup_printf ("<task>"
                                             "<task_id>%u</task_id>"
                                             "<identifier>%s</identifier>"
-                                            "<task_status>%s</task_status>"
+                                            "<status>%s</status>"
                                             "<messages>"
                                             "<debug>%i</debug>"
                                             "<hole>%i</hole>"
@@ -1093,7 +1091,11 @@
                                             "</task>",
                                             index->id,
                                             index->name,
-                                            index->running ? "Running" : "New",
+                                            index->running
+                                            ? (index->running == 1
+                                               ? "Requested"
+                                               : "Running")
+                                            : "New",
                                             index->debugs_size,
                                             index->holes_size,
                                             index->infos_size,

Modified: trunk/openvas-manager/src/otp.c
===================================================================
--- trunk/openvas-manager/src/otp.c	2009-03-02 09:49:32 UTC (rev 2623)
+++ trunk/openvas-manager/src/otp.c	2009-03-02 09:52:45 UTC (rev 2624)
@@ -1819,7 +1819,8 @@
                 }
               case SERVER_TIME_SCAN_START:
                 {
-                  /* Read over it. */
+                  if (current_server_task)
+                    current_server_task->running = 2;
                   set_server_state (SERVER_DONE);
                   switch (parse_server_done (&messages))
                     {