diff --git a/scapy/arch/windows/__init__.py b/scapy/arch/windows/__init__.py index 43614e409b75b26d86ba03147dd9add7255efe04..ade8935f42c95b8b475edb94a9d4f5ae4a146bea 100755 --- a/scapy/arch/windows/__init__.py +++ b/scapy/arch/windows/__init__.py @@ -43,7 +43,7 @@ if not hasattr(socket, 'IPPROTO_GRE'): from scapy.arch import pcapdnet from scapy.arch.pcapdnet import * -from scapy.consts import LOOPBACK_NAME +import scapy.consts def is_new_release(ignoreVBS=False): if NEW_RELEASE and conf.prog.powershell is not None: @@ -348,7 +348,7 @@ class NetworkInterface(object): try: if not self.ip: self.ip=get_ip_from_name(data['name']) - if not self.ip and self.name == LOOPBACK_NAME: + if not self.ip and self.name == scapy.consts.LOOPBACK_NAME: self.ip = "127.0.0.1" if not self.ip: # No IP detected @@ -456,7 +456,9 @@ class NetworkInterfaceDict(UserDict): self.remove_invalid_ifaces() # Replace LOOPBACK_INTERFACE try: - scapy.consts.LOOPBACK_INTERFACE = self.dev_from_name(LOOPBACK_NAME) + scapy.consts.LOOPBACK_INTERFACE = self.dev_from_name( + scapy.consts.LOOPBACK_NAME, + ) except: pass @@ -683,7 +685,7 @@ def in6_getifaddr(): def _append_route6(routes, dpref, dp, nh, iface, lifaddr): cset = [] # candidate set (possible source addresses) - if iface.name == LOOPBACK_NAME: + if iface.name == scapy.consts.LOOPBACK_NAME: if dpref == '::': return cset = ['::1'] diff --git a/scapy/utils6.py b/scapy/utils6.py index 0759d6446afb37354548cbf4f66690ed3d1f075f..31bdb66c787d5b6a0e597c7789458eb1b52079f3 100644 --- a/scapy/utils6.py +++ b/scapy/utils6.py @@ -15,6 +15,7 @@ import socket import struct from scapy.config import conf +import scapy.consts from scapy.data import * from scapy.utils import * from scapy.pton_ntop import *