PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-28 00:59:04 +00:00
Code Issues Projects Releases Wiki Activity

Use a file:// URL for the XML stylesheet in XML output.

Browse Source
This commit is contained in:
david
2008-09-29 15:59:56 +00:00
parent 3517f3965e
commit ed2616909b
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -6,7 +6,9 @@ o Reduced memory consumption for some longer running scans by removing
line on how long we wait and hence keep this information in memory.
See http://seclists.org/nmap-dev/2008/q3/0902.html for more. [Kris]
o XML output now contains the full path to nmap.xml on Windows. [Jah]
o XML output now contains the full path to nmap.xml on Windows. The
path is converted to a file:// URL to provide better compatibility
across browsers. [Jah]
o Zenmap no longer outputs XML elements and attributes that are not in
the Nmap XML DTD. This was done mostly by removing things from

30
NmapOps.cc
View File

@@ -175,6 +175,21 @@ int NmapOps::TimeSinceStartMS(struct timeval *now) {
return TIMEVAL_MSEC_SUBTRACT(tv, start_time);
}
// Convert a filename to a file:// URL. The return value must be freed.
char *filename_to_url(const char *filename) {
std::string url(filename);
#if WIN32
for (std::string::iterator p = url.begin(); p != url.end(); p++) {
if (*p == '\\')
*p = '/';
}
#endif
url = "file://" + url;
return strdup(url.c_str());
}
void NmapOps::Initialize() {
char tmpxsl[MAXPATHLEN];
@@ -247,15 +262,20 @@ void NmapOps::Initialize() {
reason = false;
if (datadir) free(datadir);
datadir = NULL;
if (nmap_fetchfile(tmpxsl, sizeof(tmpxsl), "nmap.xsl") != 1) {
if (xsl_stylesheet) free(xsl_stylesheet);
if (nmap_fetchfile(tmpxsl, sizeof(tmpxsl), "nmap.xsl") == 1) {
xsl_stylesheet = filename_to_url(tmpxsl);
} else {
#if WIN32
Strncpy(tmpxsl, "nmap.xsl", sizeof(tmpxsl));
/* Use a relative URL on Windows if nmap_fetchfile failed. It won't work,
but it gives a clue that there is an nmap.xsl somewhere. */
Strncpy(tmpxsl, "nmap.xsl", sizeof(tmpxsl));
xsl_stylesheet = strdup(tmpxsl);
#else
Snprintf(tmpxsl, sizeof(tmpxsl), "%s/nmap.xsl", NMAPDATADIR);
Snprintf(tmpxsl, sizeof(tmpxsl), "%s/nmap.xsl", NMAPDATADIR);
xsl_stylesheet = filename_to_url(tmpxsl);
#endif
}
if (xsl_stylesheet) free(xsl_stylesheet);
xsl_stylesheet = strdup(tmpxsl);
spoof_mac_set = false;
mass_dns = true;
log_errors = false;