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

Merge r15998 from /nmap-exp/david/nmap-token, SCTP vtag matching.

Browse Source
This commit is contained in:
david
2009-11-04 22:12:27 +00:00
parent 8f6485bbcc
commit a38d7db2cf
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scan_engine.cc
View File

@@ -205,6 +205,7 @@ struct IPExtraProbeData_udp {
struct IPExtraProbeData_sctp {
u16 sport;
u32 vtag;
};
struct IPExtraProbeData {
@@ -267,6 +268,7 @@ public:
}
u16 ipid() const { return probes.IP.ipid; }
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. */
u8 protocol() const { return mypspec.proto; }
ConnectProbe *CP() { return probes.CP; } // if type == UP_CONNECT
@@ -826,6 +828,7 @@ void UltraProbe::setIP(u8 *ippacket, u32 iplen, const probespec *pspec) {
assert(iplen >= (unsigned) ipv4->ip_hl * 4 + 12);
sctp = (struct sctp_hdr *) ((u8 *) ipv4 + ipv4->ip_hl * 4);
probes.IP.pd.sctp.sport = ntohs(sctp->sh_sport);
probes.IP.pd.sctp.vtag = ntohl(sctp->sh_vtag);
}
mypspec = *pspec;
@@ -842,6 +845,11 @@ u32 UltraProbe::tcpseq() const {
return 0; // Unreached
}
u32 UltraProbe::sctpvtag() const {
assert(mypspec.proto == IPPROTO_SCTP);
return probes.IP.pd.sctp.vtag;
}
/* Sets this UltraProbe as type UP_CONNECT, preparing to connect to given
port number*/
void UltraProbe::setConnect(u16 portno) {
@@ -4257,7 +4265,8 @@ static bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
} else if (ip2->ip_p == IPPROTO_SCTP && !USI->prot_scan) {
struct sctp_hdr *sctp = (struct sctp_hdr *) ((u8 *) ip2 + ip2->ip_hl * 4);
if (ntohs(sctp->sh_sport) != probe->sport() ||
ntohs(sctp->sh_dport) != probe->dport())
ntohs(sctp->sh_dport) != probe->dport() ||
ntohl(sctp->sh_vtag) != probe->sctpvtag())
continue;
} else if (ip2->ip_p == IPPROTO_UDP && !USI->prot_scan) {
/* TODO: IPID verification */