PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-28 02:19:04 +00:00
Code Issues Projects Releases Wiki Activity

o Fix a bunch of warning/error messages which contained an extra

Browse Source 
newline.  Thanks to Brandon Enright for the patch.
This commit is contained in:
fyodor
2007-12-21 03:38:04 +00:00
parent c0bd7ac21b
commit 09512ff092
12 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scan_engine.cc
View File

@@ -2581,7 +2581,7 @@ static UltraProbe *sendArpScanProbe(UltraScanInfo *USI, HostScanStats *hss,
hss->lastprobe_sent = probe->sent = USI->now;
if ((rc = eth_send(USI->ethsd, frame, sizeof(frame))) != sizeof(frame)) {
int err = socket_errno();
error("WARNING: eth_send of ARP packet returned %i rather than expected %d (errno=%i: %s)\n", rc, (int) sizeof(frame), err, strerror(err));
error("WARNING: eth_send of ARP packet returned %i rather than expected %d (errno=%i: %s)", rc, (int) sizeof(frame), err, strerror(err));
}
PacketTrace::traceArp(PacketTrace::SENT, (u8 *) frame, sizeof(frame), &USI->now);
probe->tryno = tryno;
@@ -3584,7 +3584,7 @@ static bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
} else newstate = PORT_CLOSED;
} else {
if (o.debugging)
error("Received scan response with unexpected TCP flags: %d\n", tcp->th_flags);
error("Received scan response with unexpected TCP flags: %d", tcp->th_flags);
break;
}
}
@@ -3611,7 +3611,7 @@ static bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
8 xtra bytes */
if (bytes < requiredbytes) {
if (o.debugging)
error("Received short ICMP packet (%d bytes)\n", bytes);
error("Received short ICMP packet (%d bytes)", bytes);
continue;
}
@@ -3970,7 +3970,7 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
else if (ping->type == 3 || ping->type == 4 || ping->type == 11 || o.debugging) {
if (bytes < ip->ip_hl * 4 + 28U) {
if (o.debugging)
error("ICMP type %d code %d packet is only %d bytes\n", ping->type, ping->code, bytes);
error("ICMP type %d code %d packet is only %d bytes", ping->type, ping->code, bytes);
continue;
}
@@ -3979,7 +3979,7 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
/* IPProto Scan (generally) sends bare IP headers, so no extra payload */
if (bytes < ip->ip_hl * 4 + 8U + ip2->ip_hl * 4 + 8U && !USI->ptech.rawprotoscan) {
if (o.debugging)
error("ICMP (embedded) type %d code %d packet is only %d bytes\n", ping->type, ping->code, bytes);
error("ICMP (embedded) type %d code %d packet is only %d bytes", ping->type, ping->code, bytes);
continue;
}
@@ -4063,7 +4063,7 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
goodseq = tcp_trynum_pingseq_decode(USI, tcp, &trynum, &pingseq);
if (!goodseq) {
if (o.debugging)
error("Bogus trynum or sequence number in ICMP error message\n");
error("Bogus trynum or sequence number in ICMP error message");
continue;
}
@@ -4203,7 +4203,7 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
continue;
}
if (bytes < 4 * ip->ip_hl + 16U) {
error("TCP packet is only %d bytes, we can't get enough information from it\n", bytes);
error("TCP packet is only %d bytes, we can't get enough information from it", bytes);
continue;
}
struct tcp_hdr *tcp = (struct tcp_hdr *) (((u8 *) ip) + 4 * ip->ip_hl);