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

treat isr in the same way that sp is treated

Browse Source
This commit is contained in:
fyodor
2006-08-27 03:11:32 +00:00
parent 87c4dbdf39
commit 4619de5bae
1 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
scripts/fingerfix.pl
View File

@@ -132,15 +132,56 @@ foreach $line (split /\n/, $printbuf) {
# print " newsp: $fp{seq}{sp}\n";
if (!($fp{seq}{isr} =~ /(^|\|)$isr($|\|)/)) {
if ($fp{seq}{isr}) {
$fp{seq}{isr} = $fp{seq}{isr} . qq^|$isr^;
} else {
$fp{seq}{isr} = $isr;
}
}
# Treat ISR the same way as sp
$newhighlim = $newlowlim = -1;
if ($isr =~ /([0-9A-F]+)-([0-9A-F]+)/) {
$newlowlim = hex($1);
$newhighlim = hex($2);
} elsif ($isr =~ /<([0-9A-F]+)/) {
$newhighlim = hex($1);
}
# print "newhighlim: $newhighlim newlowlim: $newlowlim\n";
$oldhighlim = $oldlowlim = 0;
if ($fp{seq}{isr} =~ /([0-9A-F]+)-([0-9A-F]+)/) {
$oldlowlim = hex($1);
$oldhighlim = hex($2);
} elsif ($fp{seq}{isr} =~ /<([0-9A-F]+)/) {
$oldhighlim = hex($1);
} elsif ($fp{seq}{isr} =~ /^([0-9A-F]+)/) {
$oldhighlim = $oldlowlim = hex($1);
}
# print "oldhighlim: $oldhighlim oldlowlim: $oldlowlim\n";
if ($oldlowlim) {
if ($newlowlim != -1) { $newlowlim = max(0, min($oldlowlim, $newlowlim)); }
else { $newlowlim = max(0, min($oldlowlim, hex($isr))); }
} else {
if ($newlowlim == -1) { $newlowlim = max(0, hex($isr)); }
}
if ($newhighlim == -1) {
$newhighlim = max($oldhighlim, hex($isr));
} else {
$newhighlim = max($oldhighlim, $newhighlim);
}
# print "oldhighlim: $oldhighlim oldlowlim: $oldlowlim newhighlim: $newhighlim newlowlim: $newlowlim oldisr: $fp{seq}{isr}";
if ($newlowlim eq $newhighlim) {
$fp{seq}{isr} = sprintf("%X", $newhighlim);
} elsif ($newlowlim > 0) {
$fp{seq}{isr} = sprintf("%X-%X", $newlowlim, $newhighlim);
} else {
$fp{seq}{isr} = sprintf("<%X", $newhighlim);
}
# print " newisr: $fp{seq}{isr}\n";
if (!($fp{seq}{ti} =~ /(^|\|)$ti($|\|)/)) {
if ($fp{seq}{ti}) {
$fp{seq}{ti} = $fp{seq}{ti} . qq^|$ti^;