PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-04 20:46:33 +00:00
Code Issues Projects Releases Wiki Activity

Allow NULL OS_Classification components when comparing.

Browse Source 
This used to be allowed only for the generation, as a special case.
This commit is contained in:
david
2011-10-03 04:00:26 +00:00
parent 1ee7305154
commit 90e845843d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
FingerPrintResults.cc
View File

@@ -267,16 +267,25 @@ void FingerPrintResults::populateClassification() {
return;
}
/* Return true iff s and t are both NULL or both the same string. */
static bool strnulleq(const char *s, const char *t) {
if (s == NULL && t == NULL)
return true;
else if (s == NULL || t == NULL)
return false;
else
return strcmp(s, t) == 0;
}
// Go through any previously enterted classes to see if this is a dupe;
bool FingerPrintResults::classAlreadyExistsInResults(struct OS_Classification *OSC) {
int i;
for (i=0; i < OSR.OSC_num_matches; i++) {
if (!strcmp(OSC->OS_Vendor, OSR.OSC[i]->OS_Vendor) &&
!strcmp(OSC->OS_Family, OSR.OSC[i]->OS_Family) &&
!strcmp(OSC->Device_Type, OSR.OSC[i]->Device_Type) &&
!strcmp(OSC->OS_Generation? OSC->OS_Generation : "",
OSR.OSC[i]->OS_Generation? OSR.OSC[i]->OS_Generation : "")) {
if (strnulleq(OSC->OS_Vendor, OSR.OSC[i]->OS_Vendor) &&
strnulleq(OSC->OS_Family, OSR.OSC[i]->OS_Family) &&
strnulleq(OSC->Device_Type, OSR.OSC[i]->Device_Type) &&
strnulleq(OSC->OS_Generation, OSR.OSC[i]->OS_Generation)) {
// Found a duplicate!
return true;
}