1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

Have NetBlock::next return the socklen.

This matters on OS X; with the wrong size, connect scans give "Invalid
argument".
Reported by Jesper Kückelhahn.
http://seclists.org/nmap-dev/2013/q1/84
This commit is contained in:
david
2013-01-26 05:31:33 +00:00
parent 010969b77f
commit 249c566196
3 changed files with 10 additions and 9 deletions

View File

@@ -126,7 +126,7 @@ public:
bool is_resolved_address(const struct sockaddr_storage *ss) const;
virtual bool next(struct sockaddr_storage *ss) = 0;
virtual bool next(struct sockaddr_storage *ss, size_t *sslen) = 0;
virtual void apply_netmask(int bits) = 0;
virtual std::string str() const = 0;
};
@@ -137,7 +137,7 @@ public:
NetBlockIPv4Ranges();
bool next(struct sockaddr_storage *ss);
bool next(struct sockaddr_storage *ss, size_t *sslen);
void apply_netmask(int bits);
std::string str() const;
@@ -149,7 +149,7 @@ class NetBlockIPv6Netmask : public NetBlock {
public:
void set_addr(const struct sockaddr_in6 *addr);
bool next(struct sockaddr_storage *ss);
bool next(struct sockaddr_storage *ss, size_t *sslen);
void apply_netmask(int bits);
std::string str() const;
@@ -169,7 +169,7 @@ public:
NetBlock *resolve() const;
bool next(struct sockaddr_storage *ss);
bool next(struct sockaddr_storage *ss, size_t *sslen);
void apply_netmask(int bits);
std::string str() const;
};