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

Abstract some things to move #includes out of headers.

Browse Source
This commit is contained in:
dmiller
2020-01-11 16:03:29 +00:00
parent a2c75e0ef4
commit ae10c8a19d
5 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NmapOps.h
View File

@@ -135,7 +135,8 @@
#include "nmap.h" /* MAX_DECOYS */ #include "nmap.h" /* MAX_DECOYS */
#include "scan_lists.h" #include "scan_lists.h"
#include "output.h" #include "output.h" /* LOG_NUM_FILES */
#include <nbase.h>
#include <nsock.h> #include <nsock.h>
#include <string> #include <string>
#include <map> #include <map>

2
Target.h
View File

@@ -136,7 +136,7 @@
#include "nbase.h" #include "nbase.h"
#include "libnetutil/netutil.h" #include "libnetutil/netutil.h" /* devtype */
#ifndef NOLUA #ifndef NOLUA
#include "nse_main.h" #include "nse_main.h"

2
nmap.h
View File

@@ -148,8 +148,6 @@
#include "nmap_amigaos.h" #include "nmap_amigaos.h"
#endif #endif
#include <nbase.h>
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif

34
scan_engine.h
View File

@@ -141,10 +141,6 @@
#include "timing.h" #include "timing.h"
#ifndef IPPROTO_SCTP
#include "libnetutil/netutil.h"
#endif
#include <pcap.h> #include <pcap.h>
#include <list> #include <list>
#include <vector> #include <vector>
@@ -233,35 +229,9 @@ public:
void setND(u8 *ndpkt, u32 ndlen); void setND(u8 *ndpkt, u32 ndlen);
// The 4 accessors below all return in HOST BYTE ORDER // The 4 accessors below all return in HOST BYTE ORDER
// source port used if TCP, UDP or SCTP // source port used if TCP, UDP or SCTP
u16 sport() const { u16 sport() const;
switch (mypspec.proto) {
case IPPROTO_TCP:
return probes.IP.pd.tcp.sport;
case IPPROTO_UDP:
return probes.IP.pd.udp.sport;
case IPPROTO_SCTP:
return probes.IP.pd.sctp.sport;
default:
return 0;
}
/* not reached */
}
// destination port used if TCP, UDP or SCTP // destination port used if TCP, UDP or SCTP
u16 dport() const { u16 dport() const;
switch (mypspec.proto) {
case IPPROTO_TCP:
return mypspec.pd.tcp.dport;
case IPPROTO_UDP:
return mypspec.pd.udp.dport;
case IPPROTO_SCTP:
return mypspec.pd.sctp.dport;
default:
/* dport() can get called for other protos if we
* get ICMP responses during IP proto scans. */
return 0;
}
/* not reached */
}
u32 ipid() const { u32 ipid() const {
return probes.IP.ipid; return probes.IP.ipid;
} }

30
scan_engine_raw.cc
View File

@@ -147,6 +147,36 @@
extern NmapOps o; extern NmapOps o;
u16 UltraProbe::sport() const {
switch (mypspec.proto) {
case IPPROTO_TCP:
return probes.IP.pd.tcp.sport;
case IPPROTO_UDP:
return probes.IP.pd.udp.sport;
case IPPROTO_SCTP:
return probes.IP.pd.sctp.sport;
default:
return 0;
}
/* not reached */
}
u16 UltraProbe::dport() const {
switch (mypspec.proto) {
case IPPROTO_TCP:
return mypspec.pd.tcp.dport;
case IPPROTO_UDP:
return mypspec.pd.udp.dport;
case IPPROTO_SCTP:
return mypspec.pd.sctp.dport;
default:
/* dport() can get called for other protos if we
* get ICMP responses during IP proto scans. */
return 0;
}
/* not reached */
}
/* Pass an arp packet, including ethernet header. Must be 42bytes */ /* Pass an arp packet, including ethernet header. Must be 42bytes */
void UltraProbe::setARP(u8 *arppkt, u32 arplen) { void UltraProbe::setARP(u8 *arppkt, u32 arplen) {