[Openvas-commits] r2862 - in trunk/openvas-manager: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Mar 20 15:39:13 CET 2009
Author: mattm
Date: 2009-03-20 15:39:08 +0100 (Fri, 20 Mar 2009)
New Revision: 2862
Modified:
trunk/openvas-manager/ChangeLog
trunk/openvas-manager/src/manage.c
trunk/openvas-manager/src/manage.h
trunk/openvas-manager/src/omp.c
trunk/openvas-manager/src/otp.c
Log:
Add a task status enumeration. Rename task_t running slot to run_status.
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2009-03-20 12:26:16 UTC (rev 2861)
+++ trunk/openvas-manager/ChangeLog 2009-03-20 14:39:08 UTC (rev 2862)
@@ -1,3 +1,17 @@
+2009-03-20 Matthew Mundell <matt at mundell.ukfsn.org>
+
+ Add a task status enumeration. Rename task_t running slot to run_status.
+
+ * src/manage.h (task_status_t): New type.
+ (task_t): Rename running to run_state.
+
+ * src/manage.c (make_task, start_task, stop_task): Use new task status
+ enum.
+
+ * src/omp.c (omp_xml_handle_end_element): Use new task status enum.
+
+ * src/otp.c (process_otp_server_input): Use new task status enum.
+
2009-03-20 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
* packaging/: New.
Modified: trunk/openvas-manager/src/manage.c
===================================================================
--- trunk/openvas-manager/src/manage.c 2009-03-20 12:26:16 UTC (rev 2861)
+++ trunk/openvas-manager/src/manage.c 2009-03-20 14:39:08 UTC (rev 2862)
@@ -473,7 +473,7 @@
index->comment = comment;
index->description = NULL;
index->description_size = 0;
- index->running = 0;
+ index->run_status = TASK_STATUS_NEW;
index->report_count = 0;
index->open_ports = NULL;
index->debugs = g_ptr_array_new ();
@@ -844,8 +844,8 @@
{
tracef (" start task %u\n", task->id);
- if (task->running == 1 /* Requested. */
- || task->running == 2) /* Running. */
+ if (task->run_status == TASK_STATUS_REQUESTED
+ || task->run_status == TASK_STATUS_RUNNING)
return 0;
if (send_to_server ("CLIENT <|> PREFERENCES <|>\n")) return -1;
@@ -883,7 +883,7 @@
return -1;
#endif
- task->running = 1;
+ task->run_status = TASK_STATUS_REQUESTED;
if (task->open_ports) g_array_free (task->open_ports, TRUE);
task->open_ports = g_array_new (FALSE, FALSE, sizeof (port_t));
@@ -909,13 +909,14 @@
stop_task (task_t* task)
{
tracef (" stop task %u\n", task->id);
- if (task->running == 1 /* Requested. */
- || task->running == 2) /* Running. */
+ if (task->run_status == TASK_STATUS_REQUESTED
+ || task->run_status == TASK_STATUS_RUNNING)
{
// FIX dik
if (send_to_server ("CLIENT <|> STOP_ATTACK <|> dik <|> CLIENT\n"))
return -1;
- task->running = 0;
+ // FIX TASK_STATUS_STOP_REQUESTED?
+ task->run_status = TASK_STATUS_DONE;
}
return 0;
}
Modified: trunk/openvas-manager/src/manage.h
===================================================================
--- trunk/openvas-manager/src/manage.h 2009-03-20 12:26:16 UTC (rev 2861)
+++ trunk/openvas-manager/src/manage.h 2009-03-20 14:39:08 UTC (rev 2862)
@@ -98,6 +98,14 @@
char* oid; ///< NVT identifier.
} message_t;
+typedef enum
+{
+ TASK_STATUS_NEW,
+ TASK_STATUS_REQUESTED,
+ TASK_STATUS_RUNNING,
+ TASK_STATUS_DONE
+} task_status_t;
+
/**
* @brief A task.
*/
@@ -110,7 +118,7 @@
char* description; ///< Description.
int description_length; ///< Length of description.
int description_size; ///< Actual size allocated for description.
- short running; ///< Flag: 0 new, 1 started, 2 running.
+ short run_status; ///< Run status of task.
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-20 12:26:16 UTC (rev 2861)
+++ trunk/openvas-manager/src/omp.c 2009-03-20 14:39:08 UTC (rev 2862)
@@ -1402,13 +1402,16 @@
"</task>",
index->id,
index->name,
- index->running
- ? (index->running == 1
+ index->run_status
+ == TASK_STATUS_NEW
+ ? "New"
+ : (index->run_status
+ == TASK_STATUS_REQUESTED
? "Requested"
- : (index->running == 2
+ : (index->run_status
+ == TASK_STATUS_RUNNING
? "Running"
- : "Done"))
- : "New",
+ : "Done")),
index->debugs_size,
index->holes_size,
index->infos_size,
Modified: trunk/openvas-manager/src/otp.c
===================================================================
--- trunk/openvas-manager/src/otp.c 2009-03-20 12:26:16 UTC (rev 2861)
+++ trunk/openvas-manager/src/otp.c 2009-03-20 14:39:08 UTC (rev 2862)
@@ -1865,7 +1865,7 @@
case SERVER_TIME_SCAN_START:
{
if (current_server_task)
- current_server_task->running = 2;
+ current_server_task->run_status = TASK_STATUS_RUNNING;
set_server_state (SERVER_DONE);
switch (parse_server_done (&messages))
{
@@ -1880,7 +1880,7 @@
case SERVER_TIME_SCAN_END:
{
if (current_server_task)
- current_server_task->running = 3;
+ current_server_task->run_status = TASK_STATUS_DONE;
current_server_task = NULL;
set_server_state (SERVER_DONE);
switch (parse_server_done (&messages))
More information about the Openvas-commits
mailing list