diff --git a/scapy/layers/inet.py b/scapy/layers/inet.py index 98f47d8e8be3d7adbacca44c8b92b92ed698f285..d8b6d09908133ef7af2864808626ecf5da59dafa 100644 --- a/scapy/layers/inet.py +++ b/scapy/layers/inet.py @@ -4,8 +4,8 @@ from select import select from scapy.layers.l2 import * from scapy.fields import * from scapy.volatile import * -from config import conf -from sendrecv import sr,sr1 +from scapy.config import conf +from scapy.sendrecv import sr,sr1 diff --git a/scapy/main.py b/scapy/main.py index 86de2d2c979f37de93b92c8028bb9f5fa3387ee7..71ab1dc22f24b10db1f4d7cfb2981a3cae22ee70 100644 --- a/scapy/main.py +++ b/scapy/main.py @@ -106,7 +106,7 @@ def interact(mydict=None,argv=None,mybanner=None,loglevel=1): import __builtin__ scapy_builtins = {} for m in [ "ansmachine","arch","automaton","autorun","config","dadict","data","error","fields","main", - "mib","packet","plist","route","sendrecv","supersocket","themes","utils","volatile","asn1","asn1f" ]: + "mib","packet","plist","route","sendrecv","supersocket","themes","utils","volatile","asn1","asn1fields","asn1packet" ]: mod = __import__("scapy."+m,globals(),locals(),".") scapy_builtins.update(mod.__dict__) for m in ["l2","inet","dot11","dhcp","dns","ip6","isakmp","l2tp","mgcp","netbios","ntp","ppp","radius","rip",