PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-23 16:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Standardize on ip6_nhdr in packet.lua.

Browse Source 
Some places were using ip6_nxt_hdr and some were using ip6_nhdr.
ip6_nhdr seemed to be the prevailing usage.
This commit is contained in:
david
2011-10-29 19:40:14 +00:00
parent bca60ba8de
commit 622e2e08a7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nselib/packet.lua
View File

@@ -299,7 +299,7 @@ function Packet:build_ipv6_packet(src, dst, nx_hdr, payload, h_limit, t_class, f
self.buf = self.buf =
ipv6_hdr_pack_tc_fl(self.ip6_tc, self.ip6_fl) .. ipv6_hdr_pack_tc_fl(self.ip6_tc, self.ip6_fl) ..
numtostr16(self.ip6_plen) .. --payload length numtostr16(self.ip6_plen) .. --payload length
string.char(self.ip6_nxt_hdr) .. --next header string.char(self.ip6_nhdr) .. --next header
string.char(self.ip6_hlimit) .. --hop limit string.char(self.ip6_hlimit) .. --hop limit
self.ip6_src .. --Source self.ip6_src .. --Source
self.ip6_dst ..--dest self.ip6_dst ..--dest
@@ -321,7 +321,7 @@ end
--- Count IPv6 checksum. --- Count IPv6 checksum.
-- @return the checksum. -- @return the checksum.
function Packet:count_ipv6_pseudoheader_cksum() function Packet:count_ipv6_pseudoheader_cksum()
local pseudoheader = self.ip6_src .. self.ip6_dst .. numtostr16(#self.l4_packet) .. string.char(0x0,0x0,0x0) .. string.char(self.ip6_nxt_hdr) local pseudoheader = self.ip6_src .. self.ip6_dst .. numtostr16(#self.l4_packet) .. string.char(0x0,0x0,0x0) .. string.char(self.ip6_nhdr)
local ck_content = pseudoheader .. self.l4_packet local ck_content = pseudoheader .. self.l4_packet
return in_cksum(ck_content) return in_cksum(ck_content)
end end
@@ -336,7 +336,7 @@ end
-- @param ip6_src 16-byte string of the source IPv6 address. -- @param ip6_src 16-byte string of the source IPv6 address.
-- @param ip6_dst 16-byte string of the destination IPv6 address. -- @param ip6_dst 16-byte string of the destination IPv6 address.
function Packet:build_icmpv6_header(icmpv6_type, icmpv6_code, icmpv6_payload, ip6_src, ip6_dst) function Packet:build_icmpv6_header(icmpv6_type, icmpv6_code, icmpv6_payload, ip6_src, ip6_dst)
self.ip6_nxt_hdr = IPPROTO_ICMPV6 self.ip6_nhdr = IPPROTO_ICMPV6
self.icmpv6_type = icmpv6_type or self.icmpv6_type self.icmpv6_type = icmpv6_type or self.icmpv6_type
self.icmpv6_code = icmpv6_code or self.icmpv6_code self.icmpv6_code = icmpv6_code or self.icmpv6_code
self.icmpv6_payload = icmpv6_payload or self.icmpv6_payload self.icmpv6_payload = icmpv6_payload or self.icmpv6_payload

2
scripts/targets-ipv6-multicast-invalid-dst.nse
View File

@@ -128,7 +128,7 @@ local function single_interface_broadcast(if_nfo, results)
probe:build_icmpv6_header() probe:build_icmpv6_header()
probe.exheader = build_invalid_extension_header(packet.IPPROTO_ICMPV6) probe.exheader = build_invalid_extension_header(packet.IPPROTO_ICMPV6)
probe.ip6_nxt_hdr = packet.IPPROTO_DSTOPTS probe.ip6_nhdr = packet.IPPROTO_DSTOPTS
probe:build_ipv6_packet() probe:build_ipv6_packet()
probe:build_ether_frame() probe:build_ether_frame()