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

Merge 30432:30436 from /nmap-exp/david/ipv6-ranges.

Browse Source 
This is simple IPv6 unicast ranges. For example,
nmap -6 en.wikipedia.org/120 -sn

The other, more complicated part of this overall change is automatic
multicast scanning of large local subnets. That part isn't done yet.
This commit is contained in:
david
2012-12-19 01:10:39 +00:00
parent f5de2d9419
commit 93b978fba8
7 changed files with 169 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
TargetGroup.h
View File

@@ -107,7 +107,7 @@
class TargetGroup {
public:
/* used by get_target_types */
enum _targets_types { TYPE_NONE, IPV4_NETMASK, IPV4_RANGES, IPV6_ADDRESS };
enum _targets_types { TYPE_NONE, IPV4_NETMASK, IPV4_RANGES, IPV6_NETMASK };
/* used as input to skip range */
enum _octet_nums { FIRST_OCTET, SECOND_OCTET, THIRD_OCTET };
TargetGroup();
@@ -152,16 +152,13 @@ private:
enum _targets_types targets_type;
void Initialize();
#if HAVE_IPV6
struct sockaddr_in6 ip6;
#endif
std::list<struct sockaddr_storage> resolvedaddrs;
u32 netmask;
std::string resolvedname;
/* These are used for the '/mask' style of specifying target
net (IPV4_NETMASK) */
u32 netmask;
std::string resolvedname;
struct in_addr startaddr;
struct in_addr currentaddr;
struct in_addr endaddr;
@@ -171,9 +168,18 @@ private:
unsigned int current[4];
u8 last[4];
/* Number of IPs left in this structure -- set to 0 if the fields are not
valid */
unsigned long long ipsleft;
#if HAVE_IPV6
/* These are used for the '/mask' style of specifying target
net (IPV6_NETMASK) */
struct sockaddr_in6 ip6;
struct in6_addr startaddr6;
struct in6_addr currentaddr6;
struct in6_addr endaddr6;
#endif
/* Is set to true iff all the addresses in this group have already been
returned. */
bool exhausted;
/* is the current target expression a named host? */
int namedhost;