CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-03 22:29:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert r35943: causing segv crashes in IPv6 OS scan

Browse source
This commit is contained in:
dmiller 2016-07-27 19:49:13 +00:00
parent e6925acec3
commit 040d8e9c0f
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libnetutil/IPv4Header.h
View file

@ -249,7 +249,6 @@ class IPv4Header : public NetworkLayerElement {
u8 getNextProto() const;
int setNextHeader(u8 val);
u8 getNextHeader() const;
virtual u8 getNextHeader(){return 0;}
/* Checksum */
int setSum();
@ -262,18 +261,16 @@ class IPv4Header : public NetworkLayerElement {
int setDestinationAddress(struct in_addr d);
const u8 *getDestinationAddress() const;
struct in_addr getDestinationAddress(struct in_addr *result) const;
virtual u8 *getDestinationAddress(){return NULL;}
/* Source IP */
int setSourceAddress(u32 d);
int setSourceAddress(struct in_addr d);
const u8 *getSourceAddress() const;
struct in_addr getSourceAddress(struct in_addr *result) const;
virtual u8 *getSourceAddress(){return NULL;}
u16 getAddressLength() const;
virtual u16 getAddressLength(){return 0;}
/* IP Options */
int setOpts(const char *txt);
int setOpts(u8 *opts_buff, u32 opts_len);

8
libnetutil/IPv6Header.h
View file

@ -213,8 +213,7 @@ class IPv6Header : public NetworkLayerElement {
int setNextHeader(u8 val);
int setNextHeader(const char *p);
u8 getNextHeader() const;
virtual u8 getNextHeader(){return 0;}
/* Hop Limit */
int setHopLimit(u8 val);
u8 getHopLimit() const;
@ -224,17 +223,14 @@ class IPv6Header : public NetworkLayerElement {
int setSourceAddress(struct in6_addr val);
const u8 *getSourceAddress() const;
struct in6_addr getSourceAddress(struct in6_addr *result) const;
virtual u8 *getSourceAddress(){return NULL;}
/* Destination Address*/
int setDestinationAddress(u8 *val);
int setDestinationAddress(struct in6_addr val);
const u8 *getDestinationAddress() const;
struct in6_addr getDestinationAddress(struct in6_addr *result) const;
virtual u8 *getDestinationAddress(){return NULL;}
u16 getAddressLength() const;
virtual u16 getAddressLength(){return 0;}
};
#endif