PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-10 07:26:34 +00:00
Code Issues Projects Releases Wiki Activity

Factor out XML script result writing.

Browse Source
This commit is contained in:
david
2012-08-02 06:21:01 +00:00
parent 54fa9ec345
commit 3f415ef38a
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nse_main.cc
View File

@@ -381,6 +381,14 @@ ScriptResults *get_script_scan_results_obj (void)
return &script_scan_results;
}
void ScriptResult::write_xml() const
{
xml_open_start_tag("script");
xml_attribute("id", "%s", get_id());
xml_attribute("output", "%s", get_output());
xml_close_empty_tag();
}
/* int panic (lua_State *L)
*
* Panic function set via lua_atpanic().

1
nse_main.h
View File

@@ -26,6 +26,7 @@ class ScriptResult
const char *get_output (void) const;
void set_id (const char *);
const char *get_id (void) const;
void write_xml() const;
};
typedef std::list<ScriptResult> ScriptResults;

17
output.cc
View File

@@ -795,10 +795,7 @@ void printportoutput(Target *currenths, PortList *plist) {
current->scriptResults.sort(comparescriptids);
for (ssr_iter = current->scriptResults.begin();
ssr_iter != current->scriptResults.end(); ssr_iter++) {
xml_open_start_tag("script");
xml_attribute("id", "%s", ssr_iter->get_id());
xml_attribute("output", "%s", ssr_iter->get_output());
xml_close_empty_tag();
ssr_iter->write_xml();
char *script_output = formatScriptOutput((*ssr_iter));
Tbl->addItem(rowno, 0, true, true, script_output);
@@ -2198,10 +2195,8 @@ void printscriptresults(ScriptResults *scriptResults, stype scantype) {
for (iter = scriptResults->begin();
iter != scriptResults->end();
iter++) {
xml_open_start_tag("script");
xml_attribute("id", "%s", iter->get_id());
xml_attribute("output", "%s", iter->get_output());
xml_close_empty_tag();
iter->write_xml();
script_output = formatScriptOutput((*iter));
log_write(LOG_PLAIN, "%s\n", script_output);
free(script_output);
@@ -2222,10 +2217,8 @@ void printhostscriptresults(Target *currenths) {
for (iter = currenths->scriptResults.begin();
iter != currenths->scriptResults.end();
iter++) {
xml_open_start_tag("script");
xml_attribute("id", "%s", iter->get_id());
xml_attribute("output", "%s", iter->get_output());
xml_close_empty_tag();
iter->write_xml();
script_output = formatScriptOutput((*iter));
log_write(LOG_PLAIN, "%s\n", script_output);
free(script_output);