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

Fixed old comments and added an assertion, and updated the changelog.

Browse Source
This commit is contained in:
michael
2008-07-17 16:09:07 +00:00
parent 6d41534dee
commit 949ec1a6ca
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scan_engine.cc
View File

@@ -4578,7 +4578,7 @@ static void begin_sniffer(UltraScanInfo *USI, vector<Target *> &Targets) {
if(len>=sizeof(macstring))
fatal("macstring too long");
pcap_filter+=macstring;
//its not arp or connect, so it must be tcp, udp, prot, or icmp
//its not arp, so lets check if for a protocol scan.
} else if(USI->prot_scan || (USI->ping_scan && USI->ptech.rawprotoscan)){
if (doIndividual){
pcap_filter="dst host ";
@@ -4590,9 +4590,8 @@ static void begin_sniffer(UltraScanInfo *USI, vector<Target *> &Targets) {
pcap_filter="dst host ";
pcap_filter+=inet_ntoa(Targets[0]->v4source());
}
} else {
/* Handle all the different ping types (except ARP and TCP connect) with one
filter. */
} else if(USI->tcp_scan || USI->udp_scan || USI->ping_scan) {
/* Handle udp and tcp with one filter. */
if (doIndividual){
pcap_filter="dst host ";
pcap_filter+=inet_ntoa(Targets[0]->v4source());
@@ -4604,7 +4603,7 @@ static void begin_sniffer(UltraScanInfo *USI, vector<Target *> &Targets) {
pcap_filter+=inet_ntoa(Targets[0]->v4source());
pcap_filter+=" and (icmp or tcp or udp)";
}
}
}else assert(0);
if (o.debugging > 2) log_write(LOG_PLAIN, "Pcap filter: %s\n", pcap_filter.c_str());
set_pcap_filter(Targets[0]->deviceName(), USI->pd, pcap_filter.c_str());
/* pcap_setnonblock(USI->pd, 1, NULL); */