diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py
index a131f7a90777a8771dc24364d256e6b00cde4694..3dccc50463ace54b90dc5a69ea0e46b153172d95 100644
--- a/scapy/layers/inet6.py
+++ b/scapy/layers/inet6.py
@@ -331,12 +331,14 @@ class IP6ListField(StrField):
class _IPv6GuessPayload:
name = "Dummy class that implements guess_payload_class() for IPv6"
def default_payload_class(self,p):
- if self.nh == 58 and len(p) > 2:
+ if self.nh == 58: # ICMPv6
t = ord(p[0])
- if t == 139 or t == 140: # Node Info Query
+ if len(p) > 2 and t == 139 or t == 140: # Node Info Query
return _niquery_guesser(p)
- return get_cls(icmp6typescls.get(t,"Raw"), "Raw")
- elif self.nh == 135 and len(p) > 3:
+ if len(p) >= icmp6typesminhdrlen.get(t, sys.maxint): # Other ICMPv6 messages
+ return get_cls(icmp6typescls.get(t,"Raw"), "Raw")
+ return Raw
+ elif self.nh == 135 and len(p) > 3: #Â Mobile IPv6
return _mip6_mhtype2cls.get(ord(p[2]), MIP6MH_Generic)
else:
return get_cls(ipv6nhcls.get(self.nh,"Raw"), "Raw")
@@ -1111,6 +1113,33 @@ icmp6typescls = { 1: "ICMPv6DestUnreach",
153: "ICMPv6MRD_Termination",
}
+icmp6typesminhdrlen = { 1: 8,
+ 2: 8,
+ 3: 8,
+ 4: 8,
+ 128: 8,
+ 129: 8,
+ 130: 24,
+ 131: 24,
+ 132: 24,
+ 133: 8,
+ 134: 16,
+ 135: 24,
+ 136: 24,
+ 137: 40,
+ #139:
+ #140
+ 141: 8,
+ 142: 8,
+ 144: 8,
+ 145: 8,
+ 146: 8,
+ 147: 8,
+ 151: 8,
+ 152: 4,
+ 153: 4
+ }
+
icmp6types = { 1 : "Destination unreachable",
2 : "Packet too big",
3 : "Time exceeded",
@@ -1207,8 +1236,8 @@ class ICMPv6PacketTooBig(_ICMPv6Error):
class ICMPv6TimeExceeded(_ICMPv6Error):
name = "ICMPv6 Time Exceeded"
fields_desc = [ ByteEnumField("type",3, icmp6types),
- ByteField("code",{ 0: "hop limit exceeded in transit",
- 1: "fragment reassembly time exceeded"}),
+ ByteEnumField("code",0, { 0: "hop limit exceeded in transit",
+ 1: "fragment reassembly time exceeded"}),
XShortField("cksum", None),
XIntField("unused",0x00000000)]
@@ -1262,7 +1291,7 @@ class _ICMPv6ML(_ICMPv6):
XShortField("cksum", None),
ShortField("mrd", 0),
ShortField("reserved", 0),
- IP6Field("mladdr",None)]
+ IP6Field("mladdr","::")]
# general queries are sent to the link-scope all-nodes multicast
# address ff02::1, with a multicast address field of 0 and a MRD of
diff --git a/scapy/volatile.py b/scapy/volatile.py
index f7dcfbc08aabcebe14b2a757044a9a5cfdeaddb5..5d3e2adcb1b83b97fadd0b7c1ef9da4b5991c140 100644
--- a/scapy/volatile.py
+++ b/scapy/volatile.py
@@ -291,6 +291,8 @@ class RandIP6(RandString):
ip.append("%04x" % n)
if len(ip) == 9:
ip.remove("")
+ if ip[-1] == "":
+ ip[-1] = 0
return ":".join(ip)
class RandOID(RandString):