diff --git a/scapy/arch/pcapdnet.py b/scapy/arch/pcapdnet.py index 3ab6d27be71a0f8f3b973cfbdee020e0c9eb9db4..8f4f40037c247248ffc35473404bbdbe6ebd80fc 100644 --- a/scapy/arch/pcapdnet.py +++ b/scapy/arch/pcapdnet.py @@ -333,6 +333,7 @@ if conf.use_winpcapy: else: return def send(self, x): + # Makes send detects when it should add Loopback(), Dot11... instead of Ether() ll = self.ins.datalink() if ll in conf.l2types: cls = conf.l2types[ll] diff --git a/scapy/layers/inet.py b/scapy/layers/inet.py index 8b1a9c4c52c3e0dec5d77d997a420560e6398fb7..72eb5b136f668533027644d5551bd52fbba2d1be 100644 --- a/scapy/layers/inet.py +++ b/scapy/layers/inet.py @@ -49,6 +49,7 @@ class IPTools(object): else: os.system("whois %s" % self.src) def _ttl(self): + """Returns ttl or hlim, depending on the IP version""" return self.hlim if isinstance(self, IPv6) else self.ttl def ottl(self): t = sorted([32,64,128,255]+[self._ttl()]) diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py index 0cf46ad68cbfa8f758197d3b645298ecff5fce69..8d990f4e657cdcb74a6ba8f4e1379c09710595b0 100644 --- a/scapy/layers/inet6.py +++ b/scapy/layers/inet6.py @@ -108,7 +108,7 @@ def getmacbyip6(ip6, chainCC=0): used to perform the resolution, if needed) """ - if isinstance(ip6,Net6): + if isinstance(ip6, Net6): ip6 = iter(ip6).next() if in6_ismaddr(ip6): # Multicast @@ -408,7 +408,7 @@ class IPv6(_IPv6GuessPayload, Packet, IPTools): return conf.route6.route(dst) def mysummary(self): - return "%s > %s (%i)" % (str(self.src),str(self.dst), self.nh) + return "%s > %s (%i)" % (str(self.src), str(self.dst), self.nh) def post_build(self, p, pay): p += pay