Author: mattm
Date: 2010-06-26 20:04:35 +0200 (Sat, 26 Jun 2010)
New Revision: 8193
Modified:
trunk/openvas-manager/ChangeLog
trunk/openvas-manager/src/omp.c
Log:
* src/omp.c (send_reports): Rename MESSAGES to RESULT_COUNT.
(omp_xml_handle_end_element): In CLIENT_GET_REPORTS rename
SCAN_RESULT_COUNT to RESULT_COUNT, move threat counts into that
entity, and rename MESSAGES to RESULT_COUNT.
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2010-06-26 16:28:45 UTC (rev 8192)
+++ trunk/openvas-manager/ChangeLog 2010-06-26 18:04:35 UTC (rev 8193)
@@ -1,5 +1,12 @@
2010-06-26 Matthew Mundell <matthew.mundell at greenbone.net>
+ * src/omp.c (send_reports): Rename MESSAGES to RESULT_COUNT.
+ (omp_xml_handle_end_element): In CLIENT_GET_REPORTS rename
+ SCAN_RESULT_COUNT to RESULT_COUNT, move threat counts into that
+ entity, and rename MESSAGES to RESULT_COUNT.
+
+2010-06-26 Matthew Mundell <matthew.mundell at greenbone.net>
+
* src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_TASKS correct
TASK/CONFIG uuid and name, which were swapped.
Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c 2010-06-26 16:28:45 UTC (rev 8192)
+++ trunk/openvas-manager/src/omp.c 2010-06-26 18:04:35 UTC (rev 8193)
@@ -5101,13 +5101,13 @@
// FIX s/b scan_start like get_reports
"<timestamp>%s</timestamp>"
"<scan_run_status>%s</scan_run_status>"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"</report>",
uuid,
timestamp,
@@ -7738,16 +7738,10 @@
SENDF_TO_CLIENT_OR_FAIL
("</filters>"
- "<scan_run_status>%s</scan_run_status>"
- "<scan_result_count>"
- "%i"
- "<filtered>%i</filtered>"
- "</scan_result_count>",
+ "<scan_run_status>%s</scan_run_status>",
run_status_name (run_status
? run_status
- : TASK_STATUS_INTERNAL_ERROR),
- result_count,
- filtered_result_count);
+ : TASK_STATUS_INTERNAL_ERROR));
if (task && tsk_uuid)
{
@@ -7867,7 +7861,7 @@
cleanup_iterator (&results);
}
- /* Threat counts. */
+ /* Result counts. */
{
int debugs, holes, infos, logs, warnings;
@@ -7875,13 +7869,17 @@
report_counts_id (report, &debugs, &holes, &infos, &logs,
&warnings, get_reports_data->apply_overrides);
- SENDF_TO_CLIENT_OR_FAIL ("<messages>"
+ SENDF_TO_CLIENT_OR_FAIL ("<result_count>"
+ "%i"
+ "<filtered>%i</filtered>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>",
+ "</result_count>",
+ result_count,
+ filtered_result_count,
debugs,
holes,
infos,
@@ -12823,13 +12821,13 @@
"<timestamp>"
"%s"
"</timestamp>"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"</report>"
"</first_report>",
first_report_id,
@@ -12865,13 +12863,13 @@
"<timestamp>"
"%s"
"</timestamp>"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"</report>"
"</last_report>",
last_report_id,
@@ -12909,13 +12907,13 @@
"<timestamp>"
"%s"
"</timestamp>"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"</report>"
"</second_last_report>",
second_last_report_id,
@@ -13051,13 +13049,13 @@
"<status>%s</status>"
"<progress>%s</progress>"
"%s"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"<report_count>"
"%u<finished>%u</finished>"
"</report_count>"
@@ -13170,13 +13168,13 @@
"<timestamp>"
"%s"
"</timestamp>"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"</report>"
"</first_report>",
first_report_id,
@@ -13210,13 +13208,13 @@
last_report = g_strdup_printf ("<last_report>"
"<report id=\"%s\">"
"<timestamp>%s</timestamp>"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"</report>"
"</last_report>",
last_report_id,
@@ -13272,13 +13270,13 @@
("<second_last_report>"
"<report id=\"%s\">"
"<timestamp>%s</timestamp>"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"</report>"
"</second_last_report>",
second_last_report_id,
@@ -13390,13 +13388,13 @@
"<status>%s</status>"
"<progress>%s</progress>"
"%s"
- "<messages>"
+ "<result_count>"
"<debug>%i</debug>"
"<hole>%i</hole>"
"<info>%i</info>"
"<log>%i</log>"
"<warning>%i</warning>"
- "</messages>"
+ "</result_count>"
"<report_count>"
"%u<finished>%u</finished>"
"</report_count>"