PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-26 17:39:03 +00:00
Code Issues Projects Releases Wiki Activity

setServiceXMLBuf now uses the string class exclusively instead of the old c-string & string class combination. So it is no longer necessary to calculate the length of the XML service element before writing it to its buffer.

Browse Source
This commit is contained in:
michael
2008-06-21 05:45:11 +00:00
parent 3bc22411eb
commit 30d60b97ed
2 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
output.cc
View File

@@ -200,18 +200,22 @@ static char* xml_sf_convert (const char* str) {
// Creates an XML <service> element for the information given in
// serviceDeduction. It will be 0-length if none is neccessary.
// returns 0 for success.
static int getServiceXMLBuf(struct serviceDeductions *sd, char *&xmlbuf) {
// serviceDeduction. This function should only be called if ether
// the service name or the service fingerprint is non-null.
// Returns a pointer to a buffer containing the element,
// you will have to call free on it.
static char * getServiceXMLBuf(struct serviceDeductions *sd) {
string versionxmlstring = "";
char rpcbuf[128];
char confBuf[20];
char *xml_product = NULL, *xml_version = NULL, *xml_extrainfo = NULL;
char *xml_hostname = NULL, *xml_ostype = NULL, *xml_devicetype = NULL;
char *xml_servicefp = NULL, *xml_servicefp_temp = NULL;
int xmlbuflen=0;
if (!sd->name && !sd->service_fp) return -1;
versionxmlstring = "<service name=\"";
versionxmlstring += sd->name? sd->name : "unknown";
versionxmlstring += "\"";
if (sd->product) {
xml_product = xml_convert(sd->product);
versionxmlstring += " product=\"";
@@ -276,18 +280,17 @@ static int getServiceXMLBuf(struct serviceDeductions *sd, char *&xmlbuf) {
sd->rpc_program, sd->rpc_lowver, sd->rpc_highver);
} else rpcbuf[0] = '\0';
xmlbuflen=versionxmlstring.size()+55;
xmlbuflen+=strlen(rpcbuf);
xmlbuf = (char*)safe_malloc(xmlbuflen);
Snprintf(xmlbuf, xmlbuflen,
"<service name=\"%s\"%s %smethod=\"%s\" conf=\"%d\"%s />",
sd->name? sd->name : "unknown",
versionxmlstring.c_str(),
(sd->service_tunnel == SERVICE_TUNNEL_SSL)? "tunnel=\"ssl\" " : "",
(sd->dtype == SERVICE_DETECTION_TABLE)? "table" : "probed",
sd->name_confidence, rpcbuf);
return 0;
versionxmlstring += " ";
versionxmlstring += (sd->service_tunnel == SERVICE_TUNNEL_SSL)? "tunnel=\"ssl\" " : "";
versionxmlstring += "method=\"";
versionxmlstring += (sd->dtype == SERVICE_DETECTION_TABLE)? "table" : "probed";
versionxmlstring += "\" conf=\"";
Snprintf(confBuf,20,"%i",sd->name_confidence);
versionxmlstring += confBuf;
versionxmlstring += "\"";
versionxmlstring += rpcbuf;
versionxmlstring += " />";
return strdup(versionxmlstring.c_str());
}
#ifdef WIN32
@@ -479,10 +482,10 @@ void printportoutput(Target *currenths, PortList *plist) {
char rpcinfo[64];
char rpcmachineinfo[64];
char portinfo[64];
char *xmlbuf=NULL;
char grepvers[256];
char grepown[64];
char *p;
char * xmlBuf=NULL;
const char *state;
char serviceinfo[64];
char *name=NULL;
@@ -764,12 +767,15 @@ void printportoutput(Target *currenths, PortList *plist) {
if (current->owner && *current->owner) {
log_write(LOG_XML, "<owner name=\"%s\" />", current->owner);
}
if (getServiceXMLBuf(&sd, xmlbuf) == 0)
if (xmlbuf){
log_write(LOG_XML, "%s", xmlbuf);
free(xmlbuf);
xmlbuf=NULL;
}
if (sd.name || sd.service_fp){
xmlBuf = getServiceXMLBuf(&sd);
if(xmlBuf){
log_write(LOG_XML, "%s", xmlBuf);
free(xmlBuf);
xmlBuf=NULL;
}
}
rowno++;
#ifndef NOLUA