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

Store ICMP ID in ICMP probes.

Browse Source 
Part of Chris Johnson's patch from
http://seclists.org/nmap-dev/2013/q3/296.
This commit is contained in:
david
2013-08-17 02:18:07 +00:00
parent f49e3435f8
commit 4b47eae996
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scan_engine.cc
View File

@@ -250,6 +250,10 @@ public:
int sd; /* Socket descriptor used for connection. -1 if not valid. */
};
struct IPExtraProbeData_icmp {
u16 ident;
};
struct IPExtraProbeData_tcp {
u16 sport;
u32 seq; /* host byte order (like the other fields */
@@ -267,6 +271,7 @@ struct IPExtraProbeData_sctp {
struct IPExtraProbeData {
u16 ipid; /* host byte order */
union {
struct IPExtraProbeData_icmp icmp;
struct IPExtraProbeData_tcp tcp;
struct IPExtraProbeData_udp udp;
struct IPExtraProbeData_sctp sctp;
@@ -326,6 +331,7 @@ public:
u16 ipid() const {
return probes.IP.ipid;
}
u16 icmpid() const; // ICMP ident if protocol is ICMP
u32 tcpseq() const; // TCP sequence number if protocol is TCP
u32 sctpvtag() const; // SCTP vtag if protocol is SCTP
/* Number, such as IPPROTO_TCP, IPPROTO_UDP, etc. */
@@ -912,6 +918,7 @@ void UltraProbe::setIP(u8 *ippacket, u32 len, const probespec *pspec) {
struct tcp_hdr *tcp = NULL;
struct udp_hdr *udp = NULL;
struct sctp_hdr *sctp = NULL;
struct ppkt *icmp = NULL;
const void *data;
u8 hdr;
@@ -947,12 +954,20 @@ void UltraProbe::setIP(u8 *ippacket, u32 len, const probespec *pspec) {
sctp = (struct sctp_hdr *) data;
probes.IP.pd.sctp.sport = ntohs(sctp->sh_sport);
probes.IP.pd.sctp.vtag = ntohl(sctp->sh_vtag);
} else if (hdr == IPPROTO_ICMP) {
icmp = (struct ppkt *) data;
probes.IP.pd.icmp.ident = ntohs(icmp->id);
}
mypspec = *pspec;
return;
}
u16 UltraProbe::icmpid() const {
assert(mypspec.proto == IPPROTO_ICMP);
return probes.IP.pd.icmp.ident;
}
u32 UltraProbe::tcpseq() const {
if (mypspec.proto == IPPROTO_TCP)
return probes.IP.pd.tcp.seq;